From: Gary V. Vaughan Date: Sun, 9 Jan 2005 15:27:19 +0000 (+0000) Subject: * m4/libtool.m4, m4/ltdl.m4: RMS says, 'I think the [license of X-Git-Tag: release-1-5-12~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=450a85d104ed93ef4b008d45ab5d4e9609b37cdf;p=thirdparty%2Flibtool.git * 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 cb7ee98fa..22a0a1c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-01-08 Gary V. Vaughan + + * 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 * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [ cygwin, mingw, pw32 ]: @@ -12,7 +21,7 @@ expansion. Reported by Alexander Kurz . 2004-12-20 Ralf Wildenhues - + * 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 - * 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 89c98a074..358de7d09 100644 --- 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 4370007d1..04511ec1e 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -3,24 +3,9 @@ ## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit , 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 1941b876e..3c8d5b6f1 100644 --- 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