Look for aclocal in more places
authorSimon Wilkinson <sxw@inf.ed.ac.uk>
Tue, 22 Dec 2009 21:34:23 +0000 (21:34 +0000)
committerDerrick Brashear <shadow|account-1000005@unknown>
Tue, 22 Dec 2009 23:23:09 +0000 (15:23 -0800)
Some operating systems (cough, OpenSolaris, cough) have multiple
versions of aclocal installed, and don't populate the 'aclocal' name.
If 'aclocal' isn't present, then try using 'aclocal-1.10' before we give
up in disgust.

Change-Id: Iad6daf1038942aeee13f38cb0c00c58da621cfd1
Reviewed-on: http://gerrit.openafs.org/1019
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

regen.sh

index 8d04e24..8ef4349 100755 (executable)
--- a/regen.sh
+++ b/regen.sh
@@ -16,7 +16,15 @@ done
 
 echo "Updating configuration..."
 echo "Running aclocal"
-aclocal -I src/cf
+if which aclocal > /dev/null 2>&1; then
+  aclocal -I src/cf
+elif which aclocal-1.10 > /dev/null 2>&1; then
+  aclocal-1.10 -I src/cf
+else
+  echo "No aclocal found on your system (looked for aclocal & aclocal-1.10)"
+  exit 1
+fi
+
 echo "Running autoconf"
 autoconf
 echo "Running autoconf for configure-libafs"