* configure.in (APIVERSION): Refined definition.

diff --git a/ChangeLog b/ChangeLog
index 7effd0a..c1b5d55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-18  Tom Tromey  <tromey@redhat.com>
 
+       * configure.in (APIVERSION): Refined definition.
+
+2002-01-18  Tom Tromey  <tromey@redhat.com>
+
        * missing: Updated.
        * lib/missing: Accept versioned aclocal.
        * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal.

diff --git a/aclocal.m4 b/aclocal.m4
index a210bb7..d93f85e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -86,7 +86,7 @@ _AM_IF_OPTION([no-define],,
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal)
+AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}")
 AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
 AM_MISSING_PROG(AUTOHEADER, autoheader)
@@ -130,7 +130,7 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.5c"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version=""])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------

diff --git a/configure b/configure
index 8296c3c..9496f8c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1160,7 +1160,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
-am__api_version="1.5c"
+am__api_version=""
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1435,7 +1435,7 @@ _ACEOF
 
 # Some tools Automake needs.
 
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
+ACLOCAL=${ACLOCAL-"${am_missing_run}"aclocal-${am__api_version}""}
 
 
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
@@ -1462,7 +1462,12 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # The API version is the base version.  We must guarantee
 # compatibility for all releases with the same API version.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
+# Our current rule is that:
+# * All releases, including the prereleases, in an X.Y series
+#   are compatible.  So 1.5.1c is compatible with 1.5.
+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
+#   aren't the same.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]?\).*$/\1/'`
 
 
 # A versioned directory, defined here for convenience.

diff --git a/configure.in b/configure.in
index e2205cf..f2bfe9f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,12 @@ AM_INIT_AUTOMAKE([1.5 dist-bzip2])
 
 # The API version is the base version.  We must guarantee
 # compatibility for all releases with the same API version.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*$/\1/'`
+# Our current rule is that:
+# * All releases, including the prereleases, in an X.Y series
+#   are compatible.  So 1.5.1c is compatible with 1.5.
+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
+#   aren't the same.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'`
 AC_SUBST(APIVERSION)
 
 # A versioned directory, defined here for convenience.