* configure.ac: Check that autoconf is installed, that it works,

and that it is recent enough in three steps, not one.

diff --git a/ChangeLog b/ChangeLog
index 138f10f710efe6595f7796c074eaaeefaa7fcc28..38b42d667311e6dcd90786f07824df7c0260dfa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * configure.ac: Check that autoconf is installed, that it works,
+       and that it is recent enough in three steps, not one.
+
        * NEWS: Minor edits.
 
        * lib/Makefile.am (dist_script_DATA): Move config-ml.in ...

diff --git a/configure b/configure
index c9d95624d081749a358da9fc38191f705ce4dccd..3bd3df42c5c75a8f08008cfef1696e081cb52ecb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1807,23 +1807,91 @@ fi
 
 # 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.58)' > conftest/conftest.ac
-{ 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
+# autom4te.cache).  We used to perform only the last of the three
+# following tests, but some users were unable to figure out that their
+# installation was broken since --version appeared to work.
+
+echo "$as_me:$LINENO: checking whether autoconf is installed" >&5
+echo $ECHO_N "checking whether autoconf is installed... $ECHO_C" >&6
+if test "${am_cv_autoconf_installed+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if { echo "$as_me:$LINENO: eval $am_AUTOCONF --version" >&5
+   (eval $am_AUTOCONF --version) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || {
-   { { echo "$as_me:$LINENO: error: Autoconf 2.58 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
+   (exit $ac_status); };
+then
+  am_cv_autoconf_installed=yes
+else
+  am_cv_autoconf_installed=no
+fi
+fi
+echo "$as_me:$LINENO: result: $am_cv_autoconf_installed" >&5
+echo "${ECHO_T}$am_cv_autoconf_installed" >&6
+if test "$am_cv_autoconf_installed" = no; then
+  { { echo "$as_me:$LINENO: error: Autoconf 2.58 or better is required.
+    Please make sure it is installed and in your PATH." >&5
 echo "$as_me: error: Autoconf 2.58 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;}
+    Please make sure it is installed and in your PATH." >&2;}
    { (exit 1); exit 1; }; }
-}
+fi
+
+echo "$as_me:$LINENO: checking whether autoconf works" >&5
+echo $ECHO_N "checking whether autoconf works... $ECHO_C" >&6
+if test "${am_cv_autoconf_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  mkdir conftest
+echo 'AC''_INIT' > conftest/conftest.ac
+if { 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); };
+then
+  am_cv_autoconf_works=yes
+else
+  am_cv_autoconf_works=no
+fi
+rm -rf conftest
+fi
+echo "$as_me:$LINENO: result: $am_cv_autoconf_works" >&5
+echo "${ECHO_T}$am_cv_autoconf_works" >&6
+if test "$am_cv_autoconf_works" = no; then
+  { { echo "$as_me:$LINENO: error: The installed version of autoconf does not work.
+    Please check config.log for error messages before this one." >&5
+echo "$as_me: error: The installed version of autoconf does not work.
+    Please check config.log for error messages before this one." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+echo "$as_me:$LINENO: checking whether autoconf is recent enough" >&5
+echo $ECHO_N "checking whether autoconf is recent enough... $ECHO_C" >&6
+if test "${am_cv_autoconf_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  mkdir conftest
+echo 'AC''_PREREQ(2.58)' > conftest/conftest.ac
+if { 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); };
+then
+  am_cv_autoconf_version=yes
+else
+  am_cv_autoconf_version=no
+fi
 rm -rf conftest
+fi
+echo "$as_me:$LINENO: result: $am_cv_autoconf_version" >&5
+echo "${ECHO_T}$am_cv_autoconf_version" >&6
+if test "$am_cv_autoconf_version" = no; then
+  { { echo "$as_me:$LINENO: error: Autoconf 2.58 or better is required." >&5
+echo "$as_me: error: Autoconf 2.58 or better is required." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 # Test for ln.  We need use it to install the versioned binaries.
 echo "$as_me:$LINENO: checking whether ln works" >&5

diff --git a/configure.ac b/configure.ac
index a5cfb58891d66848885203db76eacc2a55c015ff..e5122a15772c7c5d87a398a1c004487baedaeedf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,15 +70,50 @@ AC_CHECK_PROG([TEX], [tex], [tex])
 
 # 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
+# autom4te.cache).  We used to perform only the last of the three
+# following tests, but some users were unable to figure out that their
+# installation was broken since --version appeared to work.
+
+AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed],
+[if AM_RUN_LOG([eval $am_AUTOCONF --version]);
+then
+  am_cv_autoconf_installed=yes
+else
+  am_cv_autoconf_installed=no
+fi])
+if test "$am_cv_autoconf_installed" = no; then
+  AC_MSG_ERROR([Autoconf 2.58 or better is required.
+    Please make sure it is installed and in your PATH.])
+fi
+
+AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
+[mkdir conftest
+echo 'AC''_INIT' > conftest/conftest.ac
+if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
+then
+  am_cv_autoconf_works=yes
+else
+  am_cv_autoconf_works=no
+fi
+rm -rf conftest])
+if test "$am_cv_autoconf_works" = no; then
+  AC_MSG_ERROR([The installed version of autoconf does not work.
+    Please check config.log for error messages before this one.])
+fi
+
+AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
+[mkdir conftest
 echo 'AC''_PREREQ(2.58)' > conftest/conftest.ac
-AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]) || {
-   AC_MSG_ERROR([Autoconf 2.58 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
+if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
+then
+  am_cv_autoconf_version=yes
+else
+  am_cv_autoconf_version=no
+fi
+rm -rf conftest])
+if test "$am_cv_autoconf_version" = no; then
+  AC_MSG_ERROR([Autoconf 2.58 or better is required.])
+fi
 
 # Test for ln.  We need use it to install the versioned binaries.
 AC_MSG_CHECKING([whether ln works])

diff --git a/doc/Makefile.in b/doc/Makefile.in
index ba81d6f04a9e1e1c9ffed481defb1772bb157a10..ed04c5724e5fa56a755757f07d6edd0014ff8e83 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -60,6 +60,8 @@ HTMLS = automake.html
 TEXINFOS = automake.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
 am__installdirs = $(DESTDIR)$(infodir)
 ETAGS = etags
@@ -206,7 +208,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(TEXI2PDF) $<
 
 .texi.html:
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
+       $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
         -o $@ $<
 $(srcdir)/automake.info: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
 automake.dvi: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)