* lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Accept $4.

* doc/autoconf.texi (Initializing configure): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 9c12cc1467ccdf8327b2916bb917aaa6f25a1633..92b59a24c1ae2079fb847a3d7d1ce9e3e25e72f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-31  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Accept $4.
+       * doc/autoconf.texi (Initializing configure): Adjust.
+
 2002-01-30  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Map non

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index efa5a36b7beb1f9d41fb7f828f1d3d3c5fb62e43..846d0079d6ed292a23e3de8ef08c1716c1d2eb4b 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1479,16 +1479,24 @@ Every @command{configure} script must call @code{AC_INIT} before doing
 anything else.  The only other required macro is @code{AC_OUTPUT}
 (@pxref{Output}).
 
-@defmac AC_INIT (@var{package})
+@defmac AC_INIT (@var{package}, @var{version}, @ovar{bug-report}, @ovar{tarname})
 @acindex INIT
 Process any command-line arguments and perform various initializations
-and verifications.  Set the name of the @var{package} and its
-@var{version}.  The optional argument @var{bug-report-address} should be
-the email to which users should send bug reports.
+and verifications.
+
+Set the name of the @var{package} and its @var{version}.  These are
+typically used in @option{--version} support, including that of
+@command{configure}.  The optional argument @var{bug-report} should be
+the email to which users should send bug reports.  The package
+@var{tarname} differs from @var{package}: the latter designates the full
+package name (e.g., @samp{GNU Autoconf}), while the latter is meant for
+distribution tar ball names (e.g., @samp{autoconf}).  It defaults to
+@var{package} once @samp{GNU } strip, lower cased, and all non
+alphanumeric character mapped onto @samp{-}.
 
-These three arguments should be @emph{static}, i.e., there should not be
-any shell computation, but they can be computed by M4.  The following M4
-macros (e.g., @code{AC_PACKAGE_NAME}), output variables (e.g.,
+It is preferable that these arguments be static, i.e., there should not
+be any shell computation, but they can be computed by M4.  The following
+M4 macros (e.g., @code{AC_PACKAGE_NAME}), output variables (e.g.,
 @code{PACKAGE_NAME}), and preprocessor symbols (e.g.,
 @code{PACKAGE_NAME}) are then defined:
 
@@ -1503,8 +1511,7 @@ Exactly @var{package}.
 @acindex PACKAGE_TARNAME
 @ovindex PACKAGE_TARNAME
 @cvindex PACKAGE_TARNAME
-@var{package} once @samp{GNU } strip, lower cased, and all non
-alphanumeric character mapped onto @samp{-}.
+Exactly @var{tarname}.
 
 @item @code{AC_PACKAGE_VERSION}, @code{PACKAGE_VERSION}
 @acindex PACKAGE_VERSION
@@ -1522,26 +1529,8 @@ Exactly @samp{@var{package} @var{version}}.
 @acindex PACKAGE_BUGREPORT
 @ovindex PACKAGE_BUGREPORT
 @cvindex PACKAGE_BUGREPORT
-Exactly @var{bug-report-address}.
+Exactly @var{bug-report}.
 @end table
-
-All these values may be changed.  For instance if the default value for
-@code{AC_PACKAGE_NAME} does not suit your application, you can either
-use:
-
-@example
-m4_define([AC_PACKAGE_TARNAME], [GNU-Foo-Bar-1.0])
-AC_INIT([GNU Foo Bar], [1.0])
-@end example
-
-@noindent
-or
-
-@example
-AC_INIT([GNU Foo Bar], [1.0])
-m4_define([AC_PACKAGE_TARNAME], [GNU-Foo-Bar-1.0])
-AC_SUBST([PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])
-@end example
 @end defmac
 
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c121a95dd393399fb6bbf3bff7e9970b5c18fdee..233d201ea8a376cd6ebb17cb93a323a7651afbe7 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -283,8 +283,8 @@ m4_popdef([AC_Prefix])dnl
 
 
 
-# _AC_INIT_PACKAGE(PACKAGE-NAME, VERSION, BUG-REPORT)
-# ---------------------------------------------------
+# _AC_INIT_PACKAGE(PACKAGE-NAME, VERSION, BUG-REPORT, [TARNAME])
+# --------------------------------------------------------------
 m4_define([_AC_INIT_PACKAGE],
 [AS_LITERAL_IF([$1], [], [m4_warn([syntax], [AC_INIT: not a literal: $1])])
 AS_LITERAL_IF([$2], [],  [m4_warn([syntax], [AC_INIT: not a literal: $2])])
@@ -293,9 +293,11 @@ m4_ifndef([AC_PACKAGE_NAME],
           [m4_define([AC_PACKAGE_NAME],     [$1])])
 m4_ifndef([AC_PACKAGE_TARNAME],
           [m4_define([AC_PACKAGE_TARNAME],
-                     m4_bpatsubst(m4_tolower(m4_bpatsubst([[[$1]]], [GNU ])),
-                                  [[^abcdefghijklmnopqrstuvwxyz0123456789]],
-                                  [-]))])
+                     m4_default([$4],
+                                [m4_bpatsubst(m4_tolower(m4_bpatsubst([[[$1]]],
+                                                                     [GNU ])),
+                                 [[^abcdefghijklmnopqrstuvwxyz0123456789]],
+                                 [-])]))])
 m4_ifndef([AC_PACKAGE_VERSION],
           [m4_define([AC_PACKAGE_VERSION],   [$2])])
 m4_ifndef([AC_PACKAGE_STRING],