[GNUnet-SVN] r5354 - GNUnet

[gnunet]

Author: durner
Date: 2007-07-25 14:01:38 -0600 (Wed, 25 Jul 2007)
New Revision: 5354

Modified:
   GNUnet/bootstrap
Log:
prefer automake & aclocal 1.8

Modified: GNUnet/bootstrap
===================================================================
--- GNUnet/bootstrap    2007-07-24 19:48:11 UTC (rev 5353)
+++ GNUnet/bootstrap    2007-07-25 20:01:38 UTC (rev 5354)
@@ -1,9 +1,26 @@
 #!/bin/sh
 export WANT_AUTOMAKE="1.8"
 export MKDIR_P="mkdir -p"
-export AUTOMAKE="automake-1.8"
-export ACLOCAL="aclocal-1.8"
-automake-1.8 -fi
+
+if test "$(which automake-1.8)" != ""; then
+       export AUTOMAKE="automake-1.8"
+elif test "$(which automake)" != ""; then
+       export AUTOMAKE="automake"
+else
+       echo "Error: automake not found"
+       exit
+fi
+
+if test "$(which aclocal-1.8)" != ""; then
+       export ACLOCAL="aclocal-1.8"
+elif test "$(which aclocal)" != ""; then
+       export ACLOCAL="aclocal"
+else
+       echo "Error: aclocal not found"
+       exit
+fi
+
+$AUTOMAKE -fi
 cd libltdl
 autoreconf -f -i
 cd ..