* Ralf Wildenhues wrote on Mon, Jan 19, 2009 at 09:40:20PM CET:
The long line in ltmain.m4sh is actually necessary in order for
libtool --version
to work correctly. Will address in a followup patch.
OK to push?
Thanks,
Ralf
func_version copes with multi-line copyright headers.
* libltdl/config/getopt.m4sh (func_version): Slurp in copyright
lines until a period is found.
* libltdl/config/ltmain.m4sh: Multi-line copyright is ok to use
now.
* tests/help.at (standard command line options): New file, new
tests. Make this test group the first one for libtool tests,
moving the banner ...
* tests/duplicate_members.at: ... from here.
* Makefile.am (TESTSUITE_AT): Add tests/help.at.
diff --git a/Makefile.am b/Makefile.am
index 73135f5..f9c4f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -451,6 +451,7 @@ dist-hook:
TESTSUITE = tests/testsuite
TESTSUITE_AT = tests/testsuite.at \
tests/libtoolize.at \
+ tests/help.at \
tests/duplicate_members.at \
tests/duplicate_conv.at \
tests/duplicate_deps.at \
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 8cf99de..5f20320 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,6 +1,7 @@
m4_if([getopt.m4sh -- getopt helper functions -*- Autoconf -*-
- Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+ Foundation, Inc.
Written by Gary V. Vaughan, 2004
This file is part of GNU Cvs-utils.
@@ -35,7 +36,15 @@ M4SH_VERBATIM([[
# Echo version message to standard output and exit.
func_version ()
{
-$SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+$SED -n '/(C)/!b go
+ :more
+ /\./! {
+ N
+ s/\n# //
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index a45d755..7e59338 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4,7 +4,8 @@ m4_divert_push([SCRIPT])# @configure_input@
# libtool (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
# Written by Gordon Matzigkeit g...@gnu.ai.mit.edu, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/tests/duplicate_members.at b/tests/duplicate_members.at
index afa9d20..657e307 100755
--- a/tests/duplicate_members.at
+++ b/tests/duplicate_members.at
@@ -1,6 +1,6 @@
# duplicate_members.at -- duplicate members in archive tests -*- Autotest -*-
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
# Written by Alexandre Oliva Peter O'Gorman, 2005
#
# This file is part of GNU Libtool.
@@ -22,7 +22,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-AT_BANNER([Testing libtool functions.])
AT_SETUP([duplicate members in archive tests])
AT_KEYWORDS([libtool])
diff --git a/tests/help.at b/tests/help.at
new file mode 100644
index 000..f0e7e94
--- /dev/null
+++ b/tests/help.at
@@ -0,0 +1,38 @@
+# help.at -- standard command line options -*- Autotest -*-
+#
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+AT_BANNER([Testing libtool functions.])
+
+AT_SETUP([standard command line options])
+AT_KEYWORDS([libtool])
+AT_KEYWORDS([libtoolize])
+
+AT_CHECK([$LIBTOOLIZE --help], [], [ignore])
+AT_CHECK([$LIBTOOLIZE --version], [], [stdout])
+AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
