Patch: FYI: use api version

[Tom Tromey]

I'm checking this in.

Now we use the API version, not the raw version, for versioned
installs.  This means we must guarantee compatibility in, say, the 1.5
series.  However I think that is easily achieved.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * Makefile.am (install-exec-hook): Use APIVERSION.
        * m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
        * m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
        APIVERSION.
        * automake.in (perllibdir): Use APIVERSION.
        (libdir): Likewise.
        * aclocal.in (perllibdir): Use APIVERSION.
        (APIVERSION): New global.
        (parse_arguments): Use APIVERSION.
        * configure.in (APIVERSION): New subst.
        (pkgvdatadir): Use APIVERSION.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.180
diff -u -r1.180 Makefile.am
--- Makefile.am 2002/01/15 23:54:09 1.180
+++ Makefile.am 2002/01/16 19:03:06
@@ -43,7 +43,7 @@
        @$(POST_INSTALL)
        @for p in $(bin_SCRIPTS); do \
          f="`echo $$p|sed '$(transform)'`"; \
-         fv="$$f-$(VERSION)"; \
+         fv="$$f-$(APIVERSION)"; \
          rm -f $(DESTDIR)$(bindir)/$$fv; \
          echo " ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
          ln $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.63
diff -u -r1.63 aclocal.in
--- aclocal.in 2002/01/15 23:54:09 1.63
+++ aclocal.in 2002/01/16 19:03:07
@@ -28,7 +28,7 @@
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@address@hidden@VERSION@";
+  my $perllibdir = $ENV{'perllibdir'} || 
"@datadir@/@address@hidden@APIVERSION@";
   unshift @INC, "$perllibdir";
 }
 
@@ -37,6 +37,7 @@
 
 # Some constants.
 $VERSION = "@VERSION@";
+$APIVERSION = "@APIVERSION@";
 $PACKAGE = "@PACKAGE@";
 $prefix = "@prefix@";
 # Note that this isn't pkgdatadir, but a separate directory.
@@ -215,7 +216,7 @@
     # Search the versioned directory near the end, and then the
     # unversioned directory last.  Only do this if the user didn't
     # override acdir.
-    push (@dirlist, "$acdir-$VERSION")
+    push (@dirlist, "$acdir-$APIVERSION")
        if $acdir eq $default_acdir;
 
     # By default $(datadir)/aclocal doesn't exist.  We don't want to
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1265
diff -u -r1.1265 automake.in
--- automake.in 2002/01/15 23:54:10 1.1265
+++ automake.in 2002/01/16 19:03:14
@@ -32,7 +32,7 @@
 BEGIN
 {
   my $prefix = "@prefix@";
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@address@hidden@VERSION@";
+  my $perllibdir = $ENV{'perllibdir'} || 
"@datadir@/@address@hidden@APIVERSION@";
   unshift @INC, "$perllibdir";
 }
 
@@ -125,7 +125,7 @@
 my $VERSION = "@VERSION@";
 my $PACKAGE = "@PACKAGE@";
 my $prefix = "@prefix@";
-my $libdir = "@datadir@/@address@hidden@VERSION@";
+my $libdir = "@datadir@/@address@hidden@APIVERSION@";
 
 # String constants.
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
Index: configure.in
===================================================================
RCS file: /cvs/automake/automake/configure.in,v
retrieving revision 1.99
diff -u -r1.99 configure.in
--- configure.in 2002/01/15 23:54:11 1.99
+++ configure.in 2002/01/16 19:03:16
@@ -26,8 +26,13 @@
 
 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/'`
+AC_SUBST(APIVERSION)
+
 # A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${VERSION}"
+pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 AC_SUBST(pkgvdatadir)
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
Index: m4/amversion.in
===================================================================
RCS file: /cvs/automake/automake/m4/amversion.in,v
retrieving revision 1.2
diff -u -r1.2 amversion.in
--- m4/amversion.in 2002/01/15 23:54:14 1.2
+++ m4/amversion.in 2002/01/16 19:03:17
@@ -18,7 +18,7 @@
 # ----------------------------
 # 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__version="$1"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="@APIVERSION@"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.40
diff -u -r1.40 init.m4
--- m4/init.m4 2002/01/15 23:54:14 1.40
+++ m4/init.m4 2002/01/16 19:03:17
@@ -75,7 +75,7 @@
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
 AM_MISSING_PROG(ACLOCAL, aclocal)
 AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, "automake-${am__version}")
+AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)