FYI: 102-gary-change-autoconf-macro-licenses.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to branch-1-5.

  Index: ChangeLog
  from  Gary V. Vaughan  <address@hidden>
  
        * m4/libtool.m4, m4/ltdl.m4: RMS says, 'I think the [license of
        autoconf macro files] should be:
        # This file is free software; the Free Software Foundation
        # gives unlimited permission to copy and/or distribute it,
        # with or without modifications, as long as this notice is
        # preserved.'.
  
  
  Index: libtool.m4
  ===================================================================
  RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
  retrieving revision 1.314.2.56
  diff -u -p -u -r1.314.2.56 libtool.m4
  --- libtool.m4 28 Dec 2004 13:18:56 -0000 1.314.2.56
  +++ libtool.m4 9 Jan 2005 15:24:48 -0000
  @@ -3,24 +3,9 @@
   ## Free Software Foundation, Inc.
   ## Originally by Gordon Matzigkeit <address@hidden>, 1996
   ##
  -## This program 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.
  -##
  -## This program 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 this program; if not, write to the Free Software
  -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  -##
  -## As a special exception to the GNU General Public License, if you
  -## distribute this file as part of a program that contains a
  -## configuration script generated by Autoconf, you may include it under
  -## the same distribution terms that you use for the rest of that program.
  +## This file is free software; the Free Software Foundation gives
  +## unlimited permission to copy and/or distribute it, with or without
  +## modifications, as long as this notice is preserved.
   
   # serial 47 AC_PROG_LIBTOOL
   
  @@ -1689,7 +1674,7 @@ if test -f "$ltmain" && test -n "$tagnam
         case $tagname in
         CXX)
        if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  -         ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
  +         ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
            (test "X$CXX" != "Xg++"))) ; then
          AC_LIBTOOL_LANG_CXX_CONFIG
        else
  @@ -2435,7 +2420,7 @@ AC_DEFUN([_LT_AC_PROG_CXXCPP],
   [
   AC_REQUIRE([AC_PROG_CXX])
   if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
  +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
       (test "X$CXX" != "Xg++"))) ; then
     AC_PROG_CXXCPP
   fi
  Index: ltdl.m4
  ===================================================================
  RCS file: /cvsroot/libtool/libtool/Attic/ltdl.m4,v
  retrieving revision 1.47.2.4
  diff -u -p -u -r1.47.2.4 ltdl.m4
  --- ltdl.m4 8 Apr 2004 00:22:55 -0000 1.47.2.4
  +++ ltdl.m4 9 Jan 2005 15:24:49 -0000
  @@ -1,24 +1,9 @@
   ## ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
   ## Copyright (C) 1999-2000 Free Software Foundation, Inc.
   ##
  -## This program 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.
  -##
  -## This program 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 this program; if not, write to the Free Software
  -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  -##
  -## As a special exception to the GNU General Public License, if you
  -## distribute this file as part of a program that contains a
  -## configuration script generated by Autoconf, you may include it under
  -## the same distribution terms that you use for the rest of that program.
  +## This file is free software; the Free Software Foundation gives
  +## unlimited permission to copy and/or distribute it, with or without
  +## modifications, as long as this notice is preserved.
   
   # serial 6 AC_LIB_LTDL
   
  @@ -141,7 +126,7 @@ AC_CACHE_CHECK([whether deplibs are load
       # Assuming the user has installed a libdl from somewhere, this is true
       # If you are looking for one http://www.opendarwin.org/projects/dlcompat
       libltdl_cv_sys_dlopen_deplibs=yes
  -    ;;   
  +    ;;
     gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
       # GNU and its variants, using gnu ld.so (Glibc)
       libltdl_cv_sys_dlopen_deplibs=yes
   
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
__________________________________________________________
This patch notification generated by cvsapply version 0.15
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFB4U1NFRMICSmD1gYRAmmnAKC/nhR+ZQGUdZwE7NtlpmvTNdl1AACfY8Zj
jXxWwhacstW7v5HOu12wRDk=
=q8eS
-----END PGP SIGNATURE-----