* 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.'.

diff --git a/ChangeLog b/ChangeLog
index cb7ee98fabff5cef710a16019d7051841158b3c7..22a0a1c822b3684974e8012a59165e5cc230d82b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-08  Gary V. Vaughan  <gary@gnu.org>
+
+       * 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.'.
+
 2004-12-28  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [ cygwin, mingw, pw32 ]:
@@ -12,7 +21,7 @@
        expansion.  Reported by Alexander Kurz <alexander.kurz@qsc.de>.
 
 2004-12-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-       
+
        * libtoolize.in: Install `install-sh' as well, needed for configure ..
        * Makefile.am: .. install, update it.
        * NEWS, doc/libtool.texi (Distributing): .. document it.
@@ -55,7 +64,7 @@
 
 2004-12-10  Peter O'Gorman  <peter@pogma.com>
 
-       * ltmain.in (func_extract_archives,func_extract_an_archive): On 
+       * ltmain.in (func_extract_archives,func_extract_an_archive): On
        darwin, uniq can not take teh flags -cd together, thanks to Ralf
        for the fix, also ar does not accept N, so we use the fact that
        ar x libfoo.a foo.o will always extract the first foo.o in the

diff --git a/demo/configure.ac b/demo/configure.ac
index 89c98a0744cd3696185686b44f40a3f02778c00d..358de7d09ee25a47ce35ecea4723f9851ad9dceb 100644 (file)
--- a/demo/configure.ac
+++ b/demo/configure.ac
@@ -16,13 +16,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.59)
 
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([demo], [1.0], [bug-libtool@gnu.org])
+AC_INIT([demo],[1.0],[bug-libtool@gnu.org])
 AC_CONFIG_SRCDIR([hello.c])
 
 

diff --git a/libtool.m4 b/libtool.m4
index 4370007d1a9a4eab8a0b4595d97b61b13261336a..04511ec1e59feb6f86754d9d1694bb12f4de2c5e 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -3,24 +3,9 @@
 ## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 "$tagnames"; then
       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

diff --git a/ltdl.m4 b/ltdl.m4
index 1941b876e7c5fde6845f8e745c9a489c5a965ac8..3c8d5b6f113a50ae66b5c20e44bbd6dc71a3a14c 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -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 loaded by dlopen],
     # 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