From 923ff9fdec218bcd6233cb0215d7a11ce77d2f28 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 1 Dec 2002 10:54:40 +0000 Subject: [PATCH] * configure.in: Do not use missing while checking for Autoconf's version, otherwise we won't notice that Autoconf isn't installed. Augment the error message with a few questions to help users. --- ChangeLog | 6 ++++++ Makefile.in | 8 ++++---- configure | 17 +++++++++++++---- configure.in | 11 +++++++++-- stamp-vti | 2 +- version.texi | 2 +- 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a92a06eb..a2b058ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-01 Alexandre Duret-Lutz + + * configure.in: Do not use missing while checking for Autoconf's + version, otherwise we won't notice that Autoconf isn't installed. + Augment the error message with a few questions to help users. + 2002-11-30 Alexandre Duret-Lutz * tests/gnits2.test, tests/gnits3.test: Move the greps inside the diff --git a/Makefile.in b/Makefile.in index 0037f9fc..9ff825ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -270,10 +270,10 @@ dist-info: $(INFO_DEPS) mostlyclean-aminfo: -rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \ - automake.fn automake.ky automake.log automake.op automake.ov \ - automake.pg automake.tmp automake.toc automake.tp automake.tr \ - automake.vr automake.vrs automake.dvi automake.pdf \ - automake.ps + automake.fn automake.ky automake.kys automake.log automake.op \ + automake.ov automake.pg automake.pgs automake.tmp \ + automake.toc automake.tp automake.tps automake.tr automake.vr \ + automake.vrs automake.dvi automake.pdf automake.ps maintainer-clean-aminfo: list='$(INFO_DEPS)'; for i in $$list; do \ diff --git a/configure b/configure index 16f52ccf..c9a7852f 100755 --- a/configure +++ b/configure @@ -1230,6 +1230,11 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; +# this way we can run Autoconf tests from configure without being +# bothered by `missing'. +am_AUTOCONF=${AUTOCONF-autoconf} + am__api_version="1.7a" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1707,13 +1712,17 @@ fi # autom4te.cache). mkdir conftest echo 'AC''_PREREQ(2.54)' > 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 +{ echo "$as_me:$LINENO: cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac" >&5 + (cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } || { - { { echo "$as_me:$LINENO: error: Autoconf 2.54 or better is required" >&5 -echo "$as_me: error: Autoconf 2.54 or better is required" >&2;} + { { echo "$as_me:$LINENO: error: Autoconf 2.54 or better is required. + Is it installed? Is it in your PATH? (try running \`autoconf --version') + Is it working? See also config.log for error messages before this one." >&5 +echo "$as_me: error: Autoconf 2.54 or better is required. + Is it installed? Is it in your PATH? (try running \`autoconf --version') + Is it working? See also config.log for error messages before this one." >&2;} { (exit 1); exit 1; }; } } rm -rf conftest diff --git a/configure.in b/configure.in index f6a7dd10..ce8b8544 100644 --- a/configure.in +++ b/configure.in @@ -24,6 +24,11 @@ AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR(automake.in) AC_CONFIG_AUX_DIR(lib) +# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; +# this way we can run Autoconf tests from configure without being +# bothered by `missing'. +am_AUTOCONF=${AUTOCONF-autoconf} + AM_INIT_AUTOMAKE([1.6 dist-bzip2]) # The API version is the base version. We must guarantee @@ -61,8 +66,10 @@ AC_CHECK_PROG([TEX], [tex], [tex]) # autom4te.cache). mkdir conftest echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac -AM_RUN_LOG([cd conftest && eval $AUTOCONF -o /dev/null conftest.ac]) || { - AC_MSG_ERROR([Autoconf 2.54 or better is required]) +AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]) || { + AC_MSG_ERROR([Autoconf 2.54 or better is required. + Is it installed? Is it in your PATH? (try running `autoconf --version') + Is it working? See also config.log for error messages before this one.]) } rm -rf conftest diff --git a/stamp-vti b/stamp-vti index b70ced41..a777d3cb 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 17 November 2002 +@set UPDATED 13 November 2002 @set UPDATED-MONTH November 2002 @set EDITION 1.7a @set VERSION 1.7a diff --git a/version.texi b/version.texi index b70ced41..a777d3cb 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 17 November 2002 +@set UPDATED 13 November 2002 @set UPDATED-MONTH November 2002 @set EDITION 1.7a @set VERSION 1.7a -- 2.43.5