From: Alexandre Duret-Lutz Date: Mon, 7 Jan 2002 21:10:26 +0000 (+0000) Subject: * configure.in: Run the Autoconf test in a subdirectory, then X-Git-Tag: Release-1-5d~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=115c3b80bf78bc5e4ed33c9a1c710c874b680c62;p=thirdparty%2Fautomake.git * configure.in: Run the Autoconf test in a subdirectory, then erase this directory. --- diff --git a/ChangeLog b/ChangeLog index a3cdaeb1a..33c36a74d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-07 Alexandre Duret-Lutz + + * configure.in: Run the Autoconf test in a subdirectory, then + erase this directory. + 2002-01-07 Alexandre Duret-Lutz * configure.in (AUTOMAKE): Create m4/amversion.m4. diff --git a/configure b/configure index 0754b60c8..d8e76d0c0 100755 --- a/configure +++ b/configure @@ -1517,9 +1517,13 @@ echo "$as_me: error: perl 5.005 or better is required" >&2;} { (exit 1); exit 1; }; } } -echo 'AC''_PREREQ(2.52)' > conftest.ac -{ echo "$as_me:$LINENO: eval $AUTOCONF -o /dev/null conftest.ac" >&5 - (eval $AUTOCONF -o /dev/null conftest.ac) >&5 2>&5 +# Test for Autoconf. We run Autoconf in a subdirectory to ease +# deletion of any files created (such as those added to +# autom4te.cache). +mkdir conftest +echo 'AC''_PREREQ(2.52)' > conftest/conftest.ac +{ echo "$as_me:$LINENO: cd conftest && eval $AUTOCONF -o /dev/null conftest.ac" >&5 + (cd conftest && eval $AUTOCONF -o /dev/null conftest.ac) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } || { @@ -1527,7 +1531,7 @@ echo 'AC''_PREREQ(2.52)' > conftest.ac echo "$as_me: error: Autoconf 2.52 or better is required" >&2;} { (exit 1); exit 1; }; } } -rm conftest.ac +rm -rf conftest ac_config_files="$ac_config_files automake" diff --git a/configure.in b/configure.in index c1027ab4a..b02095612 100644 --- a/configure.in +++ b/configure.in @@ -40,11 +40,15 @@ $PERL -e 'require 5.005;' || { AC_MSG_ERROR([perl 5.005 or better is required]) } -echo 'AC''_PREREQ(2.52)' > conftest.ac -AM_RUN_LOG([eval $AUTOCONF -o /dev/null conftest.ac]) || { +# Test for Autoconf. We run Autoconf in a subdirectory to ease +# deletion of any files created (such as those added to +# autom4te.cache). +mkdir conftest +echo 'AC''_PREREQ(2.52)' > conftest/conftest.ac +AM_RUN_LOG([cd conftest && eval $AUTOCONF -o /dev/null conftest.ac]) || { AC_MSG_ERROR([Autoconf 2.52 or better is required]) } -rm conftest.ac +rm -rf conftest AC_CONFIG_FILES([automake], [chmod +x automake]) AC_CONFIG_FILES([aclocal], [chmod +x aclocal])