Fix bootstrap script to cope with changed AC_INIT arguments.

* bootstrap: When extracting PACKAGE and VERSION from AC_INIT
arguments, be sure to remove a 'GNU ' prefix and lowercase the
package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
appropriately for GNU software.  Pass these variables to the
make commands creating tests/package.m4 and other files.
* Makefile.am (edit): Fix substitution of PACKAGE_NAME and
PACKAGE_STRING.
* libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
@PACKAGE_STRING@.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 958cca9e6cc487794cdf5cca4e0c6db84fe0d628..cc1144555321017c0c62f627eaf8c1cddf010cff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix bootstrap script to cope with changed AC_INIT arguments.
+       * bootstrap: When extracting PACKAGE and VERSION from AC_INIT
+       arguments, be sure to remove a 'GNU ' prefix and lowercase the
+       package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
+       appropriately for GNU software.  Pass these variables to the
+       make commands creating tests/package.m4 and other files.
+       * Makefile.am (edit): Fix substitution of PACKAGE_NAME and
+       PACKAGE_STRING.
+       * libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
+       @PACKAGE_STRING@.
+
 2010-06-15  Peter Rosin  <peda@lysator.liu.se>
 
        On Windows, find potential libs regardless of file name case.

diff --git a/Makefile.am b/Makefile.am
index 1114e6773125aa58e19e865d86259f718cb707c2..d0688eec20df3e7f86c806e0dd3c464e320b4ce6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,8 @@ edit = sed \
        -e 's,@PACKAGE\@,$(PACKAGE),g' \
        -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-       -e 's,@PACKAGE_NAME\@,$(PACKAGE),g' \
-       -e 's,@PACKAGE_STRING\@,$(PACKAGE) $(VERSION),g' \
+       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+       -e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
        -e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
        -e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
        -e 's,@SED\@,$(SED),g' \

diff --git a/bootstrap b/bootstrap
index d505c362caac70d6c1962750b3ddd66f0bb01fd0..81ed4b087c7a8d241a7bdaed7882254a7cbcaf20 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
 #! /bin/sh
 # bootstrap -- Helps bootstrapping libtool, when checked out from repository.
 #
-#   Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc,
+#   Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Free Software
+#   Foundation, Inc,
 #   Mritten by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -116,9 +117,18 @@ fi
 set dummy `$SED -n '
     /AC_INIT/{
        s/[][,()]/ /g
+       s/ GNU / /
        p
     }' configure.ac`
 shift
+PACKAGE=`echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+PACKAGE_NAME=$2
+PACKAGE_URL=
+if grep 'AC_INIT.*GNU' configure.ac >/dev/null; then
+  PACKAGE_NAME="GNU $PACKAGE_NAME"
+  PACKAGE_URL="http://www.gnu.org/software/$PACKAGE/"
+fi
+VERSION=$3
 
 # Whip up a dirty Makefile:
 makes='Makefile.am libltdl/Makefile.inc'
@@ -135,13 +145,15 @@ rm -f $auxdir/ltmain.sh $m4dir/ltversion.m4
 $MAKE ./$auxdir/ltmain.sh ./$m4dir/ltversion.m4 \
     ./libtoolize.in ./tests/defs.in ./tests/package.m4 \
     ./tests/testsuite ./libltdl/Makefile.am ./doc/notes.txt \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
-    PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    PACKAGE_NAME="$PACKAGE_NAME" PACKAGE_URL="$PACKAGE_URL" \
+    PACKAGE_BUGREPORT="bug-$PACKAGE@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
     AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO" \
     GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 test -f clcommit.m4sh && $MAKE -f Makefile.maint ./commit \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    M4SH="$AUTOM4TE -l m4sh" \
     SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 rm -f Makefile

diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index a528fefde0063e1f586fe37d7a8235056e24a3b7..38e62323ca711f0e2686b3de180bcca6f0d4ebd8 100644 (file)
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -99,7 +99,7 @@ test -d "$top_srcdir" || top_srcdir='@top_srcdir@'
 
 # Initialisation:
 mailnotify_flags=
-package_name="@PACKAGE_NAME@"
+package_name="@PACKAGE@"
 sendmail_to=
 valid_release_types='alpha,beta,release-candidate,stable'