source: scripts/untested/autotools/patches/automake-1.5-test-fixes.patch@ 0f496c0

automake-1.5/tests/insthook.test

@@ -17 @@
-test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook
+test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook

tests/dirname.test

@@ -5 +5 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-AC_PLAIN_SCRIPT
+AC_INIT
 echo "1 /a/path/to/a/file      = _AM_DIRNAME([/a/path/to/a/file])"
 echo "2 another/path/to/a/file = _AM_DIRNAME([another/path/to/a/file])"
 echo "3 file                   = _AM_DIRNAME([file])"
@@ -15 +15 @@
 echo "7 /file                  = _AM_DIRNAME([/file])"
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 $ACLOCAL || exit 1
-$AUTOCONF || exit 1
-
-# fail gracefully if autoconf didn't support AC_PLAIN_SCRIPT, because it won't
-# support our regexps anyhow
-test -s configure || exit 77
+# fail gracefully if autoconf didn't support support our regexps anyhow
+$AUTOCONF || exit 77
 
-$SHELL ./configure >got || exit 1
+# Use --quiet otherwise unwelcome messages like "loading site script"
+# would cause a failure.
+./configure --quiet >got || exit 1
 
 cat >wanted <<EOF
 1 /a/path/to/a/file      = /a/path/to/a
@@ -40 +36 @@
 diff wanted got || exit 1
 
 exit 0
-

tests/ccnoco.test

@@ -39 +39 @@
 }
 END
 
-$needs_autoconf
 gcc -v || exit 77
 
 cat > Mycomp << 'END'
@@ -51 +50 @@
     ;;
 esac
 
-exec gcc ${1+"$@"}
+exec gcc "$@"
 END
 
 chmod +x Mycomp
@@ -59 +58 @@
 set -e
 
 
+# Ignore user CFLAGS.
+CFLAGS=
+export CFLAGS
+
 for conf in configure.1 configure.3; do
    cp $conf configure.in