--- gforth/testdist	2008/10/25 22:30:06	1.18
+++ gforth/testdist	2008/11/01 18:03:06	1.21
@@ -3,9 +3,10 @@
 #usage: testdist gforth-version.tar.gz
 #gforth-version.tar.gz must be in the working directory
 MACHINE=`hostname`
+test $MACHINE = mail2 -o $MACHINE = t1000 && confopt='ac_cv_prog_GNU_LIBTOOL='
 GFORTH=`basename $1 .tar.gz`
 result=ok
-for CC in `(shopt -s nullglob; for i in /usr/sfw/bin /opt/csw/gcc4 \`echo $PATH|sed 's/:/ /g'\`; do for j in $i/gcc-*; do basename $j; done; done )|sort -u`; do
+for CC in `(shopt -s nullglob; for i in /usr/sfw/bin /opt/csw/gcc4/bin \`echo $PATH|sed 's/:/ /g'\`; do for j in $i/gcc-*; do basename $j; done; done )|sort -u`; do
     last=broken
     rm -rf $CC
     mkdir $CC
@@ -15,18 +16,18 @@ for CC in `(shopt -s nullglob; for i in
     chmod -R +w $GFORTH
     rm -rf $GFORTH
     gunzip -cd ../$1 | tar xf -
-    (if make --version|grep -q GNU
+    (if make --version|grep GNU >/dev/null
      then
 	echo building in build with $CC
 	chmod -R a-w $GFORTH
 	rm -rf build
 	mkdir build
 	cd build
-	../$GFORTH/configure --prefix=$DIR/install CC=$CC
+	../$GFORTH/configure --prefix=$DIR/install CC=$CC $confopt
      else
 	echo building in $GFORTH with $CC
 	cd $GFORTH
-	./configure --prefix=$DIR/install CC=$CC
+	./configure --prefix=$DIR/install CC=$CC $confopt
      fi &&
      make &&
 #gforth locals-test.fs
@@ -41,7 +42,7 @@ for CC in `(shopt -s nullglob; for i in
      cd .. &&
      cd .. &&
      install/bin/gforth test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye >&/dev/null &&
-     make -f build/Makefile onebench ENGINE_FAST=install/bin/gforth-fast &&
+     install/bin/gforth-fast onebench.fs -e bye &&
      install/bin/gforth-fast --debug -e bye 2>&1 |grep 'Compiled with' ) &&
     last=ok
     echo $CC $last