From: Ralf Wildenhues Date: Wed, 19 Apr 2006 08:02:45 +0000 (+0000) Subject: Regenerate. X-Git-Tag: AUTOCONF-2.59d~119 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3486fd9dad8204a41ae9ec02880afd0fdbdf2167;p=thirdparty%2Fautoconf.git Regenerate. --- diff --git a/configure b/configure index 3affdf512..500a199f1 100755 --- a/configure +++ b/configure @@ -1298,8 +1298,7 @@ gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -1309,6 +1308,7 @@ generated by GNU Autoconf 2.59d. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -2132,34 +2132,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' # $ time sh -nx endless.sh # ^Csh -nx endless.sh 3,67s user 0,03s system 63% cpu 5,868 total # +# Also, some implementations of /bin/sh (e.g., Solaris 8) are soooo slow +# that they are unusable on large scripts like our testsuite. + # So before using `/bin/sh -n' to check our scripts, we first check -# that `/bin/sh -n' is not broken to death. +# that `/bin/sh -n' is known to not have these problems. -# A script that never returns. We don't care that it never returns, -# broken /bin/sh loop equally with `false', but it makes it easier to -# test the robustness in a good environment: just remove the `-n'. -{ echo "$as_me:$LINENO: checking whether sh -n works" >&5 -echo $ECHO_N "checking whether sh -n works... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking whether /bin/sh -n is known to work" >&5 +echo $ECHO_N "checking whether /bin/sh -n is known to work... $ECHO_C" >&6; } if test "${ac_cv_sh_n_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.sh <<_CONFEOF_ -while : -do - : -done -_CONFEOF_ - -(/bin/sh -n conftest.sh) & -sleep 2 -if kill $! >/dev/null 2>&1; then - # We managed to kill the child, which means that we probably - # can't trust `/bin/sh -n', hence the test failed. - ac_cv_sh_n_works=no -else - ac_cv_sh_n_works=yes + if ( + unset BASH_VERSION ZSH_VERSION + /bin/sh -c ' + test -n "${BASH_VERSION+set}" || # Bash + test -n "${KSH_VERSION+set}" || # pdksh + test -n "${ZSH_VERSION+set}" || # zsh + test -n "${.sh.version}" # ksh93; put this last since its syntax is dodgy + ' + ) 2>/dev/null +then ac_cv_sh_n_works=yes +else ac_cv_sh_n_works=no fi -rm conftest.sh fi { echo "$as_me:$LINENO: result: $ac_cv_sh_n_works" >&5 @@ -3327,6 +3322,17 @@ if $ac_cs_silent; then ac_configure_extra_args="$ac_configure_extra_args --silent" fi +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF exec 5>>config.log { echo @@ -3338,12 +3344,6 @@ _ASBOX _ACEOF cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF