[SCM] GNU Libtool branch, master, updated. v2.2.6-81-g18c6031

[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  18c603141ee49f71c49c0e54f9f831316c023b91 (commit)
      from  3e0beef8eb35a734514d5c4871f19a32c5edb145 (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 18c603141ee49f71c49c0e54f9f831316c023b91
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Jan 29 18:53:13 2009 +0100

    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.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                          |   13 +++++++++++++
 Makefile.am                        |    1 +
 libltdl/config/getopt.m4sh         |   13 +++++++++++--
 libltdl/config/ltmain.m4sh         |    3 ++-
 tests/duplicate_members.at         |    3 +--
 tests/{cdemo-exec.test => help.at} |   24 ++++++++++++++----------
 6 files changed, 42 insertions(+), 15 deletions(-)
 copy tests/{cdemo-exec.test => help.at} (57%)
 mode change 100755 => 100644

diff --git a/ChangeLog b/ChangeLog
index 3c2871d..7c92026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-29  Ralf Wildenhues  <address@hidden>
+
+       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.
+
 2009-01-29  Akim Demaille  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/Makefile.am b/Makefile.am
index 7a61846..b6b1bfa 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 08045bf..83bfaf4 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 <address@hidden>, 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/cdemo-exec.test b/tests/help.at
old mode 100755
new mode 100644
similarity index 57%
copy from tests/cdemo-exec.test
copy to tests/help.at
index dce62f2..f0e7e94
--- a/tests/cdemo-exec.test
+++ b/tests/help.at
@@ -1,8 +1,6 @@
-#! /bin/sh
-# cdemo-exec.test - check that programs in the cdemo subdirectory are viable
+# help.at -- standard command line options          -*- Autotest -*-
 #
-#   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2003
+#   Copyright (C) 2009 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -23,12 +21,18 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
-. tests/defs || exit 1
+AT_BANNER([Testing libtool functions.])
 
-func_require "cdemo-make" "tests/cdemo/cdemo$EXEEXT"
+AT_SETUP([standard command line options])
+AT_KEYWORDS([libtool])
+AT_KEYWORDS([libtoolize])
 
-func_rmprefixdir
-func_exec_init "uninstalled"
-func_exec "tests/cdemo/cdemo$EXEEXT"
+AT_CHECK([$LIBTOOLIZE --help], [], [ignore])
+AT_CHECK([$LIBTOOLIZE --version], [], [stdout])
+AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
+AT_CHECK([$LIBTOOL --help], [], [ignore])
+AT_CHECK([$LIBTOOL --help-all], [], [ignore])
+AT_CHECK([$LIBTOOL --version], [], [stdout])
+AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 
-exit $exec_status
+AT_CLEANUP


hooks/post-receive
--
GNU Libtool