aclocal may be missing.

diff --git a/ChangeLog b/ChangeLog
index 49889d23132bf8074ab78c2b2b578ba2e7c75083..6329392a5fb35dfeeb5a2491028e792a50fce586 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-23  Bruno Haible  <haible@clisp.cons.org>
+
+       * aclocal.sh: Don't fail if aclocal isn't available.
+
 2001-06-15  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Remove post-processing of tests/Makefile.

diff --git a/aclocal.sh b/aclocal.sh
index f1cbc627dbc645d4debdfb9d296928a8cde79287..4d9ed94855cb16747aa36e6f96cc0290b3fc6f51 100755 (executable)
--- a/aclocal.sh
+++ b/aclocal.sh
@@ -32,15 +32,28 @@ if test $# = 0; then
   exit 1
 fi
 
+# The command line is of the form
+#   /somepath/aclocal ...
+# or
+#   /somepath/missing aclocal ...
+# Extract the first part.
 ACLOCAL="$1"
 shift
+ACLOCAL2=
+case "$ACLOCAL" in
+  *missing)
+    ACLOCAL2="$1"
+    shift
+    esac
+    ;;
+esac
 
 # Prepare temporary directory.
 mkdir aclocal.tmp
 trap "rm -rf aclocal.tmp; exit 1" 1 2 15
 
 # First, copy the standard m4 files.
-for f in `"$ACLOCAL" --print-ac-dir`/*.m4; do
+for f in `"$ACLOCAL" $ACLOCAL2 --print-ac-dir`/*.m4; do
   cp $f aclocal.tmp
 done
 
@@ -64,7 +77,7 @@ do
 done
 
 # Now call `aclocal' for real.
-"$ACLOCAL" --acdir=aclocal.tmp $options
+"$ACLOCAL" $ACLOCAL2 --acdir=aclocal.tmp $options
 
 # Clean up temporary directory.
 rm -rf aclocal.tmp