[Pkg-kde-commits] rev 2204 -
trunk/packages/koffice/debian/common-patches
Isaac Clerencia
isaac at costa.debian.org
Fri Nov 11 16:14:23 UTC 2005
Author: isaac
Date: 2005-11-11 16:14:22 +0000 (Fri, 11 Nov 2005)
New Revision: 2204
Modified:
trunk/packages/koffice/debian/common-patches/02_autotools_update.diff
trunk/packages/koffice/debian/common-patches/03_libtool_update.diff
trunk/packages/koffice/debian/common-patches/07_disable-visibility.diff
Log:
Update patch to work with koffice admin/
Modified: trunk/packages/koffice/debian/common-patches/02_autotools_update.diff
===================================================================
--- trunk/packages/koffice/debian/common-patches/02_autotools_update.diff 2005-11-11 16:07:20 UTC (rev 2203)
+++ trunk/packages/koffice/debian/common-patches/02_autotools_update.diff 2005-11-11 16:14:22 UTC (rev 2204)
@@ -1,22 +1,1985 @@
+diff -Nrua a/admin/compile b/admin/compile
+--- a/admin/compile 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/compile 2005-11-11 17:13:04.000000000 +0100
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-# 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
+@@ -17,83 +18,125 @@
+ #
+ # 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.
+
+ # 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:
+-# 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
+
+ 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:
diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp 2005-07-06 17:21:25.000000000 -0400
-+++ b/admin/depcomp 2005-10-28 15:11:00.000000000 -0400
-@@ -1,7 +1,7 @@
+--- a/admin/depcomp 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/depcomp 2005-11-11 17:13:04.000000000 +0100
+@@ -1,7 +1,9 @@
#! /bin/sh
+-
# depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2005-05-14.22
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
+scriptversion=2005-07-09.11
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -15,8 +17,8 @@
-@@ -467,7 +467,8 @@
- done
+ # 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.
- "$@" -E |
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -25,13 +27,45 @@
+
+ # 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'.
+
+-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"
+@@ -163,19 +197,25 @@
+
+ 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/'`
++ # 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.
++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
+- outname="$stripped.o"
+ if test "$libtool" = yes; then
+ "$@" -Wc,-M
+ else
+ "$@" -M
+ fi
+-
+ stat=$?
++
++ if test -f "$tmpdepfile"; then :
++ else
++ stripped=`echo "$stripped" | sed 's,^.*/,,'`
++ tmpdepfile="$stripped.u"
++ fi
++
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+@@ -183,6 +223,7 @@
+ fi
+
+ if test -f "$tmpdepfile"; then
++ outname="$stripped.o"
+ # 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:'.
+@@ -198,11 +239,9 @@
+ ;;
+
+ icc)
+- # Must come before tru64.
+-
+- # 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 +249,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 +264,70 @@
+ 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"
+ ;;
+
+ 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$//'`
+
+- 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 mecanism 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 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
+
+ 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 +340,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 $?
++
++ # 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
+- "$@" $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 +393,40 @@
+ ;;
+
+ 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 +436,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 +479,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 +519,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:
+diff -Nrua a/admin/install-sh b/admin/install-sh
+--- a/admin/install-sh 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/install-sh 2005-11-11 17:13:04.000000000 +0100
+@@ -1,19 +1,38 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2005-05-14.22
++
++# 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.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# 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.
+ #
+-# 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.
++# 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.
++#
++#
++# 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
+@@ -23,13 +42,11 @@
+ # from scratch. It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+
+-
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+
+ mvprog="${MVPROG-mv}"
+@@ -41,236 +58,266 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ 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;;
+-
+- *) 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=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c (ignored)
++-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.
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -c) shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit $?;;
++
++ -m) chmodcmd="$chmodprog $2"
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
+
+-if [ x"$src" = x ]
+-then
+- echo "$0: no input file specified" >&2
+- exit 1
+-else
+- :
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d "$dst" ]; then
+- instcmd=:
+- chmodcmd=""
+- else
+- instcmd=$mkdirprog
+- fi
+-else
+-
+-# 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 '*'.
+-
+- if [ -f "$src" ] || [ -d "$src" ]
+- then
+- :
+- else
+- echo "$0: $src does not exist" >&2
+- exit 1
+- fi
+-
+- if [ x"$dst" = x ]
+- then
+- echo "$0: no destination specified" >&2
+- exit 1
+- else
+- :
+- fi
+-
+-# 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
+-
+- if [ -d "$dst" ]
+- then
+- dst=$dst/`basename "$src"`
+- else
+- :
+- fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+- '
+-IFS="${IFS-$defaultIFS}"
+-
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS=$oIFS
+-
+-pathcomp=''
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
+
+-while [ $# -ne 0 ] ; do
+- pathcomp=$pathcomp$1
++ -T) no_target_directory=true
+ shift
++ continue;;
+
+- if [ ! -d "$pathcomp" ] ;
+- then
+- $mkdirprog "$pathcomp"
+- else
+- :
+- fi
++ --version) echo "$0 $scriptversion"; exit $?;;
+
+- pathcomp=$pathcomp/
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
+
+- 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
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
+- fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- :
+- fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
+- dsttmp=$dstdir/#inst.$$#
+- rmtmp=$dstdir/#rm.$$#
+-
+-# Trap to clean up temp files at exit.
+-
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd "$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 $instcmd $src $dsttmp" command.
+-
+- 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 &&
+-
+-# 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.
+-
+-{
+- 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
+- }
+- else
+- :
+- fi
+-} &&
+-
+-# Now rename the file to the real destination.
++if test -z "$1"; 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
+
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ src=
++
++ 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 '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
+
+-fi &&
++ # 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: $dstarg: Is a directory" >&2
++ exit 1
++ fi
++ dst=$dst/`basename "$src"`
++ fi
++ fi
++
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++ # Make sure that the destination directory exists.
++
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
++
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ shift
++ IFS=$oIFS
++
++ pathcomp=
++
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
++ shift
++ 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
++ fi
++ pathcomp=$pathcomp/
++ done
++ fi
++
++ if test -n "$dir_arg"; then
++ $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"; }
++
++ else
++ dstfile=`basename "$dst"`
++
++ # 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
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Copy the file name to the temp name.
++ $doit $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 "$dsttmp"; } &&
++
++ # Now rename the file to the real destination.
++ { $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
++ # 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.
++ {
++ 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 $dstdir/$dstfile" >&2
++ (exit 1); exit 1
++ }
++ else
++ :
++ fi
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ }
++ }
++ fi || { (exit 1); exit 1; }
++done
+
+ # The final little trick to "correctly" pass the exit status to the exit trap.
+-
+ {
+- (exit 0); exit
++ (exit 0); 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:
+diff -Nrua a/admin/missing b/admin/missing
+--- a/admin/missing 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/missing 2005-11-11 17:13:04.000000000 +0100
+@@ -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=2005-06-08.21
++
++# 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.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,8 +19,8 @@
+
+ # 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.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -38,18 +42,24 @@
+ configure_ac=configure.in
+ fi
+
++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
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -74,11 +84,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 0.4 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
++ exit $?
+ ;;
+
+ -*)
+@@ -87,14 +101,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 +146,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 +155,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."
+@@ -140,13 +174,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,16 +185,11 @@
+ ;;
+
+ 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'`
+@@ -185,7 +209,7 @@
+
+ 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."
+@@ -215,7 +239,7 @@
+
+ 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."
+@@ -237,13 +261,8 @@
+ ;;
+
+ 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."
+@@ -262,32 +281,30 @@
+ ;;
+
+ 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."
++ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ 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`
++ # ... 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
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
+ 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
+@@ -323,10 +340,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 +351,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:
+diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
+--- a/admin/mkinstalldirs 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/mkinstalldirs 2005-11-11 17:13:04.000000000 +0100
+@@ -1,21 +1,33 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
++
++scriptversion=2005-06-29.22
++
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+-# Public domain
++# 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>.
+
+ 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 +35,10 @@
+ dirmode=$1
+ shift
+ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit $?
++ ;;
+ --) # stop option processing
+ shift
+ break
+@@ -50,30 +66,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 +128,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 +151,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
+diff -Nrua a/admin/ylwrap b/admin/ylwrap
+--- a/admin/ylwrap 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/ylwrap 2005-11-11 17:13:04.000000000 +0100
+@@ -1,6 +1,11 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 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
+@@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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,8 +94,8 @@
+ 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
+@@ -79,65 +106,118 @@
+
+ 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: trunk/packages/koffice/debian/common-patches/03_libtool_update.diff
===================================================================
--- trunk/packages/koffice/debian/common-patches/03_libtool_update.diff 2005-11-11 16:07:20 UTC (rev 2203)
+++ trunk/packages/koffice/debian/common-patches/03_libtool_update.diff 2005-11-11 16:14:22 UTC (rev 2204)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2005-11-09 04:19:43.000000000 -0500
-+++ b/admin/libtool.m4.in 2005-11-10 12:07:37.000000000 -0500
+--- a/admin/libtool.m4.in 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/libtool.m4.in 2005-11-11 17:13:04.000000000 +0100
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -20,7 +20,7 @@
-##
-## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
@@ -446,7 +446,7 @@
dynamic_linker=no
;;
--kfreebsd*-gnu*)
+-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -708,7 +708,7 @@
lt_cv_deplibs_check_method=pass_all
;;
--freebsd* | kfreebsd*-gnu)
+-freebsd*)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
@@ -922,14 +922,14 @@
- ;;
- *) # 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'
+- allow_undefined_flag='-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'
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -1170,7 +1170,7 @@
- ;;
- *) # 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'
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
@@ -1182,10 +1182,10 @@
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag='-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'
@@ -1269,7 +1269,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
-- freebsd* | kfreebsd*-gnu)
+- freebsd*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
@@ -1846,6 +1846,15 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3942,7 +4113,7 @@
+ #
+ # 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.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
@@ -3953,11 +4124,11 @@
SED=$lt_SED
@@ -2010,7 +2019,7 @@
;;
esac
;;
-- freebsd* | kfreebsd*-gnu)
+- freebsd*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -2562,14 +2571,14 @@
- ;;
- *) # 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'
+- allow_undefined_flag='-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'
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- ;;
- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
- fi
@@ -2650,7 +2659,7 @@
;;
# 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* | kfreebsd*-gnu | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -2842,8 +2851,8 @@
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2005-11-09 04:19:43.000000000 -0500
-+++ b/admin/ltmain.sh 2005-11-10 12:07:37.000000000 -0500
+--- a/admin/ltmain.sh 2005-10-05 12:45:37.000000000 +0200
++++ b/admin/ltmain.sh 2005-11-11 17:13:04.000000000 +0100
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -2853,7 +2862,15 @@
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
-@@ -24,6 +24,34 @@
+@@ -17,13 +17,41 @@
+ #
+ # 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.
+ #
+ # 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.
@@ -3750,7 +3767,14 @@
fi
dir="$absdir"
;;
-@@ -1280,18 +1487,18 @@
+@@ -1276,28 +1483,22 @@
+ # 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*)
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
@@ -3767,12 +3791,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 +1508,36 @@
+@@ -1307,18 +1508,36 @@
continue
;;
@@ -3816,7 +3843,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"`
-@@ -1365,6 +1590,11 @@
+@@ -1371,6 +1590,11 @@
-o) prev=output ;;
@@ -3828,7 +3855,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1617,7 @@
+@@ -1393,7 +1617,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -3837,7 +3864,7 @@
;;
esac
case "$xrpath " in
-@@ -1473,11 +1703,6 @@
+@@ -1479,11 +1703,6 @@
continue
;;
@@ -3849,7 +3876,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1713,6 @@
+@@ -1494,7 +1713,6 @@
arg="\"$arg\""
;;
esac
@@ -3857,7 +3884,7 @@
;;
*.$objext)
-@@ -1516,7 +1740,7 @@
+@@ -1522,7 +1740,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -3866,7 +3893,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1569,7 +1793,7 @@
+@@ -1575,7 +1793,7 @@
# Only an error if not doing a dry-run.
if test -z "$run"; then
$echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -3875,7 +3902,7 @@
else
# Dry-run case.
-@@ -1623,7 +1847,6 @@
+@@ -1629,7 +1847,6 @@
arg="\"$arg\""
;;
esac
@@ -3883,7 +3910,7 @@
;;
esac # arg
-@@ -1637,48 +1860,7 @@
+@@ -1643,48 +1860,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -3933,7 +3960,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1722,7 +1904,7 @@
+@@ -1728,7 +1904,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -3942,7 +3969,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +1914,7 @@
+@@ -1738,7 +1914,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -3951,7 +3978,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1785,7 +1967,7 @@
+@@ -1791,7 +1967,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -3960,7 +3987,7 @@
;;
esac
done
-@@ -1811,7 +1993,10 @@
+@@ -1817,7 +1993,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -3972,7 +3999,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2008,23 @@
+@@ -1829,18 +2008,23 @@
lib=
found=no
case $deplib in
@@ -4001,7 +4028,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2085,6 @@
+@@ -1901,18 +2085,6 @@
fi
fi
;; # -l
@@ -4020,7 +4047,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2100,11 @@
+@@ -1928,11 +2100,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -4033,7 +4060,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2132,22 @@
+@@ -1960,7 +2132,22 @@
fi
case $linkmode in
lib)
@@ -4057,7 +4084,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"
-@@ -2005,14 +2198,14 @@
+@@ -2011,14 +2198,14 @@
if test "$found" = yes || test -f "$lib"; then :
else
$echo "$modename: cannot find the library \`$lib'" 1>&2
@@ -4074,7 +4101,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2221,8 @@
+@@ -2034,6 +2221,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -4083,7 +4110,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2230,6 @@
+@@ -2041,13 +2230,6 @@
*) . ./$lib ;;
esac
@@ -4097,7 +4124,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2240,32 @@
+@@ -2058,33 +2240,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -4144,7 +4171,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2273,18 @@
+@@ -2092,16 +2273,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4166,7 +4193,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 +2321,19 @@
+@@ -2138,11 +2321,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -4190,7 +4217,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2341,7 @@
+@@ -2150,7 +2341,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -4199,7 +4226,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2368,7 @@
+@@ -2177,7 +2368,7 @@
continue
fi
@@ -4208,7 +4235,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2209,12 +2406,12 @@
+@@ -2215,12 +2406,12 @@
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
# We need to hardcode the library path
@@ -4223,7 +4250,7 @@
esac
fi
-@@ -2258,17 +2455,18 @@
+@@ -2264,17 +2455,18 @@
need_relink=yes
fi
# This is a shared library
@@ -4247,7 +4274,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2524,10 @@
+@@ -2332,9 +2524,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -4259,7 +4286,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2538,10 @@
+@@ -2345,9 +2538,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -4271,7 +4298,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2364,9 +2564,9 @@
+@@ -2370,9 +2564,9 @@
case $host in
*-*-sco3.2v5* ) add_dir="-L$dir" ;;
*-*-darwin* )
@@ -4284,7 +4311,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2574,7 @@
+@@ -2380,7 +2574,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -4293,7 +4320,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2597,9 @@
+@@ -2403,9 +2597,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -4305,7 +4332,7 @@
;;
esac
fi
-@@ -2416,7 +2616,7 @@
+@@ -2422,7 +2616,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -4314,7 +4341,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2659,8 @@
+@@ -2465,7 +2659,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -4324,7 +4351,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2670,9 @@
+@@ -2475,9 +2670,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -4336,7 +4363,7 @@
;;
esac
fi
-@@ -2530,17 +2731,16 @@
+@@ -2536,17 +2731,16 @@
fi
fi
else
@@ -4358,7 +4385,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2754,7 @@
+@@ -2560,7 +2754,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -4367,7 +4394,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2796,18 @@
+@@ -2602,20 +2796,18 @@
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
@@ -4392,7 +4419,7 @@
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2617,55 +2815,45 @@
+@@ -2623,55 +2815,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -4468,7 +4495,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +2940,8 @@
+@@ -2758,7 +2940,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -4478,7 +4505,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3001,19 @@
+@@ -2818,19 +3001,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -4501,7 +4528,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3024,7 @@
+@@ -2841,7 +3024,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
@@ -4510,7 +4537,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3072,13 @@
+@@ -2889,13 +3072,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -4526,7 +4553,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2918,6 +3107,11 @@
+@@ -2924,6 +3107,11 @@
age="$number_minor"
revision="$number_minor"
;;
@@ -4538,7 +4565,7 @@
esac
;;
no)
-@@ -2929,36 +3123,36 @@
+@@ -2935,36 +3123,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -4585,7 +4612,7 @@
fi
# Calculate the version variables.
-@@ -2975,7 +3169,7 @@
+@@ -2981,7 +3169,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -4594,7 +4621,7 @@
;;
freebsd-aout)
-@@ -3047,7 +3241,7 @@
+@@ -3053,7 +3241,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -4603,12 +4630,8 @@
;;
esac
-@@ -3098,9 +3292,15 @@
- tempremovelist=`$echo "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
-- *.$objext | *$exeext)
-+ *.$objext)
+@@ -3107,6 +3295,12 @@
+ *.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
@@ -4620,7 +4643,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3137,7 +3337,7 @@
+@@ -3143,7 +3337,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -4629,7 +4652,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,12 +3370,12 @@
+@@ -3176,18 +3370,12 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -4639,12 +4662,18 @@
*-*-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.
test "X$arg" = "X-lc" && continue
;;
-@@ -3225,7 +3425,7 @@
+@@ -3237,7 +3425,7 @@
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
@@ -4653,7 +4682,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3262,7 +3462,7 @@
+@@ -3274,7 +3462,7 @@
# 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
@@ -4662,7 +4691,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
-@@ -3314,7 +3514,7 @@
+@@ -3326,7 +3514,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -4671,7 +4700,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 +3583,7 @@
+@@ -3395,7 +3583,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -4680,7 +4709,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 +3663,7 @@
+@@ -3475,7 +3663,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -4689,7 +4718,7 @@
;;
esac
-@@ -3509,13 +3709,6 @@
+@@ -3521,13 +3709,6 @@
fi
fi
fi
@@ -4703,7 +4732,7 @@
# Done checking deplibs!
deplibs=$newdeplibs
fi
-@@ -3532,7 +3725,7 @@
+@@ -3544,7 +3725,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -4712,7 +4741,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3587,7 +3780,7 @@
+@@ -3599,7 +3780,7 @@
fi
# Get the real and link names of the library.
@@ -4721,7 +4750,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3617,10 +3810,11 @@
+@@ -3629,10 +3810,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -4734,7 +4763,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +3824,9 @@
+@@ -3642,6 +3824,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -4744,7 +4773,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +3847,12 @@
+@@ -3662,12 +3847,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -4759,7 +4788,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +3860,13 @@
+@@ -3675,67 +3860,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -4830,7 +4859,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 +3877,27 @@
+@@ -3746,31 +3877,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -4872,7 +4901,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +3916,7 @@
+@@ -3789,6 +3916,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -4880,7 +4909,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +3926,13 @@
+@@ -3798,13 +3926,13 @@
delfiles=
last_robj=
k=1
@@ -4896,7 +4925,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +3946,9 @@
+@@ -3818,9 +3946,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -4908,7 +4937,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +3968,13 @@
+@@ -3840,13 +3968,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -4924,7 +4953,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +3999,54 @@
+@@ -3871,28 +3999,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -4984,7 +5013,7 @@
fi
# Create links to the real library.
-@@ -3928,7 +4094,7 @@
+@@ -3940,7 +4094,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -4993,7 +5022,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3957,64 +4123,10 @@
+@@ -3969,64 +4123,10 @@
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
@@ -5060,7 +5089,7 @@
fi
fi
-@@ -4022,10 +4134,11 @@
+@@ -4034,10 +4134,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"
@@ -5073,7 +5102,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4151,7 @@
+@@ -4050,7 +4151,7 @@
$run ${rm}r $gentop
fi
@@ -5082,7 +5111,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4164,18 @@
+@@ -4063,17 +4164,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -5103,7 +5132,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4187,7 @@
+@@ -4085,7 +4187,7 @@
$run ${rm}r $gentop
fi
@@ -5112,7 +5141,7 @@
;;
prog)
-@@ -4098,21 +4212,18 @@
+@@ -4110,21 +4212,18 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -5137,7 +5166,7 @@
;;
esac
-@@ -4277,12 +4388,12 @@
+@@ -4289,12 +4388,12 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -5154,7 +5183,7 @@
$run eval 'mv "$nlist"T "$nlist"'
fi
fi
-@@ -4334,7 +4445,26 @@
+@@ -4346,7 +4445,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -5181,7 +5210,7 @@
const char *name;
lt_ptr address;
}
-@@ -4394,7 +4524,7 @@
+@@ -4406,7 +4524,7 @@
;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -5190,7 +5219,7 @@
;;
esac
else
-@@ -4407,17 +4537,6 @@
+@@ -4419,17 +4537,6 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
@@ -5208,7 +5237,7 @@
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4493,7 +4612,7 @@
+@@ -4505,7 +4612,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -5217,7 +5246,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4548,10 +4667,10 @@
+@@ -4560,10 +4667,10 @@
fi
# Quote $echo for shipping.
@@ -5232,13 +5261,11 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4692,11 @@
- *) exeext= ;;
+@@ -4586,10 +4693,10 @@
esac
case $host in
-- *mingw* )
-- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
-+ *cygwin* | *mingw* )
+ *cygwin* | *mingw* )
+- cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
cwrapper=`$echo ${output}.exe`
$rm $cwrappersource $cwrapper
@@ -5247,7 +5274,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4705,7 @@
+@@ -4598,7 +4705,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -5256,7 +5283,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4618,7 +4737,7 @@
+@@ -4630,7 +4737,7 @@
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
defined (__OS2__)
#define HAVE_DOS_BASED_FILE_SYSTEM
@@ -5265,7 +5292,7 @@
#define DIR_SEPARATOR_2 '\\'
#endif
#endif
-@@ -4649,7 +4768,7 @@
+@@ -4661,7 +4768,7 @@
{
char **newargz;
int i;
@@ -5274,7 +5301,7 @@
program_name = (char *) xstrdup ((char *) basename (argv[0]));
newargz = XMALLOC(char *, argc+2);
EOF
-@@ -4662,7 +4781,7 @@
+@@ -4674,7 +4781,7 @@
newargz[1] = fnqualify(argv[0]);
/* we know the script has the same name, without the .exe */
/* so make sure newargz[1] doesn't end in .exe */
@@ -5283,7 +5310,7 @@
for (i = 1; i < argc; i++)
newargz[i+1] = xstrdup(argv[i]);
newargz[argc+1] = NULL;
-@@ -4673,6 +4792,7 @@
+@@ -4685,6 +4792,7 @@
EOF
cat >> $cwrappersource <<"EOF"
@@ -5291,7 +5318,7 @@
}
void *
-@@ -4685,7 +4805,7 @@
+@@ -4697,7 +4805,7 @@
return p;
}
@@ -5300,7 +5327,7 @@
xstrdup (const char *string)
{
return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-@@ -4699,7 +4819,7 @@
+@@ -4711,7 +4819,7 @@
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over the disk name in MSDOS pathnames. */
@@ -5309,7 +5336,7 @@
name += 2;
#endif
-@@ -4709,7 +4829,7 @@
+@@ -4721,7 +4829,7 @@
return (char *) base;
}
@@ -5318,7 +5345,7 @@
fnqualify(const char *path)
{
size_t size;
-@@ -4737,7 +4857,7 @@
+@@ -4749,7 +4857,7 @@
}
char *
@@ -5327,7 +5354,7 @@
{
size_t len, patlen;
-@@ -4757,7 +4877,7 @@
+@@ -4769,7 +4877,7 @@
}
static void
@@ -5336,7 +5363,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4786,7 +4906,7 @@
+@@ -4798,7 +4906,7 @@
;;
esac
$rm $output
@@ -5345,7 +5372,7 @@
$echo > $output "\
#! $SHELL
-@@ -4807,7 +4927,7 @@
+@@ -4819,7 +4927,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -5354,7 +5381,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5006,7 @@
+@@ -4898,7 +5006,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -5363,7 +5390,7 @@
fi
fi
-@@ -4936,34 +5056,32 @@
+@@ -4948,34 +5056,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -5404,7 +5431,7 @@
;;
esac
-@@ -4986,78 +5104,78 @@
+@@ -4998,78 +5104,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -5544,7 +5571,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5184,18 @@
+@@ -5078,31 +5184,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -5579,7 +5606,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5203,7 @@
+@@ -5110,7 +5203,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -5588,7 +5615,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5214,13 @@
+@@ -5121,12 +5214,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -5603,7 +5630,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5252,13 @@
+@@ -5158,11 +5252,13 @@
fi
done
# Quote the link command for shipping.
@@ -5620,7 +5647,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5276,7 @@
+@@ -5180,7 +5276,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
@@ -5629,7 +5656,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5290,7 @@
+@@ -5194,7 +5290,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
@@ -5638,7 +5665,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5301,30 @@
+@@ -5205,11 +5301,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
@@ -5670,7 +5697,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5368,7 @@
+@@ -5253,7 +5368,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -5679,7 +5706,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5381,7 @@
+@@ -5266,7 +5381,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -5688,7 +5715,7 @@
;;
# libtool install mode
-@@ -5265,11 +5392,11 @@
+@@ -5277,11 +5392,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -5702,7 +5729,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5405,14 @@
+@@ -5290,14 +5405,14 @@
shift
else
install_prog=
@@ -5719,7 +5746,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5430,31 @@
+@@ -5315,28 +5430,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -5759,7 +5786,7 @@
continue
fi
;;
-@@ -5333,7 +5463,7 @@
+@@ -5345,7 +5463,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -5768,7 +5795,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5473,13 @@
+@@ -5355,13 +5473,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -5784,7 +5811,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5489,7 @@
+@@ -5371,7 +5489,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -5793,7 +5820,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5510,7 @@
+@@ -5392,7 +5510,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -5802,7 +5829,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5522,7 @@
+@@ -5404,7 +5522,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -5811,7 +5838,7 @@
;;
esac
done
-@@ -5421,7 +5551,7 @@
+@@ -5433,7 +5551,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -5820,7 +5847,7 @@
fi
library_names=
-@@ -5463,7 +5593,7 @@
+@@ -5475,7 +5593,7 @@
# 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
@@ -5829,7 +5856,7 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5478,7 +5608,7 @@
+@@ -5490,7 +5608,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -5838,7 +5865,7 @@
fi
fi
-@@ -5502,23 +5632,36 @@
+@@ -5514,23 +5632,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -5879,7 +5906,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +5699,7 @@
+@@ -5568,7 +5699,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -5888,7 +5915,7 @@
;;
esac
-@@ -5574,7 +5717,7 @@
+@@ -5586,7 +5717,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -5897,7 +5924,7 @@
;;
*)
-@@ -5612,23 +5755,21 @@
+@@ -5624,23 +5755,21 @@
notinst_deplibs=
relink_command=
@@ -5930,7 +5957,7 @@
fi
finalize=yes
-@@ -5650,17 +5791,15 @@
+@@ -5662,17 +5791,15 @@
done
relink_command=
@@ -5956,7 +5983,7 @@
esac
outputname=
-@@ -5669,8 +5808,12 @@
+@@ -5681,8 +5808,12 @@
tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$"
@@ -5970,7 +5997,7 @@
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue
fi
-@@ -5697,7 +5840,7 @@
+@@ -5709,7 +5840,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -5979,7 +6006,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +5872,17 @@
+@@ -5741,16 +5872,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -5999,7 +6026,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +5896,9 @@
+@@ -5764,9 +5896,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -6011,7 +6038,7 @@
fi
;;
-@@ -5773,10 +5917,11 @@
+@@ -5785,10 +5917,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -6024,7 +6051,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,7 +5938,7 @@
+@@ -5805,7 +5938,7 @@
fi
# Exit here if they wanted silent mode.
@@ -6033,7 +6060,7 @@
$echo "----------------------------------------------------------------------"
$echo "Libraries have been installed in:"
-@@ -5829,7 +5974,7 @@
+@@ -5841,7 +5974,7 @@
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
$echo "----------------------------------------------------------------------"
@@ -6042,7 +6069,7 @@
;;
# libtool execute mode
-@@ -5841,7 +5986,7 @@
+@@ -5853,7 +5986,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -6051,7 +6078,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +5994,7 @@
+@@ -5861,7 +5994,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -6060,7 +6087,7 @@
fi
dir=
-@@ -5860,7 +6005,7 @@
+@@ -5872,7 +6005,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -6069,7 +6096,7 @@
fi
# Read the libtool library.
-@@ -5887,7 +6032,7 @@
+@@ -5899,7 +6032,7 @@
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -6078,7 +6105,7 @@
fi
;;
-@@ -5967,7 +6112,7 @@
+@@ -5979,7 +6112,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -6087,7 +6114,7 @@
fi
;;
-@@ -5995,7 +6140,7 @@
+@@ -6007,7 +6140,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -6096,7 +6123,7 @@
fi
rmdirs=
-@@ -6050,10 +6195,11 @@
+@@ -6062,10 +6195,11 @@
if test "$mode" = uninstall; then
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
@@ -6109,7 +6136,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6211,11 @@
+@@ -6077,10 +6211,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -6122,7 +6149,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6107,7 +6254,7 @@
+@@ -6119,7 +6254,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -6131,7 +6158,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6299,20 @@
+@@ -6164,20 +6299,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -6155,7 +6182,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6348,7 @@
+@@ -6213,7 +6348,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -6164,7 +6191,7 @@
;;
clean)
-@@ -6313,6 +6460,8 @@
+@@ -6325,6 +6460,8 @@
-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
@@ -6173,7 +6200,7 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-@@ -6354,14 +6503,14 @@
+@@ -6366,14 +6503,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
Modified: trunk/packages/koffice/debian/common-patches/07_disable-visibility.diff
===================================================================
--- trunk/packages/koffice/debian/common-patches/07_disable-visibility.diff 2005-11-11 16:07:20 UTC (rev 2203)
+++ trunk/packages/koffice/debian/common-patches/07_disable-visibility.diff 2005-11-11 16:14:22 UTC (rev 2204)
@@ -1,31 +1,12 @@
---- kde.orig/admin/acinclude.m4.in
-+++ kde.patched/admin/acinclude.m4.in
-@@ -3339,63 +3339,63 @@
+--- koffice-1.4.2.orig/admin/acinclude.m4.in 2005-10-05 12:45:37.000000000 +0200
++++ koffice-1.4.2/admin/acinclude.m4.in 2005-11-11 17:03:26.000000000 +0100
+@@ -3284,44 +3284,44 @@
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
[
- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-
-- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
--
- if test "x$GXX" = "xyes"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-- AC_EGREP_CPP(
-- [GCC visibility push],
-- [ #include <exception>
-- ],
-- [
-- AC_MSG_RESULT(yes)
-- kde_stdc_visibility_patched=yes ],
-- [
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-- visibility support. Disabling -fvisibility=hidden])
--
-- kde_stdc_visibility_patched=no ])
-- AC_LANG_RESTORE
--
- kde_have_gcc_visibility=no
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
@@ -53,7 +34,7 @@
- ]
- )
-
-- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
- HAVE_GCC_VISIBILITY=1
@@ -63,26 +44,7 @@
- fi
+dnl AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+dnl
-+dnl AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+dnl
+dnl if test "x$GXX" = "xyes"; then
-+dnl AC_LANG_SAVE
-+dnl AC_LANG_CPLUSPLUS
-+dnl AC_EGREP_CPP(
-+dnl [GCC visibility push],
-+dnl [ #include <exception>
-+dnl ],
-+dnl [
-+dnl AC_MSG_RESULT(yes)
-+dnl kde_stdc_visibility_patched=yes ],
-+dnl [
-+dnl AC_MSG_RESULT(no)
-+dnl AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-+dnl visibility support. Disabling -fvisibility=hidden])
-+dnl
-+dnl kde_stdc_visibility_patched=no ])
-+dnl AC_LANG_RESTORE
-+dnl
+dnl kde_have_gcc_visibility=no
+dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+dnl [
@@ -110,7 +72,7 @@
+dnl ]
+dnl )
+dnl
-+dnl if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+dnl KDE_CHECK_VISIBILITY_GCC_BUG
+dnl HAVE_GCC_VISIBILITY=1
More information about the pkg-kde-commits
mailing list