| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | By default automake puts "sleep 1" into the start of configure scripts |
| 2 | which adds pointless delays to them. Rather than do this, lets just assume |
| 3 | our systems are sane. |
| 4 | |
| 5 | RP |
| 6 | 2015/12/7 |
| 7 | Upstream-Status: Inappropriate |
| 8 | |
| 9 | Index: automake-1.15/m4/sanity.m4 |
| 10 | =================================================================== |
| 11 | --- automake-1.15.orig/m4/sanity.m4 |
| 12 | +++ automake-1.15/m4/sanity.m4 |
| 13 | @@ -23,60 +23,5 @@ case $srcdir in |
| 14 | AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
| 15 | esac |
| 16 | |
| 17 | -# Do 'set' in a subshell so we don't clobber the current shell's |
| 18 | -# arguments. Must try -L first in case configure is actually a |
| 19 | -# symlink; some systems play weird games with the mod time of symlinks |
| 20 | -# (eg FreeBSD returns the mod time of the symlink's containing |
| 21 | -# directory). |
| 22 | -if ( |
| 23 | - am_has_slept=no |
| 24 | - for am_try in 1 2; do |
| 25 | - echo "timestamp, slept: $am_has_slept" > conftest.file |
| 26 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
| 27 | - if test "$[*]" = "X"; then |
| 28 | - # -L didn't work. |
| 29 | - set X `ls -t "$srcdir/configure" conftest.file` |
| 30 | - fi |
| 31 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
| 32 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
| 33 | - |
| 34 | - # If neither matched, then we have a broken ls. This can happen |
| 35 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
| 36 | - # broken ls alias from the environment. This has actually |
| 37 | - # happened. Such a system could not be considered "sane". |
| 38 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
| 39 | - alias in your environment]) |
| 40 | - fi |
| 41 | - if test "$[2]" = conftest.file || test $am_try -eq 2; then |
| 42 | - break |
| 43 | - fi |
| 44 | - # Just in case. |
| 45 | - sleep 1 |
| 46 | - am_has_slept=yes |
| 47 | - done |
| 48 | - test "$[2]" = conftest.file |
| 49 | - ) |
| 50 | -then |
| 51 | - # Ok. |
| 52 | - : |
| 53 | -else |
| 54 | - AC_MSG_ERROR([newly created file is older than distributed files! |
| 55 | -Check your system clock]) |
| 56 | -fi |
| 57 | AC_MSG_RESULT([yes]) |
| 58 | -# If we didn't sleep, we still need to ensure time stamps of config.status and |
| 59 | -# generated files are strictly newer. |
| 60 | -am_sleep_pid= |
| 61 | -if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
| 62 | - ( sleep 1 ) & |
| 63 | - am_sleep_pid=$! |
| 64 | -fi |
| 65 | -AC_CONFIG_COMMANDS_PRE( |
| 66 | - [AC_MSG_CHECKING([that generated files are newer than configure]) |
| 67 | - if test -n "$am_sleep_pid"; then |
| 68 | - # Hide warnings about reused PIDs. |
| 69 | - wait $am_sleep_pid 2>/dev/null |
| 70 | - fi |
| 71 | - AC_MSG_RESULT([done])]) |
| 72 | -rm -f conftest.file |
| 73 | ]) |