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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index ba5aa6bc571add3140bd31db621dc2224226773c..5ce2ca2496b49fe87de796a78ce39d5f06746498 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <peda@lysator.liu.se>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/Makefile.am b/Makefile.am
index c3f74e06cd13c26d4836d707ea2a0689eb60cd53..8e00b3eb41ab66c5903e655e5165d4a8d54d4d72 100644 (file)
--- 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],      [@PACKAGE_NAME@])'; \
@@ -551,6 +552,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.ac
          echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
          echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+         echo 'm4_define([AT_PACKAGE_URL],       [@PACKAGE_URL@])'; \
        } | $(edit) > $(srcdir)/tests/package.m4
 
 tests/atconfig: $(top_builddir)/config.status

diff --git a/configure.ac b/configure.ac
index f47eb44d6d10033dc0ae591d5c2cfb05571ed070..35c79f1e88d4e7e1f8959e8c8c6fcdeb2e501307 100644 (file)
--- 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], [bug-libtool@gnu.org])
+AC_INIT([GNU Libtool], [2.2.11a], [bug-libtool@gnu.org])
+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 c37864071ad74d663475660786fb55526f1fa8f7..44cf7279d0e3d4b96998db3f8895689a9a9abf19 100644 (file)
--- 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 5906552a9136b3a5a834f668224ec73a22cffa88..dd883a618f0cc658686866ce1a9bf91f568039f9 100644 (file)
--- 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 <bug-libtool@gnu.org>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 PACKAGE=@PACKAGE@

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 2aa82d45b007495a0a40f8716e2dcec6b1673d0c..04db82f1846b6020a7e57f50bfed2d32e4855097 100644 (file)
--- 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 <bug-libtool@gnu.org>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 : ${TAR=tar}