* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.58.

* configure.ac: Require Autoconf 2.58a, and check for 2.58.

5 files changed, 102 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index b7d2dfd42..e5e4d5c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.58.
+	* configure.ac: Require Autoconf 2.58a, and check for 2.58.
+
 2003-10-27  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Erase %STAMP%.
diff --git a/NEWS b/NEWS
index e9babbf3f..ea61b08ea 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ New in 1.7a:
 
 * Requirements
 
-  - Autoconf 2.57b or greater is required.
+  - Autoconf 2.58 or greater is required.
 
 * New features
 
diff --git a/configure b/configure
index 9390846a0..f94728fe7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57f for GNU Automake 1.7a.
+# Generated by GNU Autoconf 2.58a for GNU Automake 1.7a.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -826,12 +826,45 @@ case $srcdir in
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -856,7 +889,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Automake configure 1.7a
-generated by GNU Autoconf 2.57f
+generated by GNU Autoconf 2.58a
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -870,7 +903,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57f.  Invocation command line was
+generated by GNU Autoconf 2.58a.  Invocation command line was
 
   $ $0 $@
 
@@ -1046,7 +1079,7 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1757,16 +1790,16 @@ fi
 # deletion of any files created (such as those added to
 # autom4te.cache).
 mkdir conftest
-echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac
+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
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } || {
-   { { echo "$as_me:$LINENO: error: Autoconf 2.54 or better is required.
+   { { 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
-echo "$as_me: error: Autoconf 2.54 or better is required.
+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;}
    { (exit 1); exit 1; }; }
@@ -2241,7 +2274,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57f.  Invocation command line was
+generated by GNU Autoconf 2.58a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2296,7 +2329,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Automake config.status 1.7a
-configured by $0, generated by GNU Autoconf 2.57f,
+configured by $0, generated by GNU Autoconf 2.58a,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -2652,12 +2685,45 @@ case $srcdir in
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
 
   case $INSTALL in
diff --git a/configure.ac b/configure.ac
index 8381180e0..a5cfb5889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_PREREQ(2.57b)
+dnl Autoconf 2.58 defines abs_top_builddir incorrectly, so we
+dnl have to require 2.58a, otherwise all our test cases will fail
+dnl (abs_top_builddir is used in tests/automake.in).  Note that
+dnl this is a requirement for the Automake package itself.
+dnl Automake users can still use Autoconf 2.58.
+AC_PREREQ(2.58a)
 AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
@@ -67,9 +72,9 @@ AC_CHECK_PROG([TEX], [tex], [tex])
 # deletion of any files created (such as those added to
 # autom4te.cache).
 mkdir conftest
-echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac
+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.54 or better is required.
+   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.])
 }
diff --git a/m4/init.m4 b/m4/init.m4
index f0222ee6e..01c249acb 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -35,7 +35,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.57b])dnl
+[AC_PREREQ([2.58])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl