* m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from

AM_INIT_AUTOMAKE arguments when using the old-style call.
Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
Suggested by Pavel Roskin.

diff --git a/ChangeLog b/ChangeLog
index c1ba5e812fa8b2f4621269c9bf49df396c0ac630..cc6bb2caf56cf09639a1a3d1035ebf54e3aa4316 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-12  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from
+       AM_INIT_AUTOMAKE arguments when using the old-style call.
+       Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
+       Suggested by Pavel Roskin.
+
 2002-01-12  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * test/nodefine.test, test/nodefine2.test: Check that no-define

diff --git a/aclocal.m4 b/aclocal.m4
index d19358eada63dff96a67bbd1d0c06be3a3685224..a32dde04788910e9ba85e1bda4d4ab2e6c2fb90d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -69,16 +69,15 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
+# Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-  [m4_ifval([$3], [_AM_SET_OPTION([no-define])])],
-  [_AM_SET_OPTIONS([$1])])dnl
-
-# Define the identity of the package.
-AC_SUBST([PACKAGE],
-[m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [$1])])dnl
-AC_SUBST([VERSION],
-[m4_ifset([AC_PACKAGE_VERSION], [AC_PACKAGE_VERSION], [$2])])dnl
+  [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+   AC_SUBST([PACKAGE], [$1])dnl
+   AC_SUBST([VERSION], [$2])],
+  [_AM_SET_OPTIONS([$1])
+   AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
+   AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])

diff --git a/configure b/configure
index d0a00bc0fbe8caed12b7459f731b836dc2d52521..eb469e130e3774d8fd76db8ed5ee58d20df0c268 100755 (executable)
--- a/configure
+++ b/configure
@@ -1419,10 +1419,11 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
    { (exit 1); exit 1; }; }
 fi
 
-
 # Define the identity of the package.
-PACKAGE=automake
-VERSION=1.5c
+
+   PACKAGE=automake
+
+   VERSION=1.5c
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/m4/init.m4 b/m4/init.m4
index 32fbf7d67e104838c43aa75bcb3617dcb8d825d3..2fe1a5b9ff4587e296e2ba566810024aa17deeb6 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -56,16 +56,15 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
+# Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-  [m4_ifval([$3], [_AM_SET_OPTION([no-define])])],
-  [_AM_SET_OPTIONS([$1])])dnl
-
-# Define the identity of the package.
-AC_SUBST([PACKAGE],
-[m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [$1])])dnl
-AC_SUBST([VERSION],
-[m4_ifset([AC_PACKAGE_VERSION], [AC_PACKAGE_VERSION], [$2])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])