automake/automake-1.14.1-improve-sanity-check.patch

56 lines
1.9 KiB
Diff

diff -ru automake-1.14.1/m4/sanity.m4 automake-1.14.1.new/m4/sanity.m4
--- automake-1.14.1/m4/sanity.m4 2013-07-22 02:25:27.000000000 +0400
+++ automake-1.14.1.new/m4/sanity.m4 2013-07-22 02:25:27.000000000 +0400
@@ -31,14 +31,14 @@
if (
am_has_slept=no
for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ echo "timestamp, slept: $am_has_slept" > !conftest.file
+ set X `ls -Lt "$srcdir/configure" !conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
+ set X `ls -t "$srcdir/configure" !conftest.file`
fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ if test "$[*]" != "X $srcdir/configure !conftest.file" \
+ && test "$[*]" != "X !conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -47,14 +47,14 @@
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ if test "$[2]" = !conftest.file || test $am_try -eq 2; then
break
fi
# Just in case.
sleep 1
am_has_slept=yes
done
- test "$[2]" = conftest.file
+ test "$[2]" = !conftest.file
)
then
# Ok.
@@ -67,7 +67,7 @@
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+if grep 'slept: no' !conftest.file >/dev/null 2>&1; then
( sleep 1 ) &
am_sleep_pid=$!
fi
@@ -78,5 +78,5 @@
wait $am_sleep_pid 2>/dev/null
fi
AC_MSG_RESULT([done])])
-rm -f conftest.file
+rm -f !conftest.file
])