Enable correct extraction of multiline copyright from --version.

* libltdl/config/getopt.m4sh: Wrap copyright notice at 76
columns.
(func_version): Don't omit spaces when merging multiline copyright
notices.
* clcommit.m4sh, libtoolize.m4sh: Wrap copyright notice at 76
columns.

diff --git a/ChangeLog b/ChangeLog
index 906daab5ba63309afe08c352569cbf61c40266eb..a7776be207aa1ecf05f44430aef62a260c46ab29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+       Enable correct extraction of multiline copyright from --version.
+       * libltdl/config/getopt.m4sh: Wrap copyright notice at 76
+       columns.
+       (func_version): Don't omit spaces when merging multiline copyright
+       notices.
+       * clcommit.m4sh, libtoolize.m4sh: Wrap copyright notice at 76
+       columns.
+
        * NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
        systems, not BG/L.
        Reported by Christian Rössel <christian.roessel@gmx.de>

diff --git a/clcommit.m4sh b/clcommit.m4sh
index ff27f9dec8ed122b112f88b86cf9647915af3a49..c79e6b94d82416c1efb855357a45ee07b74f3e45 100644 (file)
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>
 
-# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 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/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 70f40e6365068529b675497514dbdab295129495..a8d4e7e5ae1bb93d777562b9d785d090c4a77032 100644 (file)
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,7 +1,8 @@
 m4_include([general.m4sh])m4_divert_push([KILL])
 # getopt.m4sh -- getopt helper functions                -*- Autoconf -*-
 #
-#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+#    Foundation, Inc.
 #    Written by Gary V. Vaughan, 2004
 #
 #    This file is part of GNU Libtool.
@@ -505,7 +506,7 @@ func_version ()
        :more
        /\./!{
          N
-         s/\n# //
+         s/\n# / /
          b more
        }
        :go

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 8cbc6a62e8809d19224d60080f3631725d5f77c0..cfe4aaac3c55e65fa7b84e4a515745d422790059 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gary V. Vaughan <gary@gnu.org>, 2003
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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.