rev 9486 - in kde-extras/taskjuggler/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Mar 1 15:12:05 UTC 2008
Author: fabo
Date: 2008-03-01 15:12:00 +0000 (Sat, 01 Mar 2008)
New Revision: 9486
Removed:
kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff
Modified:
kde-extras/taskjuggler/trunk/debian/changelog
kde-extras/taskjuggler/trunk/debian/compat
kde-extras/taskjuggler/trunk/debian/control
kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff
kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff
kde-extras/taskjuggler/trunk/debian/patches/98_buildprep.diff
kde-extras/taskjuggler/trunk/debian/patches/series
kde-extras/taskjuggler/trunk/debian/rules
Log:
* New upstream release.
* Unbump compat/debhelper to 5.
* Replace automake1.9 build dependency by automake.
* Refresh patches.
Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/changelog 2008-03-01 15:12:00 UTC (rev 9486)
@@ -1,3 +1,12 @@
+taskjuggler (2.4.1~beta2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Unbump compat/debhelper to 5.
+ * Replace automake1.9 build dependency by automake.
+ * Refresh patches.
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 01 Mar 2008 15:45:37 +0100
+
taskjuggler (2.4.1~beta1-1) unstable; urgency=low
* New upstream release.
Modified: kde-extras/taskjuggler/trunk/debian/compat
===================================================================
--- kde-extras/taskjuggler/trunk/debian/compat 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/compat 2008-03-01 15:12:00 UTC (rev 9486)
@@ -1 +1 @@
-6
+5
Modified: kde-extras/taskjuggler/trunk/debian/control
===================================================================
--- kde-extras/taskjuggler/trunk/debian/control 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/control 2008-03-01 15:12:00 UTC (rev 9486)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), quilt, automake1.9, kdelibs4-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, kdelibs4-dev,
libkcal2-dev | kdepim-dev, poster, docbook2x, docbook-to-man, docbook-utils,
docbook-xml, openjade, xsltproc
Standards-Version: 3.7.3
Deleted: kde-extras/taskjuggler/trunk/debian/patches/01_update_admin_dir.diff
Modified: kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff 2008-03-01 15:12:00 UTC (rev 9486)
@@ -1,347 +1,1825 @@
---- a/admin/install-sh
-+++ b/admin/install-sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
+--- a/admin/compile
++++ b/admin/compile
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
--scriptversion=2005-11-07.23
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,76 +25,118 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -58,21 +58,7 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
+-# Usage:
+-# compile PROGRAM [ARGS]...
+-# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit $?
++ ;;
++esac
--posix_glob=
--posix_mkdir=
+ ofile=
+ cfile=
+-args=
+-while test $# -gt 0; do
+- case "$1" in
+- -o)
+- # configure might choose to run compile as `compile cc -o foo foo.c'.
+- # So we do something ugly here.
+- ofile=$2
+- shift
+- case "$ofile" in
+- *.o | *.obj)
+- ;;
+- *)
+- args="$args -o $ofile"
+- ofile=
+- ;;
+- esac
+- ;;
+- *.c)
+- cfile=$1
+- args="$args $1"
+- ;;
+- *)
+- args="$args $1"
+- ;;
+- esac
+- shift
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
++ shift
+ done
+
+ if test -z "$ofile" || test -z "$cfile"; then
+- # If no `-o' option was seen then we might have been invoked from a
+- # pattern rule where we don't need one. That is ok -- this is a
+- # normal compilation that the losing compiler can handle. If no
+- # `.c' file was seen then we are probably linking. That is also
+- # ok.
+- exec "$prog" $args
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$@"
+ fi
+
+ # Name of file we expect compiler to create.
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file. Also, base the name on the expected
+ # object file name, since that is what matters with a parallel build.
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+ while true; do
+- if mkdir $lockdir > /dev/null 2>&1; then
+- break
+- fi
+- sleep 1
++ if mkdir "$lockdir" >/dev/null 2>&1; then
++ break
++ fi
++ sleep 1
+ done
+ # FIXME: race condition here if user kills between mkdir and trap.
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
+ fi
+
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/depcomp
++++ b/admin/depcomp
+@@ -1,7 +1,10 @@
+ #! /bin/sh
-
--# Symbolic mode for testing mkdir with directories.
--# It is the same as 755, but also tests that "u+" works.
--test_mode=u=rwx,g=rx,o=rx,u+wx
--
--# Desired mode of installed file.
--mode=0755
--
--# Desired mode of newly created intermediate directories.
--# It is empty if not known yet.
--intermediate_mode=
--
--chmodcmd=$chmodprog
-+chmodcmd="$chmodprog 0755"
- chowncmd=
- chgrpcmd=
- stripcmd=
-@@ -125,7 +111,7 @@
+ # depcomp - compile a program generating dependencies as side-effects
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2007-03-29.01
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
++# Foundation, Inc.
- --help) echo "$usage"; exit $?;;
+ # 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
+@@ -25,13 +28,45 @@
-- -m) mode=$2
-+ -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-@@ -178,8 +164,6 @@
- exit 0
+ # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++ depmode Dependency tracking mode.
++ source Source file read by `PROGRAMS ARGS'.
++ object Object file output by `PROGRAMS ARGS'.
++ DEPDIR directory where to store dependencies.
++ depfile Dependency file to output.
++ tmpdepfile Temporary file to use when outputing dependencies.
++ libtool Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v | --v*)
++ echo "depcomp $scriptversion"
++ exit $?
++ ;;
++esac
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
fi
+-# `libtool' can also be set to `yes' or `no'.
--test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+ rm -f "$tmpdepfile"
+@@ -57,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -163,31 +211,43 @@
+
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+- # in a .u file. This file always lives in the current directory.
+- # Also, the AIX compiler puts `$object:' at the start of each line;
+- # $object doesn't have directory information.
+- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+- tmpdepfile="$stripped.u"
+- outname="$stripped.o"
++ # in a .u file. In older versions, this file always lives in the
++ # current directory. Also, the AIX compiler puts `$object:' at the
++ # start of each line; $object doesn't have directory information.
++ # Version 6 uses the directory in both cases.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$base.u
++ tmpdepfile3=$dir.libs/$base.u
+ "$@" -Wc,-M
+ else
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$dir$base.u
++ tmpdepfile3=$dir$base.u
+ "$@" -M
+ fi
-
- for src
- do
- # Protect names starting with `-'.
-@@ -189,11 +173,15 @@
+ stat=$?
++
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
- if test -n "$dir_arg"; then
- dst=$src
-- dstdir=$dst
-- test -d "$dstdir"
-- dstdir_status=$?
-- else
-+ src=
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -198,11 +258,9 @@
+ ;;
-+ if test -d "$dst"; then
-+ mkdircmd=:
-+ chmodcmd=
-+ else
-+ mkdircmd=$mkdirprog
-+ fi
-+ else
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
-@@ -220,122 +208,53 @@
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
-- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-- dstdir_status=0
-- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
-- X"$dst" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-- echo X"$dst" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'
-- `
+ icc)
+- # Must come before tru64.
-
-- test -d "$dstdir"
-- dstdir_status=$?
-+ dst=$dst/`basename "$src"`
- fi
+- # Intel's C compiler understands `-MD -MF file'. However
++ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+- # will fill foo.d with something like
++ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+@@ -210,6 +268,12 @@
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
++ # ICC 7.1 will output
++ # foo.o: sub/foo.c sub/foo.h
++ # and will wrap long lines using \ :
++ # foo.o: sub/foo.c ... \
++ # sub/foo.h ... \
++ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+@@ -219,45 +283,110 @@
+ exit $stat
fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form `foo.o: dependent.h',
++ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++ # Some versions of the HPUX 10.20 sed can't process this invocation
++ # correctly. Breaking it into two sed invocations is a workaround.
++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
-- obsolete_mkdir_used=false
-+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-- if test $dstdir_status != 0; then
-- case $posix_mkdir in
-- '')
-- posix_mkdir=false
-- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
-- posix_mkdir=true
-- else
-- # Remove any dirs left behind by ancient mkdir implementations.
-- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
-- fi ;;
-- esac
-+ # Make sure that the destination directory exists.
+- tmpdepfile1="$object.d"
+- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
+ if test "$libtool" = yes; then
++ # With Tru64 cc, shared objects can also be used to make a
++ # static library. This mechanism is used in libtool 1.4 series to
++ # handle both shared and static libraries in a single compilation.
++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++ #
++ # With libtool 1.5 this exception was removed, and libtool now
++ # generates 2 separate objects for the 2 libraries. These two
++ # compilations output dependencies in $dir.libs/$base.o.d and
++ # in $dir$base.o.d. We have to check for both files, because
++ # one of the two compilations can be disabled. We should prefer
++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++ # automatically cleaned when .libs/ is deleted, while ignoring
++ # the former would cause a distcleancheck panic.
++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
++ tmpdepfile2=$dir$base.o.d # libtool 1.5
++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
++ tmpdepfile1=$dir$base.o.d
++ tmpdepfile2=$dir$base.d
++ tmpdepfile3=$dir$base.d
++ tmpdepfile4=$dir$base.d
+ "$@" -MD
+ fi
-- if
-- $posix_mkdir && {
-+ # Skip lots of stat calls in the usual case.
-+ if test ! -d "$dstdir"; then
-+ defaultIFS='
-+ '
-+ IFS="${IFS-$defaultIFS}"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile1" "$tmpdepfile2"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ exit $stat
+ fi
+
+- if test -f "$tmpdepfile1"; then
+- tmpdepfile="$tmpdepfile1"
+- else
+- tmpdepfile="$tmpdepfile2"
+- fi
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a space and a tab in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+@@ -270,34 +399,42 @@
+
+ dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- test -z "$dashmflag" && dashmflag=-M
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*) # this is libtool, let us make it quiet
+- for arg
+- do # cycle over the arguments
+- case "$arg" in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout, regardless of -o.
++ "$@" || exit $?
+
-+ oIFS=$IFS
-+ # Some sh's can't handle IFS=/ for some reason.
-+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
+ shift
-+ IFS=$oIFS
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++
++ test -z "$dashmflag" && dashmflag=-M
++ # Require at least two characters before searching for `:'
++ # in the target name. This is to cope with DOS-style filenames:
++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++ "$@" $dashmflag |
++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ tr ' ' '
+@@ -315,36 +452,40 @@
+ ;;
-- # With -d, create the new directory with the user-specified mode.
-- # Otherwise, create it using the same intermediate mode that
-- # mkdir -p would use when creating intermediate directories.
-- # POSIX says that this mode is "$(umask -S),u+wx", so use that
-- # if umask -S works.
+ makedepend)
+- # X makedepend
+- (
+- shift
+- cleared=no
+- for arg in "$@"; do
+- case $cleared in no)
+- set ""; shift
+- cleared=yes
+- esac
+- case "$arg" in
+- -D*|-I*)
+- set fnord "$@" "$arg"; shift;;
+- -*)
+- ;;
+- *)
+- set fnord "$@" "$arg"; shift;;
+- esac
++ "$@" || exit $?
++ # Remove any Libtool call
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
+ done
+- obj_suffix="`echo $object | sed 's/^.*\././'`"
+- touch "$tmpdepfile"
+- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ shift
++ fi
++ # X makedepend
++ shift
++ cleared=no
++ for arg in "$@"; do
++ case $cleared in
++ no)
++ set ""; shift
++ cleared=yes ;;
++ esac
++ case "$arg" in
++ -D*|-I*)
++ set fnord "$@" "$arg"; shift ;;
++ # Strip any option that makedepend may not understand. Remove
++ # the object too, otherwise makedepend will parse it as a source file.
++ -*|$object)
++ ;;
++ *)
++ set fnord "$@" "$arg"; shift ;;
++ esac
++ done
++ obj_suffix="`echo $object | sed 's/^.*\././'`"
++ touch "$tmpdepfile"
++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tail +3 "$tmpdepfile" | tr ' ' '
++ sed '1,2d' "$tmpdepfile" | tr ' ' '
+ ' | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+@@ -354,35 +495,40 @@
+
+ cpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" -E |
+- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++ done
++
++ "$@" -E |
++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+@@ -392,34 +538,27 @@
+
+ msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
++ # always write the preprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
++ "$@" || exit $?
++ IFS=" "
++ for arg
++ do
++ case "$arg" in
++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++ set fnord "$@"
++ shift
++ shift
++ ;;
++ *)
+ set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
+- ;;
++ shift
++ shift
++ ;;
+ esac
+- "$@" -E |
+- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++ "$@" -E |
++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+@@ -439,3 +578,12 @@
+ esac
+
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/install-sh
++++ b/admin/install-sh
+@@ -1,276 +1,519 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2006-12-25.00
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission. M.I.T. makes no representations about the
+-# suitability of this software for any purpose. It is provided "as is"
+-# without express or implied warranty.
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
+
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
-
-- if test -n "$dir_arg"; then
-- mkdir_mode=$mode
++doit=${DOITPROG-}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
+-
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+-chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
++
++posix_mkdir=
++
++# Desired mode of installed file.
++mode=0755
++
++chgrpcmd=
++chmodcmd=$chmodprog
++chowncmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+- case $1 in
+- -c) instcmd=$cpprog
+- shift
+- continue;;
+-
+- -d) dir_arg=true
+- shift
+- continue;;
+-
+- -m) chmodcmd="$chmodprog $2"
+- shift
+- shift
+- continue;;
+-
+- -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+- shift
+- continue;;
+-
+- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+- shift
+- continue;;
++stripcmd=
+
+- *) if [ x"$src" = x ]
+- then
+- src=$1
+- else
+- # this colon is to work around a 386BSD /bin/sh bug
+- :
+- dst=$1
+- fi
+- shift
+- continue;;
+- esac
+-done
++src=
++dst=
++dir_arg=
++dst_arg=
+
+-if [ x"$src" = x ]
+-then
+- echo "$0: no input file specified" >&2
+- exit 1
+-else
+- :
+-fi
++copy_on_change=false
++no_target_directory=
+
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d "$dst" ]; then
+- instcmd=:
+- chmodcmd=""
- else
-- case $intermediate_mode in
-- '')
-- if umask_S=`(umask -S) 2>/dev/null`; then
-- intermediate_mode=$umask_S,u+wx
-- else
-- intermediate_mode=$test_mode
-- fi ;;
-- esac
-- mkdir_mode=$intermediate_mode
+- instcmd=$mkdirprog
- fi
+-else
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
+
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
-
-- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
-- }
-- then :
-- else
-+ pathcomp=
+- if [ -f "$src" ] || [ -d "$src" ]
+- then
+- :
+- else
+- echo "$0: $src does not exist" >&2
+- exit 1
+- fi
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
-- # mkdir does not conform to POSIX, or it failed possibly due to
-- # a race condition. Create the directory the slow way, step by
-- # step, checking for races as we go.
+- if [ x"$dst" = x ]
+- then
+- echo "$0: no destination specified" >&2
+- exit 1
+- else
+- :
+- fi
++Options:
++ --help display this help and exit.
++ --version display version info and exit.
+
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
+
+- if [ -d "$dst" ]
+- then
+- dst=$dst/`basename "$src"`
+- else
+- :
+- fi
+-fi
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
++"
+
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++while test $# -ne 0; do
++ case $1 in
++ -c) ;;
+
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
++ -C) copy_on_change=true;;
+
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+- '
+-IFS="${IFS-$defaultIFS}"
-
-- case $dstdir in
-- /*) pathcomp=/ ;;
-- -*) pathcomp=./ ;;
-- *) pathcomp= ;;
-- esac
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS=$oIFS
-
-- case $posix_glob in
-- '')
-- if (set -f) 2>/dev/null; then
-- posix_glob=true
-- else
-- posix_glob=false
-- fi ;;
-- esac
+-pathcomp=''
-
-- oIFS=$IFS
-- IFS=/
-- $posix_glob && set -f
-- set fnord $dstdir
-+ while test $# -ne 0 ; do
-+ pathcomp=$pathcomp$1
- shift
-- $posix_glob && set +f
-- IFS=$oIFS
+-while [ $# -ne 0 ] ; do
+- pathcomp=$pathcomp$1
+- shift
-
-- for d
-- do
-- test "x$d" = x && continue
+- if [ ! -d "$pathcomp" ] ;
+- then
+- $mkdirprog "$pathcomp"
+- else
+- :
+- fi
++ -d) dir_arg=true;;
+
+- pathcomp=$pathcomp/
+-done
+-fi
++ -g) chgrpcmd="$chgrpprog $2"
++ shift;;
+
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
-
-- pathcomp=$pathcomp$d
-- if test ! -d "$pathcomp"; then
-- $mkdirprog "$pathcomp"
-- # Don't fail if two instances are running concurrently.
-- test -d "$pathcomp" || exit 1
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
++ --help) echo "$usage"; exit $?;;
+
+-# If we're going to rename the final executable, determine the name now.
++ -m) mode=$2
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
- fi
-- pathcomp=$pathcomp/
-- done
-- obsolete_mkdir_used=true
-- fi
-+ if test ! -d "$pathcomp"; then
-+ $mkdirprog "$pathcomp"
-+ # mkdir can fail with a `File exist' error in case several
-+ # install-sh are creating the directory concurrently. This
-+ # is OK.
-+ test -d "$pathcomp" || exit
++ -o) chowncmd="$chownprog $2"
++ shift;;
+
+-# don't allow the sed command to completely eliminate the filename
++ -s) stripcmd=$stripprog;;
+
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- :
+- fi
++ -t) dst_arg=$2
++ shift;;
+
+-# Make a couple of temp file names in the proper directory.
++ -T) no_target_directory=true;;
+
+- dsttmp=$dstdir/#inst.$$#
+- rmtmp=$dstdir/#rm.$$#
++ --version) echo "$0 $scriptversion"; exit $?;;
+
+-# Trap to clean up temp files at exit.
++ --) shift
++ break;;
+
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
+
+-# Move or copy the file name to the temp name
++ *) break;;
++ esac
++ shift
++done
+
+- $doit $instcmd "$src" "$dsttmp" &&
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dst_arg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dst_arg"
++ shift # fnord
++ fi
++ shift # arg
++ dst_arg=$arg
++ done
++fi
+
+-# and set any options; do chmod last to preserve setuid bits
++if test $# -eq 0; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
+
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
+
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
+ fi
-+ pathcomp=$pathcomp/
-+ done
- fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
- if test -n "$dir_arg"; then
-- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
-+ $doit $mkdircmd "$dst" \
-+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+-# Now remove or move aside any old file at destination location. We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons. In this case, the final cleanup
+-# might fail but the new file should still install successfully.
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src;;
++ esac
+
- else
-+ dstfile=`basename "$dst"`
++ if test -n "$dir_arg"; then
++ dst=$src
++ dstdir=$dst
++ test -d "$dstdir"
++ dstdir_status=$?
++ else
++
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dst_arg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dst_arg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst;;
++ esac
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -343,6 +262,7 @@
+-{
+- if [ -f "$dstdir/$dstfile" ]
+- then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+- {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+- (exit 1); exit
+- }
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dst_arg: Is a directory" >&2
++ exit 1
++ fi
++ dstdir=$dst
++ dst=$dstdir/`basename "$src"`
++ dstdir_status=0
++ else
++ # Prefer dirname, but fall back on a substitute if dirname fails.
++ dstdir=`
++ (dirname "$dst") 2>/dev/null ||
++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$dst" : 'X\(//\)[^/]' \| \
++ X"$dst" : 'X\(//\)$' \| \
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
++ echo X"$dst" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
++ `
++
++ test -d "$dstdir"
++ dstdir_status=$?
++ fi
++ fi
++
++ obsolete_mkdir_used=false
++
++ if test $dstdir_status != 0; then
++ case $posix_mkdir in
++ '')
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
++
++ # With -d, create the new directory with the user-specified mode.
++ # Otherwise, rely on $mkdir_umask.
++ if test -n "$dir_arg"; then
++ mkdir_mode=-m$mode
+ else
+- :
++ mkdir_mode=
+ fi
+-} &&
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+ trap '(exit $?); exit' 1 2 13 15
+-# Now rename the file to the real destination.
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- # Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
-@@ -356,10 +276,10 @@
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
++ then :
++ else
++
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
++
++ case $dstdir in
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
++ esac
++
++ eval "$initialize_posix_glob"
++
++ oIFS=$IFS
++ IFS=/
++ $posix_glob set -f
++ set fnord $dstdir
++ shift
++ $posix_glob set +f
++ IFS=$oIFS
++
++ prefixes=
++
++ for d
++ do
++ test -z "$d" && continue
++
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
++ fi
++ prefix=$prefix/
++ done
- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
-@@ -371,12 +291,11 @@
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
-- if test -f "$dst"; then
-- $doit $rmcmd -f "$dst" 2>/dev/null \
-- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-+ if test -f "$dstdir/$dstfile"; then
-+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
-- echo "$0: cannot unlink or rename $dst" >&2
-+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
-@@ -385,14 +304,17 @@
- } &&
+-fi &&
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
++ fi
++ fi
++ fi
++
++ if test -n "$dir_arg"; then
++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
++ else
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++
++ # Copy the file name to the temp name.
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
++
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
-- } || exit 1
--
-- trap '' 0
-- fi
-+ }
-+ fi || { (exit 1); exit 1; }
- done
+-# The final little trick to "correctly" pass the exit status to the exit trap.
++ trap '' 0
++ fi
++done
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+ (exit 0); exit 0
-+}
-+
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
+-{
+- (exit 0); exit
+-}
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
--- a/admin/missing
+++ b/admin/missing
-@@ -1,9 +1,9 @@
+@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
++
++scriptversion=2006-05-10.23
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
++# Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
--scriptversion=2004-09-07.08
-+scriptversion=2005-06-08.21
+ # This program is free software; you can redistribute it and/or modify
+@@ -29,6 +33,8 @@
+ fi
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-@@ -19,8 +19,8 @@
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -38,18 +44,24 @@
+ configure_ac=configure.in
+ fi
- # 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.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
+-case "$1" in
++msg="missing on your system"
++
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
+ ;;
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -87,12 +87,12 @@
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
- Send bug reports to <bug-automake at gnu.org>."
-- exit 0
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -67,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -74,11 +87,15 @@
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake at gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
-- exit 0
+- echo "missing 0.4 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
-@@ -288,11 +288,18 @@
+@@ -87,14 +104,44 @@
+ exit 1
+ ;;
+
+- aclocal*)
++esac
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case $1 in
++ lex|yacc)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ tar)
++ if test -n "$run"; then
++ echo 1>&2 "ERROR: \`tar' requires --run"
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ exit 1
++ fi
++ ;;
++
++ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
+ fi
++ ;;
++esac
+
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case $1 in
++ aclocal*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+@@ -102,13 +149,8 @@
+ ;;
+
+ autoconf)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+@@ -116,13 +158,8 @@
+ ;;
+
+ autoheader)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+@@ -130,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -140,13 +177,8 @@
+ ;;
+
+ automake*)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+@@ -156,20 +188,15 @@
+ ;;
+
+ autom4te)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them.
+- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
++ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -185,74 +212,67 @@
+
+ bison|yacc)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex|flex)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -262,32 +282,36 @@
+ ;;
+
+ makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
@@ -351,3 +1829,515 @@
touch $file
;;
+ tar)
+ shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -300,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+@@ -323,10 +347,10 @@
+
+ *)
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+- it often tells you about the needed prerequirements for installing
++ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+@@ -334,3 +358,10 @@
+ esac
+
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
+@@ -1,21 +1,36 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+-# Created: 1993-05-16
+-# Public domain
+
++scriptversion=2006-05-11.19
++
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+-dirmode=""
++dirmode=
+
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake at gnu.org>."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+- echo "$usage" 1>&2
+- exit 0
++ echo "$usage"
++ exit $?
+ ;;
+ -m) # -m PERM arg
+ shift
+@@ -23,6 +38,10 @@
+ dirmode=$1
+ shift
+ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit $?
++ ;;
+ --) # stop option processing
+ shift
+ break
+@@ -50,30 +69,58 @@
+ 0) exit 0 ;;
+ esac
+
++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error. This is a problem when calling mkinstalldirs
++# from a parallel make. We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+ '')
+- if mkdir -p -- . 2>/dev/null; then
++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
++ else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ test -d ./-p && rmdir ./-p
++ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
++ else
++ # Clean up after NextStep and OpenStep mkdir.
++ for d in ./-m ./-p ./--version "./$dirmode";
++ do
++ test -d $d && rmdir $d
++ done
+ fi
+ ;;
+ esac
+
+ for file
+ do
+- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++ case $file in
++ /*) pathcomp=/ ;;
++ *) pathcomp= ;;
++ esac
++ oIFS=$IFS
++ IFS=/
++ set fnord $file
+ shift
++ IFS=$oIFS
+
+- pathcomp=
+ for d
+ do
+- pathcomp="$pathcomp$d"
++ test "x$d" = x && continue
++
++ pathcomp=$pathcomp$d
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+@@ -84,21 +131,21 @@
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+- errstatus=$lasterr
++ errstatus=$lasterr
+ else
+- if test ! -z "$dirmode"; then
++ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+- lasterr=""
+- chmod "$dirmode" "$pathcomp" || lasterr=$?
++ lasterr=
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+- if test ! -z "$lasterr"; then
+- errstatus=$lasterr
+- fi
+- fi
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
+ fi
+ fi
+
+- pathcomp="$pathcomp/"
++ pathcomp=$pathcomp/
+ done
+ done
+
+@@ -107,5 +154,8 @@
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
+ # End:
+-# mkinstalldirs ends here
+--- a/admin/ylwrap
++++ b/admin/ylwrap
+@@ -1,6 +1,11 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2007-11-22.22
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
++# 2007 Free Software Foundation, Inc.
++#
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,51 +20,73 @@
+ #
+ # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, 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.
+
+-# Usage:
+-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+-# * INPUT is the input file
+-# * OUTPUT is file PROG generates
+-# * DESIRED is file we actually want
+-# * PROGRAM is program to run
+-# * ARGS are passed to PROG
+-# Any number of OUTPUT,DESIRED pairs may be used.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case "$1" in
++ '')
++ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
++ exit 1
++ ;;
++ --basedir)
++ basedir=$2
++ shift 2
++ ;;
++ -h|--h*)
++ cat <<\EOF
++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
++
++Wrapper for lex/yacc invocations, renaming files as desired.
++
++ INPUT is the input file
++ OUTPUT is one file PROG generates
++ DESIRED is the file we actually want instead of OUTPUT
++ PROGRAM is program to run
++ ARGS are passed to PROG
++
++Any number of OUTPUT,DESIRED pairs may be used.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++ exit $?
++ ;;
++ -v|--v*)
++ echo "ylwrap $scriptversion"
++ exit $?
++ ;;
++esac
++
+
+ # The input.
+ input="$1"
+ shift
+ case "$input" in
+- [\\/]* | ?:[\\/]*)
++ [\\/]* | ?:[\\/]*)
+ # Absolute path; do nothing.
+ ;;
+- *)
++ *)
+ # Relative path. Make it absolute.
+ input="`pwd`/$input"
+ ;;
+ esac
+
+-# The directory holding the input.
+-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+-# Quote $INPUT_DIR so we can use it in a regexp.
+-# FIXME: really we should care about more than `.' and `\'.
+-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
+-
+-echo "got $input_rx"
+-
+ pairlist=
+ while test "$#" -ne 0; do
+- if test "$1" = "--"; then
+- shift
+- break
+- fi
+- pairlist="$pairlist $1"
+- shift
++ if test "$1" = "--"; then
++ shift
++ break
++ fi
++ pairlist="$pairlist $1"
++ shift
+ done
+
+ # The program to run.
+@@ -67,77 +94,130 @@
+ shift
+ # Make any relative path in $prog absolute.
+ case "$prog" in
+- [\\/]* | ?:[\\/]*) ;;
+- *[\\/]*) prog="`pwd`/$prog" ;;
++ [\\/]* | ?:[\\/]*) ;;
++ *[\\/]*) prog="`pwd`/$prog" ;;
+ esac
+
+ # FIXME: add hostname here for parallel makes that run commands on
+ # other machines. But that might take us over the 14-char limit.
+ dirname=ylwrap$$
+-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
++trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+ mkdir $dirname || exit 1
+
+ cd $dirname
+
+-$prog ${1+"$@"} "$input"
+-status=$?
++case $# in
++ 0) "$prog" "$input" ;;
++ *) "$prog" "$@" "$input" ;;
++esac
++ret=$?
+
+-if test $status -eq 0; then
+- set X $pairlist
+- shift
+- first=yes
+- # Since DOS filename conventions don't allow two dots,
+- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+- y_tab_nodot="no"
+- if test -f y_tab.c || test -f y_tab.h; then
+- y_tab_nodot="yes"
+- fi
+-
+- while test "$#" -ne 0; do
+- from="$1"
+- # Handle y_tab.c and y_tab.h output by DOS
+- if test $y_tab_nodot = "yes"; then
+- if test $from = "y.tab.c"; then
+- from="y_tab.c"
+- else
+- if test $from = "y.tab.h"; then
+- from="y_tab.h"
+- fi
+- fi
+- fi
+- if test -f "$from"; then
+- # If $2 is an absolute path name, then just use that,
+- # otherwise prepend `../'.
+- case "$2" in
+- [\\/]* | ?:[\\/]*) target="$2";;
+- *) target="../$2";;
+- esac
+-
+- # Edit out `#line' or `#' directives. We don't want the
+- # resulting debug information to point at an absolute srcdir;
+- # it is better for it to just mention the .y file with no
+- # path.
+- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
++ set X $pairlist
++ shift
++ first=yes
++ # Since DOS filename conventions don't allow two dots,
++ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
++ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
++ y_tab_nodot="no"
++ if test -f y_tab.c || test -f y_tab.h; then
++ y_tab_nodot="yes"
++ fi
++
++ # The directory holding the input.
++ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
++ # Quote $INPUT_DIR so we can use it in a regexp.
++ # FIXME: really we should care about more than `.' and `\'.
++ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
++
++ while test "$#" -ne 0; do
++ from="$1"
++ # Handle y_tab.c and y_tab.h output by DOS
++ if test $y_tab_nodot = "yes"; then
++ if test $from = "y.tab.c"; then
++ from="y_tab.c"
+ else
+- # A missing file is only an error for the first file. This
+- # is a blatant hack to let us support using "yacc -d". If -d
+- # is not specified, we don't want an error when the header
+- # file is "missing".
+- if test $first = yes; then
+- status=1
+- fi
++ if test $from = "y.tab.h"; then
++ from="y_tab.h"
++ fi
+ fi
+- shift
+- shift
+- first=no
+- done
++ fi
++ if test -f "$from"; then
++ # If $2 is an absolute path name, then just use that,
++ # otherwise prepend `../'.
++ case "$2" in
++ [\\/]* | ?:[\\/]*) target="$2";;
++ *) target="../$2";;
++ esac
++
++ # We do not want to overwrite a header file if it hasn't
++ # changed. This avoid useless recompilations. However the
++ # parser itself (the first file) should always be updated,
++ # because it is the destination of the .y.c rule in the
++ # Makefile. Divert the output of all other files to a temporary
++ # file so we can compare them to existing versions.
++ if test $first = no; then
++ realtarget="$target"
++ target="tmp-`echo $target | sed s/.*[\\/]//g`"
++ fi
++ # Edit out `#line' or `#' directives.
++ #
++ # We don't want the resulting debug information to point at
++ # an absolute srcdir; it is better for it to just mention the
++ # .y file with no path.
++ #
++ # We want to use the real output file name, not yy.lex.c for
++ # instance.
++ #
++ # We want the include guards to be adjusted too.
++ FROM=`echo "$from" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++ TARGET=`echo "$2" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++
++ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
++
++ # Check whether header files must be updated.
++ if test $first = no; then
++ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
++ echo "$2" is unchanged
++ rm -f "$target"
++ else
++ echo updating "$2"
++ mv -f "$target" "$realtarget"
++ fi
++ fi
++ else
++ # A missing file is only an error for the first file. This
++ # is a blatant hack to let us support using "yacc -d". If -d
++ # is not specified, we don't want an error when the header
++ # file is "missing".
++ if test $first = yes; then
++ ret=1
++ fi
++ fi
++ shift
++ shift
++ first=no
++ done
+ else
+- status=$?
++ ret=$?
+ fi
+
+ # Remove the directory.
+ cd ..
+ rm -rf $dirname
+
+-exit $status
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
Modified: kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff 2008-03-01 15:12:00 UTC (rev 9486)
@@ -3,8 +3,9 @@
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
- ## Free Software Foundation, Inc.
+-## Free Software Foundation, Inc.
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
++## 2008 Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
##
-## This program is free software; you can redistribute it and/or modify
@@ -30,7 +31,7 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -43,7 +44,15 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -132,7 +117,7 @@
+@@ -110,7 +95,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -132,7 +116,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -52,7 +61,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -152,7 +137,7 @@
+@@ -152,7 +136,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -61,7 +70,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -172,6 +157,7 @@
+@@ -172,6 +156,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -69,7 +78,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -184,22 +170,24 @@
+@@ -184,22 +169,24 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -97,7 +106,16 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -240,11 +228,58 @@
+@@ -209,6 +196,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -240,11 +229,129 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -149,14 +167,85 @@
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
++$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
++
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -254,12 +289,20 @@
+@@ -254,12 +361,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -182,7 +271,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -317,15 +360,15 @@
+@@ -317,15 +432,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -201,7 +290,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -490,18 +533,21 @@
+@@ -490,18 +605,21 @@
rm -rf conftest*
;;
@@ -227,7 +316,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,8 +559,10 @@
+@@ -513,8 +631,10 @@
esac
;;
*64-bit*)
@@ -239,7 +328,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -547,6 +595,22 @@
+@@ -547,6 +667,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -251,7 +340,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
@@ -262,7 +355,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -570,7 +634,7 @@
+@@ -570,7 +710,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -271,7 +364,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -578,7 +642,7 @@
+@@ -578,7 +718,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -280,7 +373,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -588,8 +652,10 @@
+@@ -588,8 +728,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -293,7 +386,7 @@
$2=yes
fi
fi
-@@ -609,17 +675,23 @@
+@@ -609,22 +751,28 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -320,7 +413,13 @@
else
$2=yes
fi
-@@ -643,7 +715,7 @@
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -643,7 +791,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -329,7 +428,7 @@
case $build_os in
msdosdjgpp*)
-@@ -672,24 +744,77 @@
+@@ -672,24 +820,77 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -425,7 +524,7 @@
;;
esac
])
-@@ -702,7 +827,7 @@
+@@ -702,7 +903,7 @@
# _LT_AC_CHECK_DLFCN
@@ -434,7 +533,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +835,7 @@
+@@ -710,7 +911,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -443,7 +542,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -776,17 +901,19 @@
+@@ -776,17 +977,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -465,7 +564,7 @@
esac
else :
# compilation failed
-@@ -798,7 +925,7 @@
+@@ -798,7 +1001,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -474,7 +573,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -835,7 +962,7 @@
+@@ -835,12 +1038,12 @@
lt_cv_dlopen_self=yes
])
;;
@@ -483,7 +582,22 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -869,7 +996,7 @@
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -848,7 +1051,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -869,7 +1072,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -492,7 +606,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +1009,7 @@
+@@ -882,7 +1085,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -501,7 +615,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -914,7 +1041,8 @@
+@@ -914,7 +1117,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -511,7 +625,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -922,14 +1050,7 @@
+@@ -922,14 +1126,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -527,7 +641,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -937,7 +1058,7 @@
+@@ -937,7 +1134,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -536,7 +650,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -949,13 +1070,18 @@
+@@ -949,13 +1146,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -559,7 +673,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1014,8 +1140,8 @@
+@@ -1014,8 +1216,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -570,7 +684,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1064,6 +1190,7 @@
+@@ -1064,6 +1266,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -578,7 +692,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1072,7 +1199,7 @@
+@@ -1072,7 +1275,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -587,7 +701,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1081,11 +1208,12 @@
+@@ -1081,11 +1284,12 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -602,7 +716,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1223,58 @@
+@@ -1095,7 +1299,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -662,7 +776,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1160,7 +1339,7 @@
+@@ -1113,7 +1368,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1160,7 +1415,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -671,7 +794,7 @@
;;
beos*)
-@@ -1169,7 +1348,7 @@
+@@ -1169,7 +1424,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -680,7 +803,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1364,7 @@
+@@ -1185,7 +1440,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -689,7 +812,7 @@
need_version=no
need_lib_prefix=no
-@@ -1197,7 +1376,8 @@
+@@ -1197,7 +1452,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -699,7 +822,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1227,7 +1407,7 @@
+@@ -1227,7 +1483,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -708,7 +831,7 @@
;;
esac
;;
-@@ -1250,13 +1430,9 @@
+@@ -1250,13 +1506,9 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -725,11 +848,11 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1273,20 +1449,17 @@
+@@ -1273,20 +1525,17 @@
dynamic_linker=no
;;
--kfreebsd*-gnu*)
+-freebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
@@ -757,7 +880,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1304,14 +1477,19 @@
+@@ -1304,14 +1553,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -779,7 +902,7 @@
esac
;;
-@@ -1331,9 +1509,9 @@
+@@ -1331,9 +1585,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -791,7 +914,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1526,7 @@
+@@ -1348,7 +1602,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -800,7 +923,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1537,7 @@
+@@ -1359,7 +1613,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -809,7 +932,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1549,18 @@
+@@ -1371,6 +1625,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -828,7 +951,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1604,26 @@
+@@ -1414,29 +1680,26 @@
;;
# This must be Linux ELF.
@@ -843,7 +966,7 @@
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
-- if test -d /lib64 -a ! -h /lib64; then
+- if test -d /lib64; then
- libsuff=64
- fi
- fi
@@ -865,7 +988,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1633,18 @@
+@@ -1446,6 +1709,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -884,7 +1007,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1654,7 @@
+@@ -1455,7 +1730,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -893,7 +1016,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1682,13 @@
+@@ -1483,8 +1758,13 @@
openbsd*)
version_type=sunos
@@ -908,7 +1031,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1708,7 @@
+@@ -1504,7 +1784,7 @@
os2*)
libname_spec='$name'
@@ -917,7 +1040,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,11 +1726,8 @@
+@@ -1522,11 +1802,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -931,7 +1054,7 @@
;;
solaris*)
-@@ -1554,7 +1755,7 @@
+@@ -1554,7 +1831,7 @@
need_version=yes
;;
@@ -940,7 +1063,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1587,6 +1788,29 @@
+@@ -1587,6 +1864,29 @@
fi
;;
@@ -970,11 +1093,18 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,13 +1824,19 @@
+@@ -1600,13 +1900,26 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -991,7 +1121,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -1624,6 +1854,9 @@
+@@ -1624,6 +1937,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -1001,7 +1131,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1883,9 @@
+@@ -1650,7 +1966,9 @@
case $tagname in
CXX)
@@ -1012,7 +1142,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +1947,7 @@
+@@ -1712,7 +2030,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -1021,7 +1151,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1985,7 @@
+@@ -1750,7 +2068,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -1030,7 +1160,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1862,7 +2097,7 @@
+@@ -1862,7 +2180,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -1039,7 +1169,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -1886,7 +2121,7 @@
+@@ -1886,7 +2204,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -1048,7 +1178,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -1925,7 +2160,7 @@
+@@ -1925,7 +2243,7 @@
# AC_PATH_MAGIC
# -------------
@@ -1057,7 +1187,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -1996,7 +2231,7 @@
+@@ -1996,7 +2314,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -1066,7 +1196,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2028,7 +2263,7 @@
+@@ -2028,7 +2346,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -1075,7 +1205,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2290,15 @@
+@@ -2055,6 +2373,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -1091,7 +1221,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2063,7 +2307,7 @@
+@@ -2063,7 +2390,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -1100,10 +1230,19 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2088,44 +2332,42 @@
+@@ -2080,7 +2407,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
+@@ -2088,44 +2415,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-bsdi4*)
+bsdi[[45]]*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
@@ -1150,7 +1289,7 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd* | kfreebsd*-gnu)
+-freebsd*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
@@ -1162,7 +1301,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2141,7 +2383,7 @@
+@@ -2141,7 +2466,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1171,7 +1310,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -2157,43 +2399,27 @@
+@@ -2157,43 +2482,27 @@
esac
;;
@@ -1228,7 +1367,7 @@
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
-@@ -2212,32 +2438,26 @@
+@@ -2212,32 +2521,26 @@
;;
openbsd*)
@@ -1265,7 +1404,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2258,10 +2478,13 @@
+@@ -2258,10 +2561,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1280,7 +1419,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2281,36 +2504,43 @@
+@@ -2281,36 +2587,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1348,7 +1487,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2342,13 +2572,13 @@
+@@ -2342,13 +2655,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1369,7 +1508,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2367,13 +2597,13 @@
+@@ -2367,13 +2680,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1390,7 +1529,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -2411,10 +2641,21 @@
+@@ -2411,10 +2724,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1413,7 +1552,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2454,7 +2695,7 @@
+@@ -2454,7 +2778,7 @@
# AC_LIBTOOL_RC
@@ -1422,7 +1561,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2480,43 +2721,16 @@
+@@ -2480,43 +2804,16 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1471,7 +1610,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2744,9 @@
+@@ -2530,9 +2827,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1483,7 +1622,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2541,7 +2755,7 @@
+@@ -2541,7 +2838,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1492,12 +1631,12 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2550,48 +2764,11 @@
+@@ -2550,37 +2847,11 @@
fi
;;
-aix4*)
-+aix4* | aix5*)
++aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -1507,21 +1646,10 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-- ;;
-- esac
-- fi
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- esac
- output_verbose_link_cmd='echo'
@@ -1543,7 +1671,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2616,7 +2793,7 @@
+@@ -2605,7 +2876,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1552,7 +1680,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2628,6 +2805,7 @@
+@@ -2617,6 +2888,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1560,8 +1688,11 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2645,21 +2823,25 @@
+@@ -2632,23 +2904,28 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
-ac_ext=cc
@@ -1589,7 +1720,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2670,18 +2852,18 @@
+@@ -2659,18 +2936,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1611,7 +1742,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2699,8 +2881,8 @@
+@@ -2688,8 +2965,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -1622,7 +1753,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2726,7 +2908,7 @@
+@@ -2715,7 +2992,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1631,22 +1762,27 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2756,13 +2938,28 @@
+@@ -2737,7 +3014,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -2745,8 +3022,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
+ aix_use_runtimelinking=no
-
-- # When large executables or shared objects are built, AIX ld can
++
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
@@ -1658,15 +1794,10 @@
+ ;;
+ esac
+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-@@ -2774,7 +2971,7 @@
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -2763,7 +3055,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1675,7 +1806,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -2782,7 +2979,7 @@
+@@ -2771,7 +3063,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1684,7 +1815,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -2793,8 +2990,12 @@
+@@ -2782,8 +3074,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1697,7 +1828,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2803,15 +3004,16 @@
+@@ -2792,15 +3088,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1718,7 +1849,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -2820,13 +3022,12 @@
+@@ -2809,13 +3106,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1734,7 +1865,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2835,16 +3036,26 @@
+@@ -2824,16 +3120,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1766,7 +1897,7 @@
chorus*)
case $cc_basename in
*)
-@@ -2858,12 +3069,12 @@
+@@ -2847,12 +3153,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1781,7 +1912,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2872,70 +3083,81 @@
+@@ -2861,59 +3167,53 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1791,85 +1922,16 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
-+ darwin* | rhapsody*)
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
+-
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
-+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
-+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-- ;;
-- esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case $cc_basename in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
- fi
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- esac
- lt_int_apple_cc_single_mod=no
@@ -1900,6 +1962,39 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++ darwin* | rhapsody*)
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++ fi
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
+ ;;
dgux*)
@@ -1914,7 +2009,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2946,14 +3168,14 @@
+@@ -2924,14 +3224,14 @@
;;
esac
;;
@@ -1926,12 +2021,12 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd* | kfreebsd*-gnu)
+- freebsd*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2970,12 +3192,12 @@
+@@ -2948,12 +3248,12 @@
# location of the library.
case $cc_basename in
@@ -1947,7 +2042,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -2984,11 +3206,11 @@
+@@ -2962,11 +3262,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1961,7 +2056,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2998,33 +3220,20 @@
+@@ -2976,34 +3276,21 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1988,21 +2083,22 @@
fi
- case "$host_cpu" in
- hppa*64*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-- ia64*)
+ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
+- ;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3035,17 +3244,20 @@
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+@@ -3013,17 +3300,20 @@
esac
case $cc_basename in
@@ -2029,7 +2125,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3061,12 +3273,15 @@
+@@ -3039,12 +3329,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -2049,7 +2145,7 @@
;;
esac
fi
-@@ -3077,11 +3292,25 @@
+@@ -3055,11 +3348,25 @@
;;
esac
;;
@@ -2077,7 +2173,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3092,9 +3321,9 @@
+@@ -3070,9 +3377,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -2089,7 +2185,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3103,16 +3332,16 @@
+@@ -3081,16 +3388,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -2110,7 +2206,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -3130,20 +3359,44 @@
+@@ -3108,20 +3415,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2143,7 +2239,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -2161,7 +2257,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3159,6 +3412,29 @@
+@@ -3137,6 +3468,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -2191,7 +2287,7 @@
esac
;;
lynxos*)
-@@ -3171,7 +3447,7 @@
+@@ -3149,7 +3503,7 @@
;;
mvs*)
case $cc_basename in
@@ -2200,7 +2296,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3181,7 +3457,7 @@
+@@ -3159,7 +3513,7 @@
;;
esac
;;
@@ -2209,7 +2305,7 @@
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=
-@@ -3192,15 +3468,35 @@
+@@ -3170,15 +3524,35 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -2247,7 +2343,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3210,14 +3506,14 @@
+@@ -3188,14 +3562,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2265,7 +2361,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3531,7 @@
+@@ -3213,7 +3587,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2274,7 +2370,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3254,13 +3550,13 @@
+@@ -3232,13 +3606,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2290,7 +2386,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3269,17 +3565,17 @@
+@@ -3247,17 +3621,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2312,7 +2408,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3594,7 @@
+@@ -3276,7 +3650,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2321,7 +2417,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3319,27 +3615,14 @@
+@@ -3297,27 +3671,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2351,7 +2447,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3352,36 +3635,28 @@
+@@ -3330,36 +3691,28 @@
;;
solaris*)
case $cc_basename in
@@ -2397,7 +2493,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3389,9 +3664,9 @@
+@@ -3367,9 +3720,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2409,7 +2505,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3401,9 +3676,9 @@
+@@ -3379,9 +3732,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2421,7 +2517,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3687,9 @@
+@@ -3390,9 +3743,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2433,7 +2529,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3423,16 +3698,73 @@
+@@ -3401,16 +3754,73 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -2509,7 +2605,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3469,8 +3801,6 @@
+@@ -3447,8 +3857,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2518,7 +2614,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3488,7 +3818,7 @@
+@@ -3466,12 +3874,13 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2527,7 +2623,14 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -3542,7 +3872,7 @@
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -3520,7 +3929,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2536,7 +2639,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3582,7 +3912,7 @@
+@@ -3560,7 +3969,7 @@
fi
;;
@@ -2545,10 +2648,15 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3618,13 +3948,70 @@
+@@ -3596,13 +4005,74 @@
$rm -f confest.$objext
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
@@ -2605,7 +2713,6 @@
+ ;;
+esac
+])
-+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -2617,7 +2724,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3660,20 +4047,31 @@
+@@ -3638,20 +4108,31 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2652,7 +2759,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3683,7 +4081,7 @@
+@@ -3661,7 +4142,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2661,20 +2768,20 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3691,8 +4089,10 @@
+@@ -3669,8 +4150,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
- test "$enable_shared" = yes && enable_static=no
-+aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3702,8 +4102,6 @@
+@@ -3680,8 +4163,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2683,7 +2790,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3713,8 +4111,6 @@
+@@ -3691,8 +4172,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2692,7 +2799,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3740,23 +4136,30 @@
+@@ -3718,23 +4197,30 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2725,7 +2832,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -3768,8 +4171,6 @@
+@@ -3746,8 +4232,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2734,7 +2841,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3779,7 +4180,7 @@
+@@ -3757,7 +4241,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2743,7 +2850,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3795,7 +4196,7 @@
+@@ -3773,7 +4257,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2752,7 +2859,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -3803,11 +4204,16 @@
+@@ -3781,11 +4265,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2769,7 +2876,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3833,11 +4239,12 @@
+@@ -3811,11 +4300,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2784,7 +2891,15 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -3878,6 +4285,7 @@
+@@ -3841,6 +4331,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -3856,6 +4347,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -2792,7 +2907,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -3887,7 +4295,7 @@
+@@ -3865,7 +4357,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2801,16 +2916,16 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3924,7 +4332,7 @@
+@@ -3902,7 +4394,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -3953,11 +4361,11 @@
+@@ -3931,11 +4423,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2824,7 +2939,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3988,6 +4396,12 @@
+@@ -3966,6 +4458,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2837,7 +2952,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3999,6 +4413,9 @@
+@@ -3977,6 +4475,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2847,7 +2962,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -4018,7 +4435,7 @@
+@@ -3996,7 +4497,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2856,7 +2971,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4466,7 @@
+@@ -4027,7 +4528,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2865,7 +2980,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4064,7 +4481,7 @@
+@@ -4042,7 +4543,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2874,7 +2989,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4240,7 +4657,7 @@
+@@ -4130,6 +4631,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4218,7 +4723,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2883,7 +3009,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4293,7 +4710,10 @@
+@@ -4271,7 +4776,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -2895,7 +3021,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4320,6 +4740,7 @@
+@@ -4298,6 +4806,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -2903,7 +3029,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4335,9 +4756,6 @@
+@@ -4313,9 +4822,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2913,7 +3039,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -4359,14 +4777,30 @@
+@@ -4337,14 +4843,30 @@
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'"
;;
@@ -2946,7 +3072,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4384,14 +4818,17 @@
+@@ -4362,14 +4884,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2966,7 +3092,16 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4530,12 +4967,14 @@
+@@ -4459,7 +4984,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4508,13 +5033,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2978,12 +3113,15 @@
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
-@@ -4547,6 +4986,10 @@
+ # PIC is the default on this platform
+@@ -4525,6 +5053,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2994,7 +3132,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4555,7 +4998,7 @@
+@@ -4533,7 +5065,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3003,7 +3141,16 @@
hppa*64*|ia64*)
;;
*)
-@@ -4580,18 +5023,28 @@
+@@ -4547,7 +5079,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -4558,18 +5090,28 @@
;;
chorus*)
case $cc_basename in
@@ -3035,11 +3182,11 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4599,22 +5052,22 @@
+@@ -4577,22 +5119,22 @@
;;
esac
;;
-- freebsd* | kfreebsd*-gnu)
+- freebsd*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -3064,7 +3211,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4627,9 +5080,13 @@
+@@ -4605,9 +5147,13 @@
;;
esac
;;
@@ -3079,7 +3226,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -4638,20 +5095,26 @@
+@@ -4616,20 +5162,26 @@
;;
esac
;;
@@ -3101,7 +3248,7 @@
- ;;
- cxx)
+ ;;
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -3111,7 +3258,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4659,6 +5122,14 @@
+@@ -4637,6 +5189,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -3126,7 +3273,7 @@
;;
esac
;;
-@@ -4668,25 +5139,25 @@
+@@ -4646,25 +5206,25 @@
;;
mvs*)
case $cc_basename in
@@ -3157,7 +3304,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4700,24 +5171,15 @@
+@@ -4678,24 +5238,15 @@
;;
psos*)
;;
@@ -3184,7 +3331,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4727,12 +5189,12 @@
+@@ -4705,12 +5256,12 @@
;;
sunos4*)
case $cc_basename in
@@ -3199,7 +3346,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4742,7 +5204,7 @@
+@@ -4720,7 +5271,7 @@
;;
tandem*)
case $cc_basename in
@@ -3208,7 +3355,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4750,7 +5212,14 @@
+@@ -4728,7 +5279,14 @@
;;
esac
;;
@@ -3224,7 +3371,7 @@
;;
vxworks*)
;;
-@@ -4781,13 +5250,15 @@
+@@ -4759,14 +5317,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3237,12 +3384,15 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
-@@ -4797,6 +5268,11 @@
+ darwin* | rhapsody*)
+@@ -4775,6 +5336,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -3254,7 +3404,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4813,7 +5289,7 @@
+@@ -4791,7 +5357,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3263,7 +3413,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4839,8 +5315,18 @@
+@@ -4817,18 +5383,29 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -3282,8 +3432,12 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -4850,7 +5336,7 @@
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3292,7 +3446,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4873,18 +5359,41 @@
+@@ -4851,18 +5428,41 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3336,7 +3490,7 @@
esac
;;
-@@ -4894,15 +5403,19 @@
+@@ -4872,15 +5472,19 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3360,7 +3514,7 @@
;;
sunos4*)
-@@ -4911,7 +5424,7 @@
+@@ -4889,7 +5493,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3369,7 +3523,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4924,6 +5437,17 @@
+@@ -4902,6 +5506,17 @@
fi
;;
@@ -3387,7 +3541,16 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4951,7 +5475,7 @@
+@@ -4920,7 +5535,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -4929,7 +5544,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3396,7 +3559,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4960,6 +5484,16 @@
+@@ -4938,6 +5553,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3406,14 +3569,14 @@
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
])
-@@ -4967,7 +5501,8 @@
+@@ -4945,11 +5570,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -3423,7 +3586,12 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -4984,7 +5519,10 @@
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -4962,12 +5588,16 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3435,7 +3603,13 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -5010,7 +5548,7 @@
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -4988,7 +5618,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3444,9 +3618,19 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -5027,7 +5565,8 @@
+@@ -4998,14 +5628,17 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
-
+ # Just being paranoid about ensuring that cc_basename is set.
@@ -3454,7 +3638,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5037,6 +5576,10 @@
+@@ -5015,6 +5648,10 @@
with_gnu_ld=no
fi
;;
@@ -3465,7 +3649,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5047,6 +5590,27 @@
+@@ -5025,9 +5662,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3492,8 +3676,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -5084,7 +5648,7 @@
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5062,7 +5720,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3502,7 +3690,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5094,13 +5658,13 @@
+@@ -5072,13 +5730,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3519,7 +3707,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5109,23 +5673,79 @@
+@@ -5087,23 +5745,79 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3605,7 +3793,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -5139,13 +5759,40 @@
+@@ -5117,13 +5831,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3648,7 +3836,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5155,24 +5802,19 @@
+@@ -5133,24 +5874,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3680,7 +3868,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5184,7 +5826,7 @@
+@@ -5162,14 +5898,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3689,7 +3877,15 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5206,9 +5848,21 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5184,9 +5920,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3698,7 +3894,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
@@ -3713,7 +3909,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5225,7 +5879,7 @@
+@@ -5203,7 +5951,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3722,7 +3918,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -5233,7 +5887,7 @@
+@@ -5211,7 +5959,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3731,7 +3927,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5244,8 +5898,12 @@
+@@ -5222,8 +5970,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3744,7 +3940,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5253,30 +5911,30 @@
+@@ -5231,30 +5983,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3786,7 +3982,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5285,13 +5943,11 @@
+@@ -5263,13 +6015,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3803,7 +3999,7 @@
fi
fi
;;
-@@ -5304,7 +5960,7 @@
+@@ -5282,7 +6032,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3812,7 +4008,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5314,69 +5970,69 @@
+@@ -5292,58 +6042,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3841,21 +4037,10 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-- ;;
-- esac
-- fi
+- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
@@ -3906,11 +4091,10 @@
- fi
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
@@ -3929,18 +4113,18 @@
;;
dgux*)
-@@ -5409,8 +6065,8 @@
+@@ -5376,8 +6136,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
+- freebsd*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
+ 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
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5418,7 +6074,7 @@
+@@ -5385,7 +6145,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3949,7 +4133,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -5432,47 +6088,62 @@
+@@ -5399,47 +6159,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -4036,7 +4220,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5486,7 +6157,7 @@
+@@ -5453,7 +6228,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4045,7 +4229,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -5496,7 +6167,7 @@
+@@ -5463,7 +6238,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -4054,7 +4238,7 @@
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
-@@ -5516,23 +6187,28 @@
+@@ -5483,23 +6258,28 @@
;;
openbsd*)
@@ -4099,7 +4283,7 @@
fi
;;
-@@ -5540,14 +6216,14 @@
+@@ -5507,14 +6287,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -4116,7 +4300,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -5559,13 +6235,13 @@
+@@ -5526,13 +6306,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -4132,7 +4316,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5573,21 +6249,15 @@
+@@ -5540,21 +6320,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -4158,7 +4342,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5596,8 +6266,17 @@
+@@ -5563,8 +6337,17 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -4178,7 +4362,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5606,7 +6285,7 @@
+@@ -5573,7 +6356,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -4187,7 +4371,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5654,36 +6333,45 @@
+@@ -5621,36 +6404,45 @@
fi
;;
@@ -4254,7 +4438,7 @@
;;
uts4*)
-@@ -5701,11 +6389,6 @@
+@@ -5668,11 +6460,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -4266,7 +4450,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5725,14 +6408,15 @@
+@@ -5692,14 +6479,15 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -4284,7 +4468,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5827,6 +6511,30 @@
+@@ -5794,6 +6582,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -4315,7 +4499,7 @@
############################################################
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
-@@ -5849,18 +6557,19 @@
+@@ -5816,18 +6628,19 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4337,7 +4521,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -5887,5 +6596,6 @@
+@@ -5854,5 +6667,6 @@
done
])
SED=$lt_cv_path_SED
@@ -4353,7 +4537,7 @@
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007 Free Software Foundation, Inc.
++# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -4380,8 +4564,8 @@
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION="1.5.24 Debian 1.5.24-2"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
++VERSION="1.5.26 Debian 1.5.26-1"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -4453,7 +4637,7 @@
;;
esac
-@@ -86,20 +113,24 @@
+@@ -86,20 +113,30 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
@@ -4462,15 +4646,20 @@
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
--fi
-+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+done
++
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
# Make sure IFS has a sensible default
-: ${IFS=" "}
@@ -4486,7 +4675,7 @@
fi
# Global variables.
-@@ -111,17 +142,62 @@
+@@ -111,17 +148,62 @@
show="$echo"
show_help=
execute_dlfiles=
@@ -4550,7 +4739,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +206,22 @@
+@@ -130,17 +212,22 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -4581,7 +4770,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +235,191 @@
+@@ -154,9 +241,191 @@
$echo $win32_libid_type
}
@@ -4773,7 +4962,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +439,13 @@
+@@ -176,12 +445,13 @@
;;
tag)
tagname="$arg"
@@ -4788,7 +4977,7 @@
;;
esac
-@@ -191,10 +455,10 @@
+@@ -191,10 +461,10 @@
# not specially marked.
;;
*)
@@ -4801,7 +4990,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -218,26 +482,28 @@
+@@ -218,26 +488,28 @@
;;
--version)
@@ -4814,7 +5003,7 @@
+ echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
-+Copyright (C) 2007 Free Software Foundation, Inc.
++Copyright (C) 2008 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."
+ exit $?
@@ -4839,7 +5028,7 @@
;;
--dry-run | -n)
-@@ -256,7 +522,7 @@
+@@ -256,7 +528,7 @@
else
$echo "disable static libraries"
fi
@@ -4848,7 +5037,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +534,19 @@
+@@ -268,13 +540,19 @@
--quiet | --silent)
show=:
@@ -4869,7 +5058,7 @@
;;
-dlopen)
-@@ -285,7 +557,7 @@
+@@ -285,7 +563,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4878,7 +5067,7 @@
;;
*)
-@@ -298,9 +570,21 @@
+@@ -298,9 +576,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4901,7 +5090,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +595,7 @@
+@@ -311,7 +601,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4910,7 +5099,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +638,7 @@
+@@ -354,7 +644,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4919,7 +5108,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +653,15 @@
+@@ -369,13 +659,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4936,7 +5125,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +680,19 @@
+@@ -394,24 +686,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4949,16 +5138,16 @@
- -static)
- build_old_libs=yes
+- continue
+- ;;
+-
+- -prefer-pic)
+- pic_mode=yes
+ -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
continue
;;
-- -prefer-pic)
-- pic_mode=yes
-- continue
-- ;;
--
- -prefer-non-pic)
- pic_mode=no
+ -no-suppress)
@@ -4966,7 +5155,7 @@
continue
;;
-@@ -424,7 +705,7 @@
+@@ -424,7 +711,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4975,7 +5164,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +743,10 @@
+@@ -462,7 +749,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4987,7 +5176,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +758,11 @@
+@@ -474,11 +764,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -5001,7 +5190,7 @@
;;
*)
# Get the name of the library object.
-@@ -500,9 +784,10 @@
+@@ -500,9 +790,11 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -5010,10 +5199,11 @@
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -511,51 +796,39 @@
+@@ -511,51 +803,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -5092,7 +5282,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +841,7 @@
+@@ -568,7 +848,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -5101,7 +5291,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +852,7 @@
+@@ -579,7 +859,7 @@
fi
$run $rm $removelist
@@ -5110,7 +5300,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +871,7 @@
+@@ -598,7 +878,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -5119,7 +5309,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +881,7 @@
+@@ -608,7 +888,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -5128,7 +5318,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +899,19 @@
+@@ -626,14 +906,19 @@
compiler."
$run $rm $removelist
@@ -5150,7 +5340,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +933,18 @@
+@@ -655,18 +940,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -5174,8 +5364,12 @@
fi
fi
-@@ -681,7 +959,7 @@
- if $run eval "$command"; then :
+@@ -678,10 +963,10 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
- exit 1
@@ -5183,7 +5377,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +979,7 @@
+@@ -701,7 +986,7 @@
compiler."
$run $rm $removelist
@@ -5192,7 +5386,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +1000,9 @@
+@@ -722,7 +1007,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -5203,7 +5397,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +1016,9 @@
+@@ -736,9 +1023,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -5215,8 +5409,12 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1031,7 @@
- if $run eval "$command"; then :
+@@ -748,10 +1035,10 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
- exit 1
@@ -5224,7 +5422,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1051,7 @@
+@@ -771,7 +1058,7 @@
compiler."
$run $rm $removelist
@@ -5233,7 +5431,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1089,7 @@
+@@ -809,7 +1096,7 @@
$run $rm "$lockfile"
fi
@@ -5242,7 +5440,7 @@
;;
# libtool link mode
-@@ -835,7 +1115,7 @@
+@@ -835,7 +1122,7 @@
;;
esac
libtool_args="$nonopt"
@@ -5251,7 +5449,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1127,6 @@
+@@ -847,7 +1134,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -5259,7 +5457,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1147,8 @@
+@@ -868,6 +1154,8 @@
no_install=no
objs=
non_pic_objects=
@@ -5268,12 +5466,14 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,26 +1162,38 @@
+@@ -880,27 +1168,40 @@
+ thread_safe=no
vinfo=
vinfo_number=no
++ single_module="${wl}-single_module"
++
++ func_infer_tag $base_compile
-+ func_infer_tag $base_compile
-+
# We need to know -static, to get the right output filenames.
for arg
do
@@ -5312,7 +5512,7 @@
break
;;
esac
-@@ -912,7 +1205,6 @@
+@@ -912,7 +1213,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -5320,7 +5520,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1268,7 @@
+@@ -976,7 +1276,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -5329,7 +5529,7 @@
fi
prev=
continue
-@@ -991,6 +1283,11 @@
+@@ -991,6 +1291,11 @@
prev=
continue
;;
@@ -5341,7 +5541,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1320,7 @@
+@@ -1023,7 +1328,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5350,7 +5550,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1368,17 @@
+@@ -1071,12 +1376,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5369,7 +5569,7 @@
else
# Dry-run case.
-@@ -1097,7 +1399,7 @@
+@@ -1097,7 +1407,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -5378,7 +5578,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1411,7 @@
+@@ -1109,7 +1419,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5387,7 +5587,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1451,15 @@
+@@ -1149,16 +1459,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -5413,7 +5613,7 @@
prev=
continue
;;
-@@ -1210,7 +1511,7 @@
+@@ -1210,7 +1519,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -5422,7 +5622,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1521,18 @@
+@@ -1220,6 +1529,18 @@
continue
;;
@@ -5441,7 +5641,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1559,8 @@
+@@ -1246,7 +1567,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -5451,7 +5651,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1574,15 @@
+@@ -1260,10 +1582,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -5467,7 +5667,7 @@
;;
esac
continue
-@@ -1272,26 +1591,35 @@
+@@ -1272,32 +1599,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -5476,6 +5676,9 @@
# These systems don't actually have a C or math library (as such)
continue
;;
+- *-*-freebsd*-gnu*)
+- # prevent being parsed by the freebsd regexp below
+- ;;
- *-*-mingw* | *-*-os2*)
+ *-*-os2*)
# These systems don't actually have a C library (as such)
@@ -5503,12 +5706,15 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
+- *-*-freebsd*-gnu*)
+- # prevent being parsed by the freebsd regexp below
+- ;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1301,18 +1629,42 @@
+@@ -1307,18 +1637,47 @@
continue
;;
@@ -5529,6 +5735,11 @@
+ continue
+ ;;
+
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
-module)
module=yes
continue
@@ -5558,7 +5769,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1675,7 @@
+@@ -1329,9 +1688,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -5569,7 +5780,7 @@
continue
;;
-@@ -1341,9 +1691,9 @@
+@@ -1347,9 +1704,9 @@
-no-install)
case $host in
@@ -5581,7 +5792,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1365,6 +1715,11 @@
+@@ -1371,6 +1728,11 @@
-o) prev=output ;;
@@ -5593,7 +5804,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1742,7 @@
+@@ -1393,7 +1755,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5602,7 +5813,7 @@
;;
esac
case "$xrpath " in
-@@ -1397,7 +1752,7 @@
+@@ -1403,7 +1765,7 @@
continue
;;
@@ -5611,7 +5822,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -1473,11 +1828,6 @@
+@@ -1479,11 +1841,6 @@
continue
;;
@@ -5623,7 +5834,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1838,6 @@
+@@ -1494,7 +1851,6 @@
arg="\"$arg\""
;;
esac
@@ -5631,7 +5842,7 @@
;;
*.$objext)
-@@ -1516,7 +1865,7 @@
+@@ -1522,7 +1878,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5640,7 +5851,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1564,12 +1913,17 @@
+@@ -1570,12 +1926,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5659,7 +5870,7 @@
else
# Dry-run case.
-@@ -1623,7 +1977,6 @@
+@@ -1629,7 +1990,6 @@
arg="\"$arg\""
;;
esac
@@ -5667,7 +5878,7 @@
;;
esac # arg
-@@ -1637,48 +1990,7 @@
+@@ -1643,48 +2003,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5717,7 +5928,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +2023,9 @@
+@@ -1717,9 +2036,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5730,7 +5941,7 @@
fi
fi
-@@ -1722,7 +2034,7 @@
+@@ -1728,7 +2047,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5739,7 +5950,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2044,7 @@
+@@ -1738,7 +2057,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5748,7 +5959,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1776,7 +2088,6 @@
+@@ -1782,7 +2101,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5756,7 +5967,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1785,7 +2096,7 @@
+@@ -1791,7 +2109,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5765,7 +5976,7 @@
;;
esac
done
-@@ -1811,7 +2122,10 @@
+@@ -1817,7 +2135,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5777,7 +5988,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2137,23 @@
+@@ -1829,18 +2150,28 @@
lib=
found=no
case $deplib in
@@ -5800,13 +6011,19 @@
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
- for search_ext in .la $shrext .so .a; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2214,6 @@
+@@ -1901,18 +2232,6 @@
fi
fi
;; # -l
@@ -5825,7 +6042,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2229,11 @@
+@@ -1928,11 +2247,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5838,7 +6055,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2261,22 @@
+@@ -1960,7 +2279,22 @@
fi
case $linkmode in
lib)
@@ -5862,7 +6079,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2326,15 @@
+@@ -2010,15 +2344,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5881,7 +6098,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2350,8 @@
+@@ -2034,6 +2368,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5890,7 +6107,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2359,6 @@
+@@ -2041,13 +2377,6 @@
*) . ./$lib ;;
esac
@@ -5904,7 +6121,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2369,32 @@
+@@ -2058,33 +2387,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5951,7 +6168,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2402,18 @@
+@@ -2092,16 +2420,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5973,7 +6190,7 @@
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
-@@ -2132,11 +2450,19 @@
+@@ -2138,11 +2468,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5997,7 +6214,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2470,7 @@
+@@ -2150,7 +2488,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -6006,7 +6223,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2497,7 @@
+@@ -2177,7 +2515,7 @@
continue
fi
@@ -6015,7 +6232,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2207,14 +2533,16 @@
+@@ -2213,14 +2551,16 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -6035,7 +6252,7 @@
esac
fi
-@@ -2251,24 +2579,29 @@
+@@ -2257,24 +2597,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -6071,7 +6288,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2659,10 @@
+@@ -2332,9 +2677,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6083,7 +6300,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2673,10 @@
+@@ -2345,9 +2691,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6095,7 +6312,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2362,11 +2697,15 @@
+@@ -2368,11 +2715,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -6115,7 +6332,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2713,7 @@
+@@ -2380,7 +2731,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -6124,7 +6341,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2736,9 @@
+@@ -2403,9 +2754,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6136,7 +6353,7 @@
;;
esac
fi
-@@ -2416,7 +2755,7 @@
+@@ -2422,7 +2773,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -6145,7 +6362,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2798,8 @@
+@@ -2465,7 +2816,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6155,7 +6372,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2809,9 @@
+@@ -2475,9 +2827,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6167,7 +6384,7 @@
;;
esac
fi
-@@ -2530,17 +2870,16 @@
+@@ -2536,17 +2888,16 @@
fi
fi
else
@@ -6189,7 +6406,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2893,7 @@
+@@ -2560,7 +2911,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -6198,7 +6415,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2935,18 @@
+@@ -2602,76 +2953,70 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -6221,13 +6438,20 @@
+ # we do not want to link against static libs,
+ # but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2617,55 +2954,45 @@
+ depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
- fi
++ else
++ # Can't find it, oh well...
++ depdepl=
+ fi
# do not add paths which are already there
case " $newlib_search_path " in
@@ -6243,14 +6467,10 @@
- ;;
- esac
-
-+ path="-L$path"
-+ ;;
-+ esac
- ;;
+- ;;
- -l*)
-+ -l*)
- case $host in
- *-*-darwin*)
+- case $host in
+- *-*-darwin*)
- # Again, we only want to link against shared libraries
- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
- for tmp in $newlib_search_path ; do
@@ -6260,6 +6480,20 @@
- fi
- done
- path=""
++ path="-L$path"
+ ;;
+- *) continue ;;
+- esac
++ esac
+ ;;
+-
+- *.ltframework)
++ -l*)
+ case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
++ *-*-darwin*)
+ # Again, we only want to link against shared libraries
+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+ for tmp in $newlib_search_path ; do
@@ -6269,16 +6503,8 @@
+ fi
+ done
+ path=""
- ;;
- *) continue ;;
-- esac
-- ;;
--
-- *.ltframework)
-- case $host in
-- *-*-darwin*)
-- depdepl="$deplib"
-- ;;
++ ;;
++ *) continue ;;
esac
;;
-
@@ -6299,7 +6525,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +3079,8 @@
+@@ -2758,7 +3103,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -6309,7 +6535,21 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3140,19 @@
+@@ -2779,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -2818,19 +3165,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -6332,7 +6572,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3163,7 @@
+@@ -2841,7 +3188,7 @@
if test -n "$objs"; then
if test "$deplibs_check_method" != pass_all; then
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -6341,7 +6581,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3211,13 @@
+@@ -2889,13 +3236,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -6357,7 +6597,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2903,7 +3231,7 @@
+@@ -2909,7 +3256,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
@@ -6366,7 +6606,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -2914,9 +3242,15 @@
+@@ -2920,9 +3267,15 @@
age="0"
;;
irix|nonstopux)
@@ -6383,7 +6623,7 @@
;;
esac
;;
-@@ -2929,36 +3263,36 @@
+@@ -2935,36 +3288,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -6430,7 +6670,7 @@
fi
# Calculate the version variables.
-@@ -2975,6 +3309,7 @@
+@@ -2981,6 +3334,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -6438,7 +6678,7 @@
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
-@@ -2989,8 +3324,11 @@
+@@ -2995,8 +3349,11 @@
;;
irix | nonstopux)
@@ -6452,7 +6692,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3047,7 +3385,7 @@
+@@ -3053,7 +3410,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -6461,12 +6701,8 @@
;;
esac
-@@ -3098,9 +3436,15 @@
- tempremovelist=`$echo "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
-- *.$objext | *$exeext)
-+ *.$objext)
+@@ -3107,6 +3464,12 @@
+ *.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
@@ -6478,7 +6714,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3121,11 +3465,11 @@
+@@ -3127,11 +3490,11 @@
fi
# Eliminate all temporary directories.
@@ -6495,7 +6731,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3137,7 +3481,7 @@
+@@ -3143,7 +3506,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -6504,7 +6740,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,14 +3514,19 @@
+@@ -3176,20 +3539,19 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -6514,6 +6750,12 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+- *-*-freebsd*-gnu*)
+- # Prevent $arg from being parsed by the freebsd regexp below.
+- if test "$build_libtool_need_lc" = "yes"; then
+- deplibs="$deplibs -lc"
+- fi
+- ;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
@@ -6527,7 +6769,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3221,13 +3570,12 @@
+@@ -3233,13 +3595,12 @@
int main() { return 0; }
EOF
$rm conftest
@@ -6544,7 +6786,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3262,13 +3610,11 @@
+@@ -3274,13 +3635,11 @@
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
@@ -6560,7 +6802,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3300,7 +3646,7 @@
+@@ -3312,7 +3671,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -6569,7 +6811,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3314,7 +3660,7 @@
+@@ -3326,7 +3685,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6578,7 +6820,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3383,7 +3729,7 @@
+@@ -3395,7 +3754,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6587,7 +6829,7 @@
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3463,7 +3809,7 @@
+@@ -3475,7 +3834,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6596,7 +6838,7 @@
;;
esac
-@@ -3509,17 +3855,39 @@
+@@ -3521,17 +3880,39 @@
fi
fi
fi
@@ -6643,7 +6885,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3532,7 +3900,7 @@
+@@ -3544,7 +3925,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -6652,7 +6894,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3564,7 +3932,10 @@
+@@ -3576,7 +3957,10 @@
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -6664,7 +6906,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -3587,7 +3958,7 @@
+@@ -3599,7 +3983,7 @@
fi
# Get the real and link names of the library.
@@ -6673,7 +6915,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3603,6 +3974,7 @@
+@@ -3615,6 +3999,7 @@
fi
lib="$output_objdir/$realname"
@@ -6681,7 +6923,7 @@
for link
do
linknames="$linknames $link"
-@@ -3617,10 +3989,11 @@
+@@ -3629,10 +4014,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -6694,7 +6936,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +4003,9 @@
+@@ -3642,6 +4028,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -6704,7 +6946,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +4026,12 @@
+@@ -3662,12 +4051,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6719,7 +6961,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +4039,13 @@
+@@ -3675,67 +4064,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6790,7 +7032,7 @@
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linker_flags="$linker_flags $flag"
-@@ -3734,31 +4056,27 @@
+@@ -3746,31 +4081,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6832,7 +7074,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +4095,7 @@
+@@ -3789,6 +4120,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -6840,7 +7082,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +4105,13 @@
+@@ -3798,13 +4130,13 @@
delfiles=
last_robj=
k=1
@@ -6856,7 +7098,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +4125,9 @@
+@@ -3818,9 +4150,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6868,7 +7110,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +4147,13 @@
+@@ -3840,13 +4172,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6884,7 +7126,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4178,54 @@
+@@ -3871,28 +4203,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6944,7 +7186,21 @@
fi
# Create links to the real library.
-@@ -3928,7 +4273,7 @@
+@@ -3912,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -3940,7 +4299,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6953,7 +7209,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3949,72 +4294,20 @@
+@@ -3961,72 +4320,20 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -7032,7 +7288,7 @@
fi
fi
-@@ -4022,10 +4315,11 @@
+@@ -4034,10 +4341,11 @@
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
@@ -7045,7 +7301,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4332,7 @@
+@@ -4050,7 +4358,7 @@
$run ${rm}r $gentop
fi
@@ -7054,7 +7310,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4345,18 @@
+@@ -4063,17 +4371,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -7075,7 +7331,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4368,7 @@
+@@ -4085,7 +4394,7 @@
$run ${rm}r $gentop
fi
@@ -7084,7 +7340,7 @@
;;
prog)
-@@ -4098,24 +4393,50 @@
+@@ -4110,24 +4419,50 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -7141,7 +7397,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4160,10 +4481,15 @@
+@@ -4172,10 +4507,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -7157,7 +7413,7 @@
;;
esac
done
-@@ -4277,13 +4603,25 @@
+@@ -4289,13 +4629,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -7187,7 +7443,7 @@
fi
fi
-@@ -4334,7 +4672,26 @@
+@@ -4346,7 +4698,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -7214,7 +7470,7 @@
const char *name;
lt_ptr address;
}
-@@ -4381,20 +4738,33 @@
+@@ -4393,20 +4764,33 @@
esac
# Now compile the dynamic symbol file.
@@ -7253,7 +7509,7 @@
;;
esac
else
-@@ -4403,30 +4773,19 @@
+@@ -4415,30 +4799,19 @@
# really was required.
# Nullify the symbol file.
@@ -7288,7 +7544,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4434,7 +4793,7 @@
+@@ -4446,7 +4819,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -7297,7 +7553,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4493,7 +4852,7 @@
+@@ -4505,7 +4878,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -7306,7 +7562,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4507,7 +4866,7 @@
+@@ -4519,7 +4892,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -7315,7 +7571,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4544,14 +4903,14 @@
+@@ -4556,14 +4929,14 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -7335,16 +7591,14 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4932,13 @@
- *) exeext= ;;
+@@ -4586,10 +4959,12 @@
esac
case $host in
-- *mingw* )
-- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+ *cygwin* | *mingw* )
+- cwrappersource=`$echo ${objdir}/lt-${output}.c`
- cwrapper=`$echo ${output}.exe`
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-+ *cygwin* | *mingw* )
+ output_name=`basename $output`
+ output_path=`dirname $output`
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
@@ -7354,7 +7608,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4947,7 @@
+@@ -4598,7 +4973,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -7363,7 +7617,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4602,6 +4963,9 @@
+@@ -4614,6 +4989,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -7373,7 +7627,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4976,19 @@
+@@ -4624,15 +5002,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -7398,7 +7652,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4998,32 @@
+@@ -4642,17 +5024,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -7433,7 +7687,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4649,30 +5032,52 @@
+@@ -4661,30 +5058,52 @@
{
char **newargz;
int i;
@@ -7495,7 +7749,7 @@
}
void *
-@@ -4685,59 +5090,159 @@
+@@ -4697,59 +5116,159 @@
return p;
}
@@ -7677,7 +7931,7 @@
{
size_t len, patlen;
-@@ -4757,7 +5262,7 @@
+@@ -4769,7 +5288,7 @@
}
static void
@@ -7686,7 +7940,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5282,16 @@
+@@ -4789,16 +5308,16 @@
va_end (ap);
}
EOF
@@ -7713,7 +7967,7 @@
$echo > $output "\
#! $SHELL
-@@ -4805,9 +5310,23 @@
+@@ -4817,9 +5336,23 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -7738,7 +7992,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5405,7 @@
+@@ -4898,7 +5431,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -7747,7 +8001,7 @@
fi
fi
-@@ -4936,34 +5455,32 @@
+@@ -4948,34 +5481,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -7789,7 +8043,7 @@
;;
esac
-@@ -4986,78 +5503,78 @@
+@@ -4998,78 +5529,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7929,7 +8183,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5583,18 @@
+@@ -5078,31 +5609,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7964,7 +8218,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5602,7 @@
+@@ -5110,7 +5628,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7973,7 +8227,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5613,13 @@
+@@ -5121,12 +5639,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7988,7 +8242,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5651,13 @@
+@@ -5158,11 +5677,13 @@
fi
done
# Quote the link command for shipping.
@@ -8006,7 +8260,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5675,7 @@
+@@ -5180,7 +5701,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -8015,7 +8269,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5689,7 @@
+@@ -5194,7 +5715,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8024,7 +8278,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5700,30 @@
+@@ -5205,11 +5726,30 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8056,7 +8310,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5767,7 @@
+@@ -5253,7 +5793,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -8065,7 +8319,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5780,7 @@
+@@ -5266,7 +5806,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -8074,7 +8328,7 @@
;;
# libtool install mode
-@@ -5265,11 +5791,11 @@
+@@ -5277,11 +5817,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -8088,7 +8342,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5804,14 @@
+@@ -5290,14 +5830,14 @@
shift
else
install_prog=
@@ -8105,7 +8359,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5829,31 @@
+@@ -5315,28 +5855,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -8145,7 +8399,7 @@
continue
fi
;;
-@@ -5333,7 +5862,7 @@
+@@ -5345,7 +5888,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -8154,7 +8408,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5872,13 @@
+@@ -5355,13 +5898,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -8170,7 +8424,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5888,7 @@
+@@ -5371,7 +5914,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -8179,7 +8433,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5909,7 @@
+@@ -5392,7 +5935,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -8188,7 +8442,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5921,7 @@
+@@ -5404,7 +5947,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -8197,7 +8451,7 @@
;;
esac
done
-@@ -5421,7 +5950,7 @@
+@@ -5433,7 +5976,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8206,7 +8460,7 @@
fi
library_names=
-@@ -5463,14 +5992,14 @@
+@@ -5475,14 +6018,14 @@
# but it's something to keep an eye on.
if test "$inst_prefix_dir" = "$destdir"; then
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -8224,7 +8478,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -5478,7 +6007,7 @@
+@@ -5490,7 +6033,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -8233,7 +8487,7 @@
fi
fi
-@@ -5502,23 +6031,36 @@
+@@ -5514,23 +6057,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -8274,7 +8528,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +6098,7 @@
+@@ -5568,7 +6124,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -8283,7 +8537,7 @@
;;
esac
-@@ -5574,7 +6116,7 @@
+@@ -5586,7 +6142,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -8292,7 +8546,7 @@
;;
*)
-@@ -5612,23 +6154,21 @@
+@@ -5624,23 +6180,21 @@
notinst_deplibs=
relink_command=
@@ -8325,7 +8579,7 @@
fi
finalize=yes
-@@ -5650,34 +6190,25 @@
+@@ -5662,34 +6216,25 @@
done
relink_command=
@@ -8370,7 +8624,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -5697,7 +6228,7 @@
+@@ -5709,7 +6254,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -8379,7 +8633,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +6260,17 @@
+@@ -5741,16 +6286,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -8399,7 +8653,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +6284,9 @@
+@@ -5764,9 +6310,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -8411,7 +8665,7 @@
fi
;;
-@@ -5773,10 +6305,11 @@
+@@ -5785,10 +6331,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -8424,7 +8678,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,9 +6326,9 @@
+@@ -5805,9 +6352,9 @@
fi
# Exit here if they wanted silent mode.
@@ -8436,7 +8690,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5828,8 +6361,8 @@
+@@ -5840,8 +6387,8 @@
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -8447,7 +8701,7 @@
;;
# libtool execute mode
-@@ -5841,7 +6374,7 @@
+@@ -5853,7 +6400,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -8456,7 +8710,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +6382,7 @@
+@@ -5861,7 +6408,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -8465,7 +8719,7 @@
fi
dir=
-@@ -5860,7 +6393,7 @@
+@@ -5872,7 +6419,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8474,7 +8728,7 @@
fi
# Read the libtool library.
-@@ -5886,8 +6419,10 @@
+@@ -5898,8 +6445,10 @@
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -8487,7 +8741,7 @@
fi
;;
-@@ -5951,12 +6486,12 @@
+@@ -5963,12 +6512,12 @@
fi
# Restore saved environment variables
@@ -8497,7 +8751,7 @@
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
-+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
@@ -8506,7 +8760,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -5967,7 +6502,7 @@
+@@ -5979,7 +6528,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -8515,7 +8769,7 @@
fi
;;
-@@ -5995,7 +6530,7 @@
+@@ -6007,7 +6556,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -8524,7 +8778,7 @@
fi
rmdirs=
-@@ -6045,15 +6580,24 @@
+@@ -6057,15 +6606,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -8552,7 +8806,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6609,11 @@
+@@ -6077,10 +6635,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -8565,7 +8819,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6623,8 @@
+@@ -6090,7 +6649,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -8575,7 +8829,7 @@
fi
;;
-@@ -6107,7 +6653,7 @@
+@@ -6119,7 +6679,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -8584,7 +8838,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6698,20 @@
+@@ -6164,20 +6724,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -8608,7 +8862,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6747,7 @@
+@@ -6213,7 +6773,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -8617,7 +8871,7 @@
;;
clean)
-@@ -6302,9 +6848,9 @@
+@@ -6314,9 +6874,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -8629,7 +8883,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6313,12 +6859,16 @@
+@@ -6325,12 +6885,16 @@
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-objectlist FILE Use a list of object files found in FILE to specify objects
@@ -8648,7 +8902,7 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -6354,14 +6904,14 @@
+@@ -6366,14 +6930,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -8665,7 +8919,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6375,12 +6925,11 @@
+@@ -6387,12 +6951,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Modified: kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/patches/05_pedantic-errors.diff 2008-03-01 15:12:00 UTC (rev 9486)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -2168,9 +2168,6 @@
+@@ -2135,9 +2135,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
Modified: kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff 2008-03-01 15:03:38 UTC (rev 9485)
+++ kde-extras/taskjuggler/trunk/debian/patches/06_disable_no_undefined.diff 2008-03-01 15:12:00 UTC (rev 9486)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -1713,15 +1713,6 @@
+@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
Modified: kde-extras/taskjuggler/trunk/debian/patches/98_buildprep.diff
===================================================================
Modified: kde-extras/taskjuggler/trunk/debian/patches/series
===================================================================
More information about the pkg-kde-commits
mailing list