Re: misleading note in libtool header

[Ralf Wildenhues]

* Bob Friesenhahn wrote on Wed, Feb 08, 2006 at 10:14:43PM CET:
> On Wed, 8 Feb 2006, Ralf Wildenhues wrote:
> 
> >We hardwire the `GNU' in libtool.m4's
> >_LT_CONFIG:
> >| # Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION
> >
> >Either that should be hard-coded to always show the actual Libtool
> >version this corresponds to, or the `GNU' should not be there.
> 
> config.status doesn't come from libtool.  It seems that the message is 
> trying to identify the origin of config.status, which is really from 
> Autoconf.  So the message makes more sense if the Autoconf version 
> goes there.

If you ask me, I would much rather see either the package's version as
is done now, not the Autoconf one: the head of config.log has that
already; the Libtool version would be interesting, too, but it can be 
found out from macro_version/macro_revision of `libtool --config'
(this is CVS HEAD only).

So really my comment is about the `GNU' only.  The patch below should
cater for this.  OK to apply?

BTW, Autoconf and Automake also use the `GNU ' prefix in their AC_INIT
arguments.

Cheers,
Ralf

        * configure.ac (AC_INIT): Change the `PACKAGE' argument to be
        `GNU libtool' instead of `libtool'.
        * libltdl/m4/libtool.m4 (_LT_CONFIG): Set $PACKAGE_NAME, and
        use it in the header notice of the generated `libtool' script.

Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.76
diff -u -r1.76 configure.ac
--- configure.ac        7 Nov 2005 12:34:26 -0000       1.76
+++ configure.ac        9 Feb 2006 09:55:11 -0000
@@ -24,7 +24,7 @@
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.1a], address@hidden)
+AC_INIT([GNU libtool], [2.1a], address@hidden)
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.59
diff -u -r1.59 libtool.m4
--- libltdl/m4/libtool.m4       3 Feb 2006 20:03:54 -0000       1.59
+++ libltdl/m4/libtool.m4       9 Feb 2006 09:55:13 -0000
@@ -670,7 +670,7 @@
 #! $SHELL
 
 # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building 
support services.
-# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE_NAME$TIMESTAMP) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
@@ -733,6 +733,7 @@
 ],
 [m4_if([$1], [], [
     PACKAGE='$PACKAGE'
+    PACKAGE_NAME='$PACKAGE_NAME'
     VERSION='$VERSION'
     TIMESTAMP='$TIMESTAMP'
     RM='$RM'