Tweak again.

diff --git a/ChangeLog b/ChangeLog
index 6329392a5fb35dfeeb5a2491028e792a50fce586..7c8942a896324c9eb414c9300315063b1ceb092b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-25  Bruno Haible  <haible@clisp.cons.org>
+
+       * aclocal.sh: Tweak last patch for automake-1.4f.
+
 2001-06-23  Bruno Haible  <haible@clisp.cons.org>
 
        * aclocal.sh: Don't fail if aclocal isn't available.

diff --git a/aclocal.sh b/aclocal.sh
index 176bccc575bf240021c9859fa23d2c24aa29d0ed..03585c8e1efc3001d5b90e544f9ce8616e07e1f9 100755 (executable)
--- a/aclocal.sh
+++ b/aclocal.sh
@@ -36,14 +36,31 @@ fi
 #   /somepath/aclocal ...
 # or
 #   /somepath/missing aclocal ...
+# or
+#   /bin/sh /somepath/missing aclocal ...
+# or
+#   /bin/sh /somepath/missing aclocal --run ...
 # Extract the first part.
 ACLOCAL="$1"
 shift
 ACLOCAL2=
+ACLOCAL3=
+case "$ACLOCAL" in
+  *sh)
+    ACLOCAL="$1"
+    shift
+    ;;
+esac
 case "$ACLOCAL" in
   *missing)
     ACLOCAL2="$1"
     shift
+    case "$1" in
+      --run)
+        ACLOCAL3="$1"
+        shift
+        ;;
+    esac
     ;;
 esac
 
@@ -52,7 +69,7 @@ mkdir aclocal.tmp
 trap "rm -rf aclocal.tmp; exit 1" 1 2 15
 
 # First, copy the standard m4 files.
-for f in `"$ACLOCAL" $ACLOCAL2 --print-ac-dir`/*.m4; do
+for f in `"$ACLOCAL" $ACLOCAL2 $ACLOCAL3 --print-ac-dir`/*.m4; do
   cp $f aclocal.tmp
 done
 
@@ -76,7 +93,7 @@ do
 done
 
 # Now call `aclocal' for real.
-"$ACLOCAL" $ACLOCAL2 --acdir=aclocal.tmp $options
+"$ACLOCAL" $ACLOCAL2 $ACLOCAL3 --acdir=aclocal.tmp $options
 
 # Clean up temporary directory.
 rm -rf aclocal.tmp