Is Autoconf >= 2.64 spread widely enough for Libtool development by now?
If not, that could probably be hacked around in configure.ac, but I'd
need to test with old Autoconf then.
Anyway, this updates --help output of libtool, libtoolize, and the
testsuite script to match current GNU Coding Standards.
I amended func_help with a heuristic that should continue to work fine
with the other scripts that don't have the extra help lines, mailnotify
and clcommit. (Do you think it needs a testsuite addition to ensure
this heuristic isn't picking up extra junk from ltmain and libtoolize?)
I verified that @PACKAGE_BUGREPORT@ is not present in ltmain.sh any more
(thus it is not changed to a user package that happens to use
AC_PROG_LIBTOOL).
I'd like to change PACKAGE to be 'GNU libtool' eventually, but that
affects things like grepping generated .lo and .la files, and I don't
want to go there right now.
I am not (yet) mentioning other mailing lists, that is logically an
orthogonal issue IMVHO.
Thanks,
Ralf
Print Libtool project URL in program --help output.
* configure.ac (AC_PREREQ): Require Autoconf 2.64 for Libtool.
(AC_INIT): Set URL argument.
* 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.
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], [...@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 f47eb44..0ec5407 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.
@@ -23,14 +24,16 @@
####
-AC_PREREQ(2.62)dnl Some m4sh scripts use $as_echo
+AC_PREREQ(2.64)dnl We use PACKAGE_URL.
+dnl We needed 2.62 because some m4sh scripts use $as_echo.
dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
## ------------------------ ##
## Autoconf initialisation. ##
## ------------------------ ##
-AC_INIT([libtool], [2.2.11a], [bug-libt...@gnu.org])
+AC_INIT([libtool], [2.2.11a], [bug-libt...@gnu.org], [],
+ [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..f98f4f4 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,10 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
+ }
+ /^# .* 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 <bug-libt...@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
packa...@package@
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 <bug-libt...@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}
