AM_INIT_AUTOMAKE support for 2.49d AC_INIT

[Derek R. Price]

Backwards compatible support for the new AC_INIT.

ChangeLog entry:

    * m4/init.m4 (AM_INIT_AUTOMAKE): If AC_PACKAGE_NAME &
AC_PACKAGE_VERSION
    are set, use those to set PACKAGE & VERSION in lieu of arguments.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
It is error alone which needs the support of government.  Truth can stand by
itself.
                        - Thomas Jefferson


Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1012
diff -u -r1.1012 ChangeLog
--- ChangeLog   2001/02/09 07:06:52     1.1012
+++ ChangeLog   2001/02/09 21:32:15
@@ -1,3 +1,8 @@
+2001-02-09  Derek Price  <address@hidden>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): If AC_PACKAGE_NAME & AC_PACKAGE_VERSION
+       are set, use those to set PACKAGE & VERSION in lieu of arguments.
+
 2001-02-09  Tom Tromey  <address@hidden>
 
        Clean up maintainer-check warnings:
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.23
diff -u -r1.23 init.m4
--- init.m4     2001/02/08 06:32:16     1.23
+++ init.m4     2001/02/09 21:25:39
@@ -38,10 +38,15 @@
   AC_MSG_ERROR([source directory already configured; run \"make distclean\" 
there first])
 fi
 
-# Define the identity of the package.
-PACKAGE=$1
+# Define the identity of the package
+#
+# FIXME - this is redundant with the Autoconf 2.50 AC_INIT macro's behavior,
+# but we can't stop defining VERSION & PACKAGE without some complex switching
+# until we stop supporting Autoconf 2.13 since some make targets use these
+# variables
+ifdef([AC_PACKAGE_NAME],[PACKAGE=AC_PACKAGE_NAME],[PACKAGE=$1])
 AC_SUBST(PACKAGE)dnl
-VERSION=$2
+ifdef([AC_PACKAGE_VERSION],[VERSION=AC_PACKAGE_VERSION],[VERSION=$2])
 AC_SUBST(VERSION)dnl
 ifelse([$3],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.23
diff -u -r1.23 m4/init.m4
--- m4/init.m4  2001/02/08 06:32:16     1.23
+++ m4/init.m4  2001/02/09 21:25:39
@@ -38,10 +38,15 @@
   AC_MSG_ERROR([source directory already configured; run \"make distclean\" 
there first])
 fi
 
-# Define the identity of the package.
-PACKAGE=$1
+# Define the identity of the package
+#
+# FIXME - this is redundant with the Autoconf 2.50 AC_INIT macro's behavior,
+# but we can't stop defining VERSION & PACKAGE without some complex switching
+# until we stop supporting Autoconf 2.13 since some make targets use these
+# variables
+ifdef([AC_PACKAGE_NAME],[PACKAGE=AC_PACKAGE_NAME],[PACKAGE=$1])
 AC_SUBST(PACKAGE)dnl
-VERSION=$2
+ifdef([AC_PACKAGE_VERSION],[VERSION=AC_PACKAGE_VERSION],[VERSION=$2])
 AC_SUBST(VERSION)dnl
 ifelse([$3],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])