--- libtool-1.5.22.orig/debian/libltdl3.files +++ libtool-1.5.22/debian/libltdl3.files @@ -0,0 +1 @@ +usr/lib/libltdl.so.* --- libtool-1.5.22.orig/debian/rules +++ libtool-1.5.22/debian/rules @@ -0,0 +1,224 @@ +#!/usr/bin/make -f +# debian/rules for the Debian GNU Libtool package. +# Copyright © 2003, 2004 Scott James Remnant + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Use debhelper v4 features. +export DH_COMPAT=4 + +DEBIAN_VERSION=$(strip $(shell dpkg-parsechangelog | awk -F: '/^Version:/ {print $$NF}')) + +# libltdl needs to conform to policy +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# Build libltdl the right way (tm) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) + make_check = yes +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) + make_check = no +endif + +# Takes too long +#ifeq (m68k, $(DEB_HOST_ARCH)) +# make_check = no +#endif + +patch: patch-stamp +patch-stamp: + dpatch apply-all + touch patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp config-stamp + dh_clean + +# Just ignore this error if there is no Makefile +# this means it's either upstreams source unpacked +# or it's already clean + -$(MAKE) -k distclean + rm -f config.guess config.sub + rm -f libltdl/config.guess libltdl/config.sub + rm -f doc/*.html *.tar.gz + rm -f doc/libtool.info + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -f mkinstalldirs + rm -rf debian/libtool + rm -f doc/stamp-vti + rm -f doc/texinfo.tex + rm -f doc/version.texi + find . -name acinclude.m4 |xargs rm -f + find . -name aclocal.m4 |xargs rm -f + find . -name ltmain.sh |xargs rm -f + find . -name configure |xargs rm -f + find . -name libtool |xargs rm -f + find . -name Makefile |xargs rm -f + find . -name Makefile.in |xargs rm -f + find . -name .in | xargs rm -f +# Undo the version change if there is any. + sed -i -e 's/^# serial \([0-9]*\) .*AC_PROG_LIBTOOL/# serial \1 AC_PROG_LIBTOOL/' libtool.m4 + sed -i -e 's/^VERSION.*/VERSION=@VERSION@/' ltmain.in + +config: config-stamp +Makefile: config-stamp +config-stamp: patch-stamp + dh_testdir + +# These go into the libtool-doc `examples' directory. +# Create them while we still have a clean source tree + GZIP=--best tar zcf ./cdemo.tar.gz cdemo + GZIP=--best tar zcf ./demo.tar.gz demo + GZIP=--best tar zcf ./mdemo.tar.gz mdemo + GZIP=--best tar zcf ./mdemo2.tar.gz mdemo2 + GZIP=--best tar zcf ./pdemo.tar.gz pdemo + GZIP=--best tar zcf ./depdemo.tar.gz depdemo + GZIP=--best tar zcf ./f77demo.tar.gz f77demo + GZIP=--best tar zcf ./tagdemo.tar.gz tagdemo + + sed -i -e 's/^# serial \([0-9]*\) .*AC_PROG_LIBTOOL/# serial \1 Debian $(DEBIAN_VERSION) AC_PROG_LIBTOOL/' libtool.m4 + sed -i -e 's/^VERSION.*/VERSION="@VERSION@ Debian $(DEBIAN_VERSION)"/' ltmain.in + ./bootstrap + ./configure --prefix=/usr $(confflags) CFLAGS="$(CFLAGS)" + touch config-stamp + + +build: build-stamp +build-stamp: config-stamp + dh_testdir + +# Fix some permissions + chmod a+x tests/mdemo2-*.test + + $(MAKE) + +# The system libtool script in Debian must be able to support +# invoking gcc as cc + echo '# ### BEGIN LIBTOOL TAG CONFIG: BINCC' >> libtool + sed -n -e '/^# ### BEGIN LIBTOOL CONFIG/,/^# ### END LIBTOOL CONFIG/p' < libtool \ + | grep -B 2 -A 1 -e '^LTCC=' -e '^CC=' \ + | sed '/^--/d;s/gcc/cc/g' >> libtool + echo '# ### END LIBTOOL TAG CONFIG: BINCC' >> libtool + echo >> libtool + +# The system libtool script in Debian must be able to support +# invoking g++ both by the g++ and c++ names. + sed -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: CXX$$/,/^# ### END LIBTOOL TAG CONFIG: CXX$$/p' < libtool \ + | sed -e 's/CONFIG: CXX/CONFIG: BINCXX/g' \ + -e 's/g++/c++/g' >> libtool + echo >> libtool + +# Add our BINCC and BINCXX tags + sed -e 's/^\(available_tags\)=\"\(.*\)\"/\1=\"\2 BINCC BINCXX\"/' \ + < libtool > libtool.tags + mv libtool.tags libtool + +# Don't hardcode gcc path information, and don't use nostdlib + sed -e 's/^\(predep_objects\)=.*/\1=""/' \ + -e 's/^\(postdep_objects\)=.*/\1=""/' \ + -e 's/^\(compiler_lib_search_path\)=.*/\1=""/' \ + -e 's:^\(sys_lib_search_path_spec\)=.*:\1="/lib/ /usr/lib/ /usr/X11R6/lib/ /usr/local/lib/":' \ + -e 's/^\(archive_cmds=\".*\) -nostdlib /\1 /' \ + -e 's/^\(archive_expsym_cmds=\".*\) -nostdlib /\1 /' \ + < libtool > libtool.gcc-indep + mv libtool.gcc-indep libtool + +# Make libtool executable again + chmod 755 libtool + +# This generated HTML page goes into libtool-doc. + cd doc && makeinfo libtool.texi + cd doc && texi2html -monolithic libtool.texi + + +ifeq ($(make_check), yes) +# Now make sure it works + $(MAKE) check +endif + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) prefix=`pwd`/debian/tmp/usr install + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + + dh_movefiles -i + + dh_installdocs -i + dh_installinfo -plibtool-doc + dh_installexamples -i + dh_installchangelogs -i ChangeLog + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + + dh_movefiles -a + + # Create symlinks to the one in autotools-dev + ln -s ../misc/config.guess debian/libtool/usr/share/libtool + ln -s ../misc/config.sub debian/libtool/usr/share/libtool + + # Create a symlink to the one in /usr/share/aclocal + ln -s ../aclocal/libtool.m4 debian/libtool/usr/share/libtool + + dh_installdocs -plibtool + dh_installdocs -plibltdl3 + mkdir -p debian/libltdl3-dev/usr/share/doc + cd debian/libltdl3-dev/usr/share/doc && ln -sf libltdl3 libltdl3-dev + dh_installman -plibtool debian/libtool.1 debian/libtoolize.1 + dh_installchangelogs -plibtool ChangeLog + dh_installchangelogs -plibltdl3 ChangeLog + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -V 'libltdl3 (>= 1.5.2-2)' + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean config patch unpatch binary-indep binary-arch binary install --- libtool-1.5.22.orig/debian/changelog +++ libtool-1.5.22/debian/changelog @@ -0,0 +1,302 @@ +libtool (1.5.22-4build1) gutsy; urgency=low + + * No-change upload to build against a sane dpkg-architecture. + + -- Adam Conrad Wed, 1 Aug 2007 15:50:22 +1000 + +libtool (1.5.22-4) unstable; urgency=low + + * Change gcj build dependency to not !kfreebsd-amd64 + (Closes: #356388) + + -- Kurt Roeckx Sat, 11 Mar 2006 19:33:24 +0100 + +libtool (1.5.22-3) unstable; urgency=low + + * Properly set link_all_deplibs on k*bsd*-gnu. The previous + patch for kfreebsd didn't set it in all cases. Patch from + Aurelien Jarno (Closes: #355789) + * Make k*bsd*-gnu do the same as on Linux in all cases. It + should behave the same. Based on patch by Aurelien Jarno. + * Don't build depend on gcj on kfreebsd-amd64 + * Rename bsd.dpatch to netbsdelf.dpatch, since it now + only adds support for netbsdelf*-gnu. + + -- Kurt Roeckx Sat, 11 Mar 2006 16:11:11 +0100 + +libtool (1.5.22-2) unstable; urgency=low + + * Remove a "--" line from the generate tag for BINCC. It + resulted in "--: command not found" error. Thanks to + John V. Belmonte for reporting it and Ralf Wildenhues + for the fix. (Closes: #345607) + + -- Kurt Roeckx Mon, 9 Jan 2006 16:06:58 +0100 + +libtool (1.5.22-1) unstable; urgency=low + + * New upstream release + - libtoolize --ltdl now fails if libltdl3-dev is not installed. + (Closes: #344756) + * Also set link_all_deplibs to no on kfreebsd*-gnu. Patch from + Aurelien Jarno (Closes: #341978) + + -- Kurt Roeckx Mon, 26 Dec 2005 13:36:48 +0100 + +libtool (1.5.20-2) unstable; urgency=low + + * Add a conflict on libtool1.4 for libltdl3-dev. They have overlapping + files and libtool1.4 should get removed anyway. (Closes: #329697) + * Put usr/share/libtool/libltdl in the libltdl3-dev, so libtoolize --ltdl + works again + * Don't build-depend gcj on kfreebsd-i386, they don't have it. + (Closes: #329703) + * Change Standards-Version to 3.6.2, no changes. + + -- Kurt Roeckx Sun, 25 Sep 2005 16:16:17 +0200 + +libtool (1.5.20-1) unstable; urgency=low + + * New maintainer (Closes: #302484) + * New upstream release (Closes: #265005) + - Configure test to detect -fPIC support in combination with other CFLAGS + could fail to detect if it's supported. (1.5.16) (Closes: #219490) + - ia64 tests should have been fix, run them again. (1.5.10) + - Fix .libs/.libs/libfoo.so link problem when linking against an other lib + from the same package. (1.5.8) + * Enable gcj on hppa again since gcj-4.0 is available on it. + * Enable the test suite on m68k again, slow is not a good reason not to run + it. + * Move ltdl.m4 from libtool to libltdl-dev package, where it belongs. + Add a conflicts/replaces from libltdl-dev to the libtool package. + * Remove usr/share/libtool/libltdl from the libtool package + * Make the libtool.m4 in /usr/share/libtool a symlink to the one in + /usr/share/aclocal. + * libltdl3-dev.preinst: No longer remove the old directory on upgrade. + libltdl3-dev.preinst does nothing now so remove the file. + * libtool.postinst: We don't run ltconfig anymore, so don't play with + cc's alternatives. + * Put the config.guess and config.sub symlinks in the package instead + of creating them in the libtool.postinst. Remove the libtool.postinst + and libtool.prerm scripts since they do nothing now. + * Add AUTHORS, README, THANKS and TODO in the docs dir. + * Remove obsolete conflicts/replaces for libltdl0.1 and libltdl0, + it's not even in woody. + * Split out patches, and convert to using dpatch + * Always do a full bootstrap of the configure scripts before + building so I only have to patch 1 file. + * Embed the debian version in libtool.m4 and ltmain.in/sh + * Add a watch file. + + -- Kurt Roeckx Wed, 14 Sep 2005 21:11:24 +0200 + +libtool (1.5.6-6) unstable; urgency=low + + * Orphan. + + -- Scott James Remnant Fri, 1 Apr 2005 01:28:13 +0100 + +libtool (1.5.6-5) unstable; urgency=low + + * Apply patch from upstream to allow five digits in version-info. + + -- Scott James Remnant Tue, 8 Mar 2005 18:12:26 +0000 + +libtool (1.5.6-4) unstable; urgency=low + + * Correct accidental slide into a native package. + * Apply patch to fix memory leak in libltdl. Closes: #281929. + * Usual postinst change to support only gcc 3.4 or gcc 4.0. Closes: #281708. + * Remove build-essential dependencies from libltdl3-dev. Closes: #260298. + + -- Scott James Remnant Sat, 22 Jan 2005 14:17:59 +0000 + +libtool (1.5.6-3) unstable; urgency=low + + * Don't build-depend on gcj on netbsd-i386 or hurd-i386. Closes: #260299. + * Apply patch to correct problem with "-lfoo -Ldir -lbar" picking bar up + from the same directory as foo, instead of in 'dir' + + -- Scott James Remnant Tue, 26 Oct 2004 10:37:41 +0100 + +libtool (1.5.6-2) unstable; urgency=low + + * Apply patch from Joel Baker to support Debian GNU/kNetBSD systems + with *-*-netbsdelf-gnu triplet. Closes: #244770. + * Fail earlier on invalid version_type so we output a useful error + message. Closes: #247169. + * Skip the Non-PIC test on x86-64, it can't handle Non-PIC code inside + shared libraries. Closes: #246746. + + -- Scott James Remnant Tue, 6 Jul 2004 17:52:19 +0100 + +libtool (1.5.6-1) unstable; urgency=low + + * New upstream release. + - Correctly installs libltdl. + - Correctly provides shrext_cmds to libltdl. + Closes: #242161, #242380, #242457, #242488, #243008, #243033, #243107, + #243261. + + -- Scott James Remnant Mon, 12 Apr 2004 18:17:59 +0100 + +libtool (1.5.4-1) unstable; urgency=low + + * New upstream release. + + -- Scott James Remnant Sat, 3 Apr 2004 19:10:11 +0100 + +libtool (1.5.2-2) unstable; urgency=low + + * Remove .svn check from debian/rules, no longer necessary. + * Correctly pass CFLAGS to configure. + * No longer dlopens libraries with RTLD_GLOBAL. Closes: #195821, #221811. + * Don't add the contents of dependency_libs to the link line when + linking programs. Closes: #191425, #199423, #238681. + + -- Scott James Remnant Sun, 28 Mar 2004 20:08:59 +0100 + +libtool (1.5.2-1) unstable; urgency=low + + * New upstream release. + + This largely just included our patches from 1.5, there are a couple + of additional bug fixes in this release though. + * Move to a single libtool.info file. + + -- Scott James Remnant Sun, 25 Jan 2004 14:45:02 +0000 + +libtool (1.5-9) unstable; urgency=low + + * Apply patch from Robert Millan to complete + support for GNU/kNetBSD. Closes: #224440. + * Apply keybuk-precious-files.patch (backported from 1.6) to add + an option to prevent the removal of files from the temporary + output directory. Closes: #221420. + + -- Scott James Remnant Sun, 11 Jan 2004 01:33:18 +0000 + +libtool (1.5-8) unstable; urgency=medium + + * Bring the various copyright files up to par. + * Apply patch to infer tagged configuration in link mode with all + compiler arguments available, rather than just the first. + * Remove the mkdir -p option from when creating a temporary output + directory to prevent symlink abuse. + * Generate the info files on build as we need a certain --split-size + for hysterical raisins. + + -- Scott James Remnant Sat, 3 Jan 2004 14:49:52 +0000 + +libtool (1.5-7) unstable; urgency=high + + * Add missing 'continue' line when acting on finding -pthread and friends + in $deplibs. This line of code is in all my copies of ltmain, it's in + my test package of libtool, it's in the upstream CVS where I comitted it, + it's in the patch file I made to do that and is in the 1.4.3 package that + used the same patch; but for no apparent reason it vanished from the + Debian 1.5-6 package! Closes: #221467. + + -- Scott James Remnant Tue, 18 Nov 2003 17:08:17 +0000 + +libtool (1.5-6) unstable; urgency=low + + * Error in the binary targets if a .svn directory exists, to prevent + me accidentally shipping them in the diff. To create binary packages + from the svn source add TEST=yes to the debian/rules line. + Closes: #219461. + * Fix libtoolize so the cd command run when AC_CONFIG_AUX_DIR is used + is shown when --dry-run is given. Closes: #153699. + * Yet Another(tm) patch to prevent hardcoding of dependency library + rpaths, replacing the one in 1.5-3. Any path listed in /etc/ld.so.conf + is now not rpathed. This is more palatable upstream. + * The Ultimate -pthread Patch(tm), the previous change broke placing + -pthread in libs' $deplibs. This new patch treats the arguments the + same for libraries and programs, and even honours them when found + in dependency_libs but doesn't place them there first. + * Infer near-default configuration when invoked as 'libtool cc' rather + than complaining that we can't infer a tag. + * Fix -static, -prefer-pic and -prefer-non-pic when used with a tagged + configuration. Closes: #217834. + * Synchronise with upstream CVS. The changes are: + - MinGW reverted back to an objdump-base test. + See changelog.gz for more detail. + + -- Scott James Remnant Sun, 16 Nov 2003 15:10:15 +0000 + +libtool (1.5-5) unstable; urgency=low + + * Apply upstream patch to preserve --tag, --debug, --quiet and + --silent arguments when invoking ourselves to perform + relink or finish modes. Closes: #214484. + * Don't propogate -pthread and friends to dependency_libs, but also + don't complain when we find it there. This fixes the recent GNOME + problems without breaking anything else (I hope). + + -- Scott James Remnant Wed, 29 Oct 2003 17:31:07 +0000 + +libtool (1.5-4) unstable; urgency=low + + * Remove Build-Depends-Indep placing texi2html and texinfo in + Build-Depends. Policy is wrong, the buildds do not ensure these are + installed for the "build" target of debian/rules. Closes: #216492. + * Built with dpkg 1.10.10, the latest version ignores the + [!hppa !mips !mipsel] clause in Build-Depends. + + -- Scott James Remnant Sun, 19 Oct 2003 16:19:22 +0100 + +libtool (1.5-3) unstable; urgency=low + + * Synchronise with upstream CVS, in case they decide to skip 1.5.1 + after all and go straight to 1.6. The changes are: + - GNU/KNetBSD support added. + - lt_dlrealloc now part of the libltdl API. Closes: #120169. + See changelog.gz for more detail. + * Run 'make check' after build to make sure it all works. + * Fix permissions of tests/mdemo2-*.test so "make check" will work. + * Move rules to create info files and examples .tar.gz files to + the build target so we don't pollute them with stuff from "make check". + * Disable demo-nopic test on hppa. + * Add /usr/local/lib and /usr/X11R6/lib to sys_lib_dlsearch_path_spec. + * Add gcc-3.3 to the list of packages we maintain the /usr/bin/cc + alternative for. Closes: #216349. + * Remove dead code from libtool.m4. Closes: #210378. + * Add the various compiler threading options to dependency_libs, and + don't barf if we find them. + * Merge addition of --no-supress option from HEAD. Closes: #207475. + * Mention that libtool-doc will become non-free after sarge. + + -- Scott James Remnant Wed, 1 Oct 2003 00:27:19 +0100 + +libtool (1.5-2) unstable; urgency=low + + * Make mdemo2-*.test executable so they don't fail when you go + "make check" + * Prevent recursion on missing ltmain.sh by checking ltmain.in + exists first. Closes: #164452. + * Remove build dependency on gcj on hppa, mips and mipsel to + fix build failure. Closes: #207923. + * Remove fallback suggestion of java-compiler, libtool will + only support gcj for the forseeable future. + * Place NEWS and ChangeLog files in all packages, also add missing + ChangeLog.1 file. Closes: #205458. + * Always use pass_all on Linux ELF, host_cpu is irrelevant. + Closes: #208552. + * Don't pass -nostdlib to gcc when creating an archive so we can + throw away all the gcc version-specific hardcoding. Closes: #206356. + * Ensure STRIP variable is properly quoted. + + -- Scott James Remnant Wed, 10 Sep 2003 23:42:48 +0100 + +libtool (1.5-1) unstable; urgency=low + + * Initial Release of the "multi language" version of GNU Libtool. + This is a cooler and more froody version of Libtool than 1.4 was + and not only makes C++ libraries properly but does Fortran77 and + compiled Java libraries too. The catch? It won't work with + packages still using Autoconf 2.13. Either upgrade your + configure.in to Autoconf 2.5x, or install the libtool1.4 package. + Closes: #190216, #195278, #192918. + + -- Scott James Remnant Sat, 2 Aug 2003 02:08:10 +0100 + --- libtool-1.5.22.orig/debian/libtool-doc.info +++ libtool-1.5.22/debian/libtool-doc.info @@ -0,0 +1 @@ +doc/libtool.info --- libtool-1.5.22.orig/debian/libltdl3.copyright +++ libtool-1.5.22/debian/libltdl3.copyright @@ -0,0 +1,34 @@ +This is the Debian package of libltdl. + +Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +Originally by Thomas Tanner + + +Additional information about libltdl is available at: + + http://www.gnu.org/software/libtool/ + +The upstream sources were obtained from: + + ftp://ftp.gnu.org/pub/gnu/libtool/ + + +License: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library 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 +Lesser General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- libtool-1.5.22.orig/debian/libltdl3-dev.copyright +++ libtool-1.5.22/debian/libltdl3-dev.copyright @@ -0,0 +1,34 @@ +This is the Debian package of libltdl. + +Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +Originally by Thomas Tanner + + +Additional information about libltdl is available at: + + http://www.gnu.org/software/libtool/ + +The upstream sources were obtained from: + + ftp://ftp.gnu.org/pub/gnu/libtool/ + + +License: + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library 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 +Lesser General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- libtool-1.5.22.orig/debian/copyright +++ libtool-1.5.22/debian/copyright @@ -0,0 +1,47 @@ +This is the Debian package of GNU Libtool. + +Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 + Free Software Foundation, Inc. +Originally by Gordon Matzigkeit , 1996 + + +Additional information about Libtool is available at: + + http://www.gnu.org/software/libtool/ + +The upstream sources were obtained from: + + ftp://ftp.gnu.org/pub/gnu/libtool/ + + +License: + +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. + +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. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. + + +Note about libtool-doc: + +The GNU info documentation for Libtool is included in the libtool-doc +package and is licensed under the GNU Free Documentation License. +The current consensus of debian-legal is that this license is *NOT* +free according to the definition in the Debian Free Software Guidelines. + +The Release Manager has decided to postpone this issue until after the +release of sarge, at which point the libtool-doc package will be +moved to the non-free archive. --- libtool-1.5.22.orig/debian/README.Debian +++ libtool-1.5.22/debian/README.Debian @@ -0,0 +1,25 @@ +GNU Libtool +----------- + +This is the Debian package of GNU Libtool. + +You do not need this package to compile software that uses Libtool, +that software will use an included copy of the libtool script it was +developed with. Of course if you are developing or maintaining such +software this is the package for you. + +If you are developing software that still uses Autoconf 2.13 you will +be unable to use this version of Libtool. It is strongly recommended +that you update the software to use Autoconf 2.5x. If that is not +possible you will need to install the deprecated GNU Libtool 1.4 +release available in Debian as the 'libtool1.4' package. + + +GNU Libtool is split into four different Debian packages: + + libtool Contains the libtool script and autotools files. + libtool-doc Contains the libtool documentation. + libltdl3 Contains the libltdl runtime library. + libltdl3-dev Contains the libltdl headers and static library. + + -- Scott James Remnant , Wed, 30 Jul 2003 21:46:01 +0100 --- libtool-1.5.22.orig/debian/libtool.1 +++ libtool-1.5.22/debian/libtool.1 @@ -0,0 +1,106 @@ +.TH LIBTOOL 1 "August 2003" "Library Support" "User Manuals" +.SH NAME +libtool \- Provide generalized library-building support services. +.SH SYNOPSIS +.B libtool +.BI [ OPTION ] ... +.BI [ MODE\-ARG ] ... +.SH "DESCRIPTION" +The `libtool' program provides a standard way to generate both static +and shared libraries. It hides the complexities of platform\-specific +library generation behind an interface that is the same across all +platforms supported by libtool. +.SH "OPTIONS" +libtool accepts the following options: +.TP +.B \-\-config +Display libtool configuration variables and exit. +.TP +.B \-\-debug +Dump a trace of shell script execution to standard output. This +produces a lot of output, so you may wish to pipe it to `less' (or +`more') or redirect to a file. +.TP +.BI \-n | \-\-dry-run +Don't create, modify, or delete any files, just show what commands +would be executed by `libtool'. +.TP +.B \-\-features +Display basic configuration options. This provides a way for packages +to determine whether shared or static libraries will be built. +.TP +.B \-\-finish +Same as +.BR \-\-mode=finish . +.TP +.B \-\-help +Display a help message and exit. If +.BI \-\-mode= MODE +is specified, then detailed help for +.I MODE +is displayed. +.TP +.BI \-\-mode= MODE +Use +.I MODE +as the operation mode. By default, the operation mode is inferred +from the +.IR MODE\-ARGS . + +If +.I MODE +is specified, it must be one of the following: +.IP +.B clean +Remove files from the build directory +.IP +.B compile +Compile a source file into a `libtool' object. +.IP +.B execute +Automatically set the library path, then run a program. +.IP +.B finish +Complete the installation of libtool libraries. +.IP +.B install +Install libraries or executables. +.IP +.B link +Create a library or an executable. +.IP +.B uninstall +Remove libraries from an installed directory. +.TP +.B \-\-quiet +Same as `\-\-silent'. +.TP +.B \-\-silent +Don't print informational messages. +.TP +.B \-\-tag=TAG +Use configuration variables from tag +.I TAG +.TP +.B \-\-version +Print version information. +.P +The +.I MODE\-ARGS +are a variable number of arguments, depending on the selected +operation mode. In general, each +.I MODE\-ARG +is interpreted by programs libtool invokes, rather than libtool itself. +.SH "SEE ALSO" +.BR libtoolize (1), +.BR automake (1) +.br +`libtool', `libtoolize' and `automake' are fully documented via the +Info system. +.SH AUTHOR +This manual page was created by Ossama Othman . It +is based on the "Invoking Libtool" menu entry in the `libtool' TEXINFO +documentation, and the output from the +.B \-\-help +option. It was updated for Libtool 1.5 by +Scott James Remnant . --- libtool-1.5.22.orig/debian/libtool-doc.docs +++ libtool-1.5.22/debian/libtool-doc.docs @@ -0,0 +1,8 @@ +README +AUTHORS +THANKS +NEWS +TODO +ChangeLog.0 +ChangeLog.1 +doc/libtool.html --- libtool-1.5.22.orig/debian/libltdl3.docs +++ libtool-1.5.22/debian/libltdl3.docs @@ -0,0 +1,4 @@ +libltdl/README +NEWS +ChangeLog.0 +ChangeLog.1 --- libtool-1.5.22.orig/debian/libtool-doc.doc-base +++ libtool-1.5.22/debian/libtool-doc.doc-base @@ -0,0 +1,9 @@ +Document: libtool-doc +Title: Libtool Documentation +Author: The GNU Libtool Team +Abstract: Portable shared library support for source code packages +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libtool-doc/libtool.html +Files: /usr/share/doc/libtool-doc/*.html --- libtool-1.5.22.orig/debian/libltdl3-dev.files +++ libtool-1.5.22/debian/libltdl3-dev.files @@ -0,0 +1,6 @@ +usr/include +usr/lib/libltdl.la +usr/lib/libltdl.so +usr/lib/libltdl.a +usr/share/aclocal/ltdl.m4 +usr/share/libtool/libltdl --- libtool-1.5.22.orig/debian/watch +++ libtool-1.5.22/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.gnu.org/gnu/libtool/libtool-(.*)\.tar\.gz debian uupdate --- libtool-1.5.22.orig/debian/libtoolize.1 +++ libtool-1.5.22/debian/libtoolize.1 @@ -0,0 +1,63 @@ +.TH LIBTOOLIZE 1 "August 2003" "Library Support" "User Manuals" +.SH NAME +libtoolize \- add libtool support to your package +.SH SYNOPSIS +.B libtoolize +.I "[OPTION]..." +.SH "DESCRIPTION" +The `libtoolize' program provides a standard way to add libtool +support to your package. In the future, it may implement better usage +checking, or other features to make libtool even easier to use. +.SH "OPTIONS" +libtoolize accepts the following options: +.TP +.B \-\-automake +Work silently, and assume that Automake libtool support is used. + +`libtoolize --automake' is used by Automake to add libtool files to +your package, when `AC_PROG_LIBTOOL' appears in your `configure.in'. +.TP +.B \-\-copy, \-c +Copy files from the libtool data directory rather than creating +symlinks. +.TP +.B \-\-debug +Enable verbose shell tracing +.TP +.B \-\-dry-run, \-n +Don't run any commands that modify the file system, just print them +out. +.TP +.B \-\-force, \-f +Replace existing libtool files. By default, `libtoolize' won't +overwrite existing files. +.TP +.B \-\-help +Display a help message and exit. +.TP +.B \-\-ltdl +Install libltdl in a subdirectory of your package. +.TP +.B \-\-ltdl\-tar +Add the file `libltdl.tar.gz' to your package. +.TP +.B \-\-version +Print `libtoolize' version information and exit. + +If `libtoolize' detects an explicit call to `AC_CONFIG_AUX_DIR' +in your `configure.in', it will put the files in the specified directory. + +`libtoolize' displays hints for adding libtool support to your +package, as well. + +.SH "SEE ALSO" +.BR libtool (1), +.BR automake (1) +.br +`libtool', `libtoolize' and `automake' are fully documented via the +Info system. +.SH AUTHOR +This manual page was written by Frederic Lepied , +for the Debian GNU/Linux system (but may be used by others). +It was updated by Ossama Othman and updated for +Libtool 1.5 by Scott James Remnant . --- libtool-1.5.22.orig/debian/control +++ libtool-1.5.22/debian/control @@ -0,0 +1,80 @@ +Source: libtool +Build-Depends: debhelper (>= 4.0), texi2html, texinfo, file, g77 | fortran77-compiler, gcj [!mips !mipsel !netbsd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], automake1.9, autoconf, autotools-dev, dpatch +Section: devel +Priority: optional +Maintainer: Kurt Roeckx +Standards-Version: 3.6.2 + +Package: libtool +Architecture: any +Section: devel +Depends: gcc | c-compiler, cpp, libc6-dev | libc-dev, file, autotools-dev +Suggests: libtool-doc, autoconf (>> 2.50), automaken, g77 | fortran77-compiler, gcj +Conflicts: autoconf (<= 2.12), automake (<= 1.3), libtool1.4 +Recommends: libltdl3-dev +Description: Generic library support script + This is GNU libtool, a generic library support script. Libtool hides + the complexity of generating special library types (such as shared + libraries) behind a consistent interface. To use libtool, add the + new generic library building commands to your Makefile, Makefile.in, + or Makefile.am. See the documentation for details. Libtool supports + building static libraries on all platforms. + . + Libtool supports generation of C, C++, Fortran and Java libraries. + +Package: libtool-doc +Architecture: all +Section: doc +Conflicts: libtool1.4-doc +Description: Generic library support script + This package contains the GNU libtool documentation. + . + GNU libtool is generic library support script. Libtool hides + the complexity of generating special library types (such as shared + libraries) behind a consistent interface. To use libtool, add the + new generic library building commands to your Makefile, Makefile.in, + or Makefile.am. See the documentation for details. Libtool supports + building static libraries on all platforms. + +Package: libltdl3 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: A system independent dlopen wrapper for GNU libtool + This package contains the run-time libltdl library. + . + A small library that aims at hiding the various difficulties of + dlopening libraries from programmers. It is a system independent + dlopen wrapper for GNU libtool. + . + It supports the following dlopen interfaces: + * dlopen (Solaris, Linux and various BSD flavors) + * shl_load (HP-UX) + * LoadLibrary (Win16 and Win32) + * load_add_on (BeOS) + * GNU DLD (emulates dynamic linking for static libraries) + * libtool's dlpreopen + +Package: libltdl3-dev +Architecture: any +Section: libdevel +Suggests: libtool-doc +Recommends: libtool +Conflicts: libtool (<< 1.5.20), libtool1.4 +Replaces: libtool (<< 1.5.20) +Depends: libltdl3 (= ${Source-Version}) +Description: A system independent dlopen wrapper for GNU libtool + This package contains the header files and static libraries for the + libltdl package. + . + A small library that aims at hiding the various difficulties of + dlopening libraries from programmers. It is a system independent + dlopen wrapper for GNU libtool. + . + It supports the following dlopen interfaces: + * dlopen (Solaris, Linux and various BSD flavors) + * shl_load (HP-UX) + * LoadLibrary (Win16 and Win32) + * load_add_on (BeOS) + * GNU DLD (emulates dynamic linking for static libraries) + * libtool's dlpreopen --- libtool-1.5.22.orig/debian/libtool.files +++ libtool-1.5.22/debian/libtool.files @@ -0,0 +1,3 @@ +usr/bin +usr/share/libtool/ltmain.sh +usr/share/aclocal/libtool.m4 --- libtool-1.5.22.orig/debian/libtool-doc.examples +++ libtool-1.5.22/debian/libtool-doc.examples @@ -0,0 +1,2 @@ +cdemo.tar.gz depdemo.tar.gz demo.tar.gz f77demo.tar.gz mdemo.tar.gz +mdemo2.tar.gz pdemo.tar.gz tagdemo.tar.gz --- libtool-1.5.22.orig/debian/libtool.docs +++ libtool-1.5.22/debian/libtool.docs @@ -0,0 +1,8 @@ +README +AUTHORS +THANKS +NEWS +TODO +ChangeLog.0 +ChangeLog.1 + --- libtool-1.5.22.orig/debian/patches/netbsdelf.dpatch +++ libtool-1.5.22/debian/patches/netbsdelf.dpatch @@ -0,0 +1,86 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## netbsdelf.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for netbsdelf*-gnu + +@DPATCH@ +diff -urNad libtool-1.5.22~/libtool.m4 libtool-1.5.22/libtool.m4 +--- libtool-1.5.22~/libtool.m4 2006-03-11 14:25:45.000000000 +0100 ++++ libtool-1.5.22/libtool.m4 2006-03-11 14:26:32.000000000 +0100 +@@ -1587,6 +1587,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -2362,7 +2374,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3375,7 +3387,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -5007,7 +5019,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -5567,7 +5579,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -6008,7 +6020,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +diff -urNad libtool-1.5.22~/ltdl.m4 libtool-1.5.22/ltdl.m4 +--- libtool-1.5.22~/ltdl.m4 2006-03-11 14:25:37.000000000 +0100 ++++ libtool-1.5.22/ltdl.m4 2006-03-11 14:25:47.000000000 +0100 +@@ -147,7 +147,7 @@ + # at 6.2 and later dlopen does load deplibs. + libltdl_cv_sys_dlopen_deplibs=yes + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + libltdl_cv_sys_dlopen_deplibs=yes + ;; + openbsd*) --- libtool-1.5.22.orig/debian/patches/version_type.dpatch +++ libtool-1.5.22/debian/patches/version_type.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## version_type.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./ltmain.in /tmp/dpep-work.Lj140F/libtool-1.5.20/ltmain.in +--- ./ltmain.in 2005-09-14 20:38:50.000000000 +0200 ++++ /tmp/dpep-work.Lj140F/libtool-1.5.20/ltmain.in 2005-09-14 20:55:19.884336336 +0200 +@@ -3104,6 +3104,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) --- libtool-1.5.22.orig/debian/patches/link_all_deplibs.dpatch +++ libtool-1.5.22/debian/patches/link_all_deplibs.dpatch @@ -0,0 +1,46 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## link_all_deplibs.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not link against deplibs. This is not needed for shared libs +## DP: on atleast ELF systems since those already know which libs they +## DP: need themself. This seems to break a few things and will be fixed +## DP: in a better way in a future upstream version. + +@DPATCH@ +diff -urNad libtool-1.5.22~/libtool.m4 libtool-1.5.22/libtool.m4 +--- libtool-1.5.22~/libtool.m4 2006-03-11 14:36:13.000000000 +0100 ++++ libtool-1.5.22/libtool.m4 2006-03-11 14:36:16.000000000 +0100 +@@ -5359,6 +5359,9 @@ + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5555,6 +5558,7 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +diff -urNad libtool-1.5.22~/ltmain.in libtool-1.5.22/ltmain.in +--- libtool-1.5.22~/ltmain.in 2006-03-11 14:36:13.000000000 +0100 ++++ libtool-1.5.22/ltmain.in 2006-03-11 14:36:16.000000000 +0100 +@@ -2082,7 +2082,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then --- libtool-1.5.22.orig/debian/patches/00list +++ libtool-1.5.22/debian/patches/00list @@ -0,0 +1,6 @@ +link_all_deplibs +netbsdelf +version_type +dlopen_lt_global +deplibs_test_disable +kbsd --- libtool-1.5.22.orig/debian/patches/dlopen_lt_global.dpatch +++ libtool-1.5.22/debian/patches/dlopen_lt_global.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## dlopen_lt_global.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't use the RTLD_GLOBAL options when calling dlopen(), +## DP: this should not be needed. Some broken libraries might fail. +## DP: Patch from upstream CVS. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./libltdl/ltdl.c /tmp/dpep-work.CbxKbq/libtool-1.5.20/libltdl/ltdl.c +--- ./libltdl/ltdl.c 2005-09-14 20:38:50.000000000 +0200 ++++ /tmp/dpep-work.CbxKbq/libtool-1.5.20/libltdl/ltdl.c 2005-09-14 20:58:33.038972368 +0200 +@@ -1061,17 +1061,6 @@ + # include + #endif + +-#ifdef RTLD_GLOBAL +-# define LT_GLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_GLOBAL DL_GLOBAL +-# endif +-#endif /* !RTLD_GLOBAL */ +-#ifndef LT_GLOBAL +-# define LT_GLOBAL 0 +-#endif /* !LT_GLOBAL */ +- + /* We may have to define LT_LAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ + #ifndef LT_LAZY_OR_NOW +@@ -1107,7 +1096,7 @@ + lt_user_data loader_data; + const char *filename; + { +- lt_module module = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW); ++ lt_module module = dlopen (filename, LT_LAZY_OR_NOW); + + if (!module) + { --- libtool-1.5.22.orig/debian/patches/deplibs_test_disable.dpatch +++ libtool-1.5.22/debian/patches/deplibs_test_disable.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## deplibs_test_disable.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This test is broken for several reasons: +## DP: - It's linking a shared lib against a static lib. This is not +## DP: portable, and we even give a warning about this. +## DP: - The shared lib is not using any symbols from the static lib. +## DP: - The test program is linked against the shared lib and using +## DP: symbols from the static lib. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./tests/deplibs.test /tmp/dpep-work.anG1FO/libtool-1.5.20/tests/deplibs.test +--- ./tests/deplibs.test 2005-09-14 20:38:50.000000000 +0200 ++++ /tmp/dpep-work.anG1FO/libtool-1.5.20/tests/deplibs.test 2005-09-14 21:01:10.633014432 +0200 +@@ -1,6 +1,9 @@ + #! /bin/sh + # deplibs.test - check whether the shared library check method is OK + ++# This test is broken for several reasons, skip it. ++exit 77 ++ + # Test script header. + need_prefix=yes + if test -z "$srcdir"; then --- libtool-1.5.22.orig/debian/patches/kbsd.dpatch +++ libtool-1.5.22/debian/patches/kbsd.dpatch @@ -0,0 +1,160 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kbsd.dpatch by Kurt Roeckx +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make k*bsd*-gnu behave the same as Linux, since they should +## DP: be doing the same thing. + +@DPATCH@ +diff -urNad libtool-1.5.22~/libtool.m4 libtool-1.5.22/libtool.m4 +--- libtool-1.5.22~/libtool.m4 2006-03-11 14:39:13.000000000 +0100 ++++ libtool-1.5.22/libtool.m4 2006-03-11 14:48:06.000000000 +0100 +@@ -1391,18 +1391,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -1558,7 +1546,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1599,18 +1587,6 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + +-knetbsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -2316,7 +2292,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -2370,7 +2346,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3126,7 +3102,7 @@ + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes +@@ -3285,7 +3261,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -4660,7 +4636,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -4933,7 +4909,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -4976,7 +4952,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -5230,7 +5206,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -5544,7 +5520,7 @@ + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -5906,7 +5882,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes +diff -urNad libtool-1.5.22~/ltdl.m4 libtool-1.5.22/ltdl.m4 +--- libtool-1.5.22~/ltdl.m4 2006-03-11 14:39:13.000000000 +0100 ++++ libtool-1.5.22/ltdl.m4 2006-03-11 14:39:16.000000000 +0100 +@@ -127,7 +127,7 @@ + # 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* | linux* | k*bsd*-gnu) + # GNU and its variants, using gnu ld.so (Glibc) + libltdl_cv_sys_dlopen_deplibs=yes + ;;