[SCM] GNU Libtool branch, master, updated. v2.2.10-11-g6558f03

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  6558f036e358528fa5d849d4ce56ebd057474d72 (commit)
      from  2a4278537315a9b073f2669e56753b41d5ab493d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6558f036e358528fa5d849d4ce56ebd057474d72
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 13 12:28:58 2010 +0200

    Print Libtool project URL in program --help output.
    
    * configure.ac (AC_INIT): Set PACKAGE argument to `GNU Libtool',
    so Autoconf knows this is GNU software.  For Autoconf < 2.64,
    if AC_PACKAGE_URL is not defined, substitute PACKAGE_URL.
    * Makefile.am (edit): Substitute PACKAGE_URL.
    ($(srcdir)/tests/package.m4): Also depend on Makefile.am.
    Define AT_PACKAGE_URL, for `tests/testsuite --help' output.
    * libltdl/config/getopt.m4sh (func_help): Also extract comment
    lines that mention a home page and general GNU help.
    * libltdl/config/ltmain.m4sh: Use @PACKAGE_BUGREPORT@ instead of
    hard-coded list address.  Also mention Libtool home page and
    general GNU help web page.
    * libtoolize.m4sh: Likewise.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   16 ++++++++++++++++
 Makefile.am                |    4 +++-
 configure.ac               |    7 +++++--
 libltdl/config/getopt.m4sh |    7 ++++++-
 libltdl/config/ltmain.m4sh |    4 +++-
 libtoolize.m4sh            |    4 +++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba5aa6b..5ce2ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-13  Ralf Wildenhues  <address@hidden>
+
+       Print Libtool project URL in program --help output.
+       * configure.ac (AC_INIT): Set PACKAGE argument to `GNU Libtool',
+       so Autoconf knows this is GNU software.  For Autoconf < 2.64,
+       if AC_PACKAGE_URL is not defined, substitute PACKAGE_URL.
+       * Makefile.am (edit): Substitute PACKAGE_URL.
+       ($(srcdir)/tests/package.m4): Also depend on Makefile.am.
+       Define AT_PACKAGE_URL, for `tests/testsuite --help' output.
+       * libltdl/config/getopt.m4sh (func_help): Also extract comment
+       lines that mention a home page and general GNU help.
+       * libltdl/config/ltmain.m4sh: Use @PACKAGE_BUGREPORT@ instead of
+       hard-coded list address.  Also mention Libtool home page and
+       general GNU help web page.
+       * libtoolize.m4sh: Likewise.
+
 2010-06-12  Peter Rosin  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/Makefile.am b/Makefile.am
index c3f74e0..8e00b3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,7 @@ edit = sed \
        -e 's,@MACRO_VERSION\@,$(VERSION),g' \
        -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_TARNAME\@,$(PACKAGE),g' \
@@ -543,7 +544,7 @@ $(srcdir)/$(TESTSUITE): $(srcdir)/tests/package.m4 
$(TESTSUITE_AT) Makefile.am
        $(AUTOTEST) `echo $(TESTSUITE_AT) | sed 's,tests/,,g'` -o testsuite.tmp 
&& \
        mv -f testsuite.tmp testsuite
 
-$(srcdir)/tests/package.m4: $(srcdir)/configure.ac
+$(srcdir)/tests/package.m4: $(srcdir)/configure.ac Makefile.am
        { \
          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
@@ -551,6 +552,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.ac
          echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
          echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
          echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_URL],       address@hidden@])'; \
        } | $(edit) > $(srcdir)/tests/package.m4
 
 tests/atconfig: $(top_builddir)/config.status
diff --git a/configure.ac b/configure.ac
index f47eb44..35c79f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Process this file with autoconf to create configure. -*- autoconf -*-
 
-#   Copyright (C) 2001, 2004, 2005, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2001, 2004, 2005, 2008, 2010 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2001
 #
 #   This file is part of GNU Libtool.
@@ -30,7 +31,9 @@ dnl Oldest automake required for bootstrap is below in 
AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.11a], address@hidden)
+AC_INIT([GNU Libtool], [2.2.11a], address@hidden)
+m4_ifndef([AC_PACKAGE_URL],
+         [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/libtool/])])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index c378640..44cf727 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -546,6 +546,7 @@ func_help ()
     $opt_debug
 
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+       :print
         s/^# //
        s/^# *$//
        s*\$progname*'$progname'*
@@ -558,7 +559,11 @@ func_help ()
        s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
        s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
        p
-     }' < "$progpath"
+       d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
     ret=$?
     if test -z "$1"; then
       exit $ret
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 5906552..dd883a6 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -75,7 +75,9 @@ m4_divert_push([SCRIPT])# @configure_input@
 #         automake:    $automake_version
 #         autoconf:    $autoconf_version
 #
-# Report bugs to <address@hidden>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 address@hidden@
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 2aa82d4..04db82f 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -65,7 +65,9 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 #       automake:              $automake_version
 #       autoconf:              $autoconf_version
 #
-# Report bugs to <address@hidden>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 : ${TAR=tar}
 


hooks/post-receive
-- 
GNU Libtool