Re: Troubles with PACKAGE_TARNAME

[Alexandre Duret-Lutz]

>>> "Pavel" == Pavel Roskin <address@hidden> writes:

[...]

 Pavel> Automake can also be considered wrong because it trusts
 Pavel> an Autoconf macro AC_INIT more than Automake macro
 Pavel> AM_INIT_AUTOMAKE.  I would expect Automake to respect
 Pavel> its own macros more that the ones from Autoconf.

That makes sense.  I'm checking in the following fix.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1723
diff -u -r1.1723 ChangeLog
--- ChangeLog   2002/01/12 17:38:55     1.1723
+++ ChangeLog   2002/01/12 18:30:43
@@ -1,5 +1,12 @@
 2002-01-12  Alexandre Duret-Lutz  <address@hidden>
 
+       * 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  <address@hidden>
+
        * test/nodefine.test, test/nodefine2.test: Check that no-define
        works, not the contrary...
        * m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.38
diff -u -r1.38 init.m4
--- init.m4     2002/01/12 17:38:56     1.38
+++ init.m4     2002/01/12 18:30:56
@@ -56,16 +56,15 @@
   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])
-- 
Alexandre Duret-Lutz