rev 6152 - in kde-extras/krusader: tags tags/1.80.0~beta2-1/debian
tags/1.80.0~beta2-1/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Fri May 11 19:03:01 UTC 2007
Author: fboudra-guest
Date: 2007-05-11 19:03:00 +0000 (Fri, 11 May 2007)
New Revision: 6152
Added:
kde-extras/krusader/tags/1.80.0~beta2-1/
Removed:
kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/10_gcc4.2_support.diff
kde-extras/krusader/trunk/debian/patches/10_gcc4.2_support.diff
Modified:
kde-extras/krusader/tags/1.80.0~beta2-1/debian/changelog
kde-extras/krusader/tags/1.80.0~beta2-1/debian/copyright
kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/02_autotools_update.diff
kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/03_libtool_update.diff
kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/11_add_useractions_examples.diff
kde-extras/krusader/trunk/debian/changelog
kde-extras/krusader/trunk/debian/copyright
kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff
kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff
kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff
Log:
tag krusader 1.80.0~beta2-1
Copied: kde-extras/krusader/tags/1.80.0~beta2-1 (from rev 6147, kde-extras/krusader/trunk)
Modified: kde-extras/krusader/tags/1.80.0~beta2-1/debian/changelog
===================================================================
--- kde-extras/krusader/trunk/debian/changelog 2007-05-11 12:33:22 UTC (rev 6147)
+++ kde-extras/krusader/tags/1.80.0~beta2-1/debian/changelog 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,11 +1,18 @@
-krusader (1.80.0~beta1-2) UNRELEASED; urgency=low
+krusader (1.80.0~beta2-1) unstable; urgency=low
- * NOT RELEASED YET
- * Update debian/watch
- * Robust get-orig-source target
+ * New upstream release.
- -- Mark Purcell <msp at debian.org> Sat, 3 Mar 2007 18:45:34 +0000
+ [Fathi Boudra]
+ * Update copyright.
+ * Remove gcc4.2 support patch. Merged upstream.
+ * Update useractions examples patch.
+ [Mark Purcell]
+ * Update debian/watch.
+ * Robust get-orig-source target.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 18:12:49 +0200
+
krusader (1.80.0~beta1-1) experimental; urgency=low
* Add debug package
Modified: kde-extras/krusader/tags/1.80.0~beta2-1/debian/copyright
===================================================================
--- kde-extras/krusader/trunk/debian/copyright 2007-05-11 12:33:22 UTC (rev 6147)
+++ kde-extras/krusader/tags/1.80.0~beta2-1/debian/copyright 2007-05-11 19:03:00 UTC (rev 6152)
@@ -40,6 +40,9 @@
Copyright for libisofs, licensed under the GPL:
(C) 2002 György Szombathelyi <gyurco at users.sourceforge.net>
+Copyright for kcmdmodebutton class:
+ (C) 2006 Vaclav Juza <vaclavjuza at gmail.com>
+
License:
This package is free software; you can redistribute it and/or modify
Modified: kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff 2007-05-11 12:33:22 UTC (rev 6147)
+++ kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/02_autotools_update.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,1095 +1,66 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile 2003-05-08 21:09:27.000000000 +0200
-+++ b/admin/compile 2007-01-07 17:41:38.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 2004-07-07 17:54:48.000000000 +0200
-+++ b/admin/depcomp 2007-01-07 17:41:38.000000000 +0100
-@@ -1,7 +1,9 @@
- #! /bin/sh
--
- # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+scriptversion=2005-07-09.11
-+
-+# 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 @@
-
- # 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
-@@ -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 2004-07-07 17:54:48.000000000 +0200
-+++ b/admin/install-sh 2007-01-07 17:41:38.000000000 +0100
-@@ -1,19 +1,38 @@
+--- a/admin/install-sh 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/install-sh 2007-05-11 20:27:29.000000000 +0200
+@@ -1,7 +1,7 @@
#!/bin/sh
--#
# install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
+
+-scriptversion=2005-11-07.23
+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 @@
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -58,21 +58,7 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
+-posix_glob=
+-posix_mkdir=
-
--while [ x"$1" != x ]; do
-- case $1 in
-- -c) instcmd=$cpprog
-- shift
-- continue;;
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
-
-- -d) dir_arg=true
-- shift
-- continue;;
+-# Desired mode of installed file.
+-mode=0755
-
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
-
-- -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;;
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -125,7 +111,7 @@
--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;;
+ --help) echo "$usage"; exit $?;;
--while [ $# -ne 0 ] ; do
-- pathcomp=$pathcomp$1
-+ -T) no_target_directory=true
- shift
-+ continue;;
+- -m) mode=$2
++ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+@@ -178,8 +164,6 @@
+ exit 0
+ fi
-- 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
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-
--if [ x"$dir_arg" != x ]
--then
-- $doit $instcmd "$dst" &&
+ for src
+ do
+ # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
-- 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
+ if test -n "$dir_arg"; then
+ dst=$src
+- dstdir=$dst
+- test -d "$dstdir"
+- dstdir_status=$?
+- else
+ src=
-+
+
+ if test -d "$dst"; then
+ mkdircmd=:
+ chmodcmd=
@@ -1097,42 +68,58 @@
+ 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
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+- dstdir=$dst
+- dst=$dstdir/`basename "$src"`
+- dstdir_status=0
+- else
+- # Prefer dirname, but fall back on a substitute if dirname fails.
+- dstdir=`
+- (dirname "$dst") 2>/dev/null ||
+- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$dst" : 'X\(//\)[^/]' \| \
+- X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+- echo X"$dst" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'
+- `
+-
+- test -d "$dstdir"
+- dstdir_status=$?
+ dst=$dst/`basename "$src"`
-+ fi
-+ fi
-+
+ fi
+ fi
+
+- obsolete_mkdir_used=false
+ # This sed command emulates the dirname command.
+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-+
+
+- if test $dstdir_status != 0; then
+- case $posix_mkdir in
+- '')
+- posix_mkdir=false
+- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+- posix_mkdir=true
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+- fi ;;
+- esac
+ # Make sure that the destination directory exists.
-+
+
+- if
+- $posix_mkdir && {
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
@@ -1145,12 +132,76 @@
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
+ IFS=$oIFS
-+
+
+- # With -d, create the new directory with the user-specified mode.
+- # Otherwise, create it using the same intermediate mode that
+- # mkdir -p would use when creating intermediate directories.
+- # POSIX says that this mode is "$(umask -S),u+wx", so use that
+- # if umask -S works.
+-
+- if test -n "$dir_arg"; then
+- mkdir_mode=$mode
+- else
+- case $intermediate_mode in
+- '')
+- if umask_S=`(umask -S) 2>/dev/null`; then
+- intermediate_mode=$umask_S,u+wx
+- else
+- intermediate_mode=$test_mode
+- fi ;;
+- esac
+- mkdir_mode=$intermediate_mode
+- fi
+-
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
+- then :
+- else
+ pathcomp=
-+
+
+- # mkdir does not conform to POSIX, or it failed possibly due to
+- # a race condition. Create the directory the slow way, step by
+- # step, checking for races as we go.
+-
+- case $dstdir in
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
+- esac
+-
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
+-
+- oIFS=$IFS
+- IFS=/
+- $posix_glob && set -f
+- set fnord $dstdir
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
-+ shift
+ shift
+- $posix_glob && set +f
+- IFS=$oIFS
+-
+- for d
+- do
+- test "x$d" = x && continue
+-
+- pathcomp=$pathcomp$d
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # Don't fail if two instances are running concurrently.
+- test -d "$pathcomp" || exit 1
+- fi
+- pathcomp=$pathcomp/
+- done
+- obsolete_mkdir_used=true
+- fi
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp"
+ # mkdir can fail with a `File exist' error in case several
@@ -1160,101 +211,101 @@
+ fi
+ pathcomp=$pathcomp/
+ done
-+ fi
-+
-+ if test -n "$dir_arg"; then
+ fi
+
+ if test -n "$dir_arg"; then
+- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
+ $doit $mkdircmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
-+ else
+ 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
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
+
+ # 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"; } \
+
+ # Copy the file name to the temp name.
+ $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+
-+ # Now rename the file to the real destination.
+
+ # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+ || {
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # 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.
-+ {
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+- if test -f "$dst"; then
+- $doit $rmcmd -f "$dst" 2>/dev/null \
+- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ if test -f "$dstdir/$dstfile"; then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+ || {
+ || {
+- echo "$0: cannot unlink or rename $dst" >&2
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+ (exit 1); exit 1
-+ }
-+ else
-+ :
-+ fi
-+ } &&
-+
-+ # Now rename the file to the real destination.
+ (exit 1); exit 1
+ }
+ else
+@@ -385,14 +304,17 @@
+ } &&
+
+ # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ }
+ }
+- } || exit 1
+-
+- trap '' 0
+- fi
+ }
+ fi || { (exit 1); exit 1; }
-+done
+ done
- # The final little trick to "correctly" pass the exit status to the exit trap.
--
- {
-- (exit 0); exit
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
+ (exit 0); exit 0
- }
++}
+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2003-05-08 21:09:28.000000000 +0200
-+++ b/admin/missing 2007-01-07 17:41:38.000000000 +0100
-@@ -1,6 +1,10 @@
+--- a/admin/missing 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/missing 2007-05-11 20:27:29.000000000 +0200
+@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+
+
+-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
-+
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
+ # 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 @@
+@@ -19,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
@@ -1265,213 +316,22 @@
# 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
+@@ -87,12 +87,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-+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>."
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing 0.4 - GNU automake"
-+ echo "missing $scriptversion (GNU Automake)"
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
+ 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
+@@ -288,11 +288,18 @@
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."
@@ -1493,493 +353,3 @@
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 2003-05-08 21:09:28.000000000 +0200
-+++ b/admin/mkinstalldirs 2007-01-07 17:41:38.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 2002-04-15 20:42:54.000000000 +0200
-+++ b/admin/ylwrap 2007-01-07 17:41:38.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: kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff 2007-05-11 12:33:22 UTC (rev 6147)
+++ kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/03_libtool_update.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
--- a/admin/libtool.m4.in 2006-01-15 12:08:34.000000000 +0100
-+++ b/admin/libtool.m4.in 2007-01-07 17:41:38.000000000 +0100
++++ b/admin/libtool.m4.in 2007-05-11 20:27:29.000000000 +0200
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3795,8 +3795,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 2006-01-15 12:08:34.000000000 +0100
-+++ b/admin/ltmain.sh 2007-01-07 17:41:38.000000000 +0100
+--- a/admin/ltmain.sh 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/ltmain.sh 2007-05-11 20:27:29.000000000 +0200
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -3841,16 +3841,23 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@
+@@ -36,14 +64,7 @@
:
else
# Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-# Same for EGREP, and just to be sure, do LTCC as well
+-if test "x$EGREP" = x ; then
+- EGREP=egrep
+-fi
+-if test "x$LTCC" = x ; then
+- LTCC=${CC-gcc}
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +73,9 @@
+@@ -52,19 +73,9 @@
cat <<EOF
$*
EOF
@@ -3871,7 +3878,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -70,14 +88,15 @@
+@@ -77,14 +88,15 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
@@ -3894,7 +3901,7 @@
;;
esac
-@@ -94,12 +113,14 @@
+@@ -101,12 +113,14 @@
fi
# Make sure IFS has a sensible default
@@ -3911,7 +3918,7 @@
fi
# Global variables.
-@@ -111,6 +132,8 @@
+@@ -118,41 +132,60 @@
show="$echo"
show_help=
execute_dlfiles=
@@ -3920,7 +3927,31 @@
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
-@@ -118,10 +141,51 @@
+-if test -z "$max_cmd_len"; then
+- i=0
+- testring="ABCD"
+- new_result=
+-
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- max_cmd_len="$new_result" &&
+- test "$i" != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring="$testring$testring"
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- max_cmd_len=`expr $max_cmd_len \/ 2`
+-fi
+-
+ #####################################
# Shell function definitions:
# This seems to be the best place for them
@@ -3973,7 +4004,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +194,16 @@
+@@ -161,17 +194,16 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -3998,7 +4029,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,181 @@
+@@ -185,9 +217,181 @@
$echo $win32_libid_type
}
@@ -4180,7 +4211,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +411,13 @@
+@@ -207,12 +411,13 @@
;;
tag)
tagname="$arg"
@@ -4195,7 +4226,7 @@
;;
esac
-@@ -191,10 +427,10 @@
+@@ -222,10 +427,10 @@
# not specially marked.
;;
*)
@@ -4208,7 +4239,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -220,24 +456,25 @@
+@@ -251,24 +456,25 @@
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
@@ -4239,7 +4270,7 @@
;;
--dry-run | -n)
-@@ -256,7 +493,7 @@
+@@ -287,7 +493,7 @@
else
$echo "disable static libraries"
fi
@@ -4248,7 +4279,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +505,19 @@
+@@ -299,13 +505,19 @@
--quiet | --silent)
show=:
@@ -4269,7 +4300,7 @@
;;
-dlopen)
-@@ -285,7 +528,7 @@
+@@ -316,7 +528,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4278,7 +4309,7 @@
;;
*)
-@@ -298,9 +541,21 @@
+@@ -329,9 +541,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4301,7 +4332,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +566,7 @@
+@@ -342,7 +566,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4310,7 +4341,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +609,7 @@
+@@ -385,7 +609,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4319,7 +4350,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +624,15 @@
+@@ -400,13 +624,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4336,7 +4367,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +651,19 @@
+@@ -425,24 +651,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4366,7 +4397,7 @@
continue
;;
-@@ -424,7 +676,7 @@
+@@ -455,7 +676,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4375,7 +4406,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +714,10 @@
+@@ -493,7 +714,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4387,7 +4418,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +729,11 @@
+@@ -505,11 +729,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -4401,7 +4432,7 @@
;;
*)
# Get the name of the library object.
-@@ -511,51 +766,39 @@
+@@ -542,51 +766,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -4480,7 +4511,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +811,7 @@
+@@ -599,7 +811,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -4489,7 +4520,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +822,7 @@
+@@ -610,7 +822,7 @@
fi
$run $rm $removelist
@@ -4498,7 +4529,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +841,7 @@
+@@ -629,7 +841,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -4507,7 +4538,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +851,7 @@
+@@ -639,7 +851,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -4516,7 +4547,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +869,19 @@
+@@ -657,14 +869,19 @@
compiler."
$run $rm $removelist
@@ -4538,7 +4569,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +903,18 @@
+@@ -686,18 +903,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -4562,7 +4593,7 @@
fi
fi
-@@ -681,7 +929,7 @@
+@@ -712,7 +929,7 @@
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -4571,7 +4602,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +949,7 @@
+@@ -732,7 +949,7 @@
compiler."
$run $rm $removelist
@@ -4580,7 +4611,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +970,9 @@
+@@ -753,7 +970,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -4591,7 +4622,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +986,9 @@
+@@ -767,9 +986,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -4603,7 +4634,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1001,7 @@
+@@ -782,7 +1001,7 @@
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -4612,7 +4643,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1021,7 @@
+@@ -802,7 +1021,7 @@
compiler."
$run $rm $removelist
@@ -4621,7 +4652,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1059,7 @@
+@@ -840,7 +1059,7 @@
$run $rm "$lockfile"
fi
@@ -4630,7 +4661,7 @@
;;
# libtool link mode
-@@ -835,7 +1085,7 @@
+@@ -866,7 +1085,7 @@
;;
esac
libtool_args="$nonopt"
@@ -4639,7 +4670,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1097,6 @@
+@@ -878,7 +1097,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -4647,7 +4678,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1117,8 @@
+@@ -899,6 +1117,8 @@
no_install=no
objs=
non_pic_objects=
@@ -4656,7 +4687,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,6 +1132,8 @@
+@@ -912,6 +1132,8 @@
vinfo=
vinfo_number=no
@@ -4665,7 +4696,7 @@
# We need to know -static, to get the right output filenames.
for arg
do
-@@ -893,14 +1146,15 @@
+@@ -924,14 +1146,15 @@
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
@@ -4682,7 +4713,7 @@
break
;;
esac
-@@ -912,7 +1166,6 @@
+@@ -943,7 +1166,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -4690,7 +4721,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1229,7 @@
+@@ -1007,7 +1229,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -4699,7 +4730,7 @@
fi
prev=
continue
-@@ -991,6 +1244,11 @@
+@@ -1022,6 +1244,11 @@
prev=
continue
;;
@@ -4711,7 +4742,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1281,7 @@
+@@ -1054,7 +1281,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4720,7 +4751,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1329,17 @@
+@@ -1102,12 +1329,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -4739,7 +4770,7 @@
else
# Dry-run case.
-@@ -1097,7 +1360,7 @@
+@@ -1128,7 +1360,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -4748,7 +4779,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1372,7 @@
+@@ -1140,7 +1372,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4757,7 +4788,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1412,15 @@
+@@ -1180,16 +1412,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -4783,7 +4814,7 @@
prev=
continue
;;
-@@ -1210,7 +1472,7 @@
+@@ -1241,7 +1472,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -4792,7 +4823,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1482,18 @@
+@@ -1251,6 +1482,18 @@
continue
;;
@@ -4811,7 +4842,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1520,8 @@
+@@ -1277,7 +1520,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -4821,7 +4852,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1535,15 @@
+@@ -1291,10 +1535,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -4837,7 +4868,7 @@
;;
esac
continue
-@@ -1272,26 +1552,35 @@
+@@ -1303,26 +1552,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -4878,7 +4909,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1301,18 +1590,41 @@
+@@ -1332,18 +1590,41 @@
continue
;;
@@ -4927,7 +4958,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1635,7 @@
+@@ -1354,9 +1635,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -4938,7 +4969,7 @@
continue
;;
-@@ -1365,6 +1675,11 @@
+@@ -1396,6 +1675,11 @@
-o) prev=output ;;
@@ -4950,7 +4981,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1702,7 @@
+@@ -1418,7 +1702,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4959,7 +4990,7 @@
;;
esac
case "$xrpath " in
-@@ -1473,11 +1788,6 @@
+@@ -1504,11 +1788,6 @@
continue
;;
@@ -4971,7 +5002,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1798,6 @@
+@@ -1519,7 +1798,6 @@
arg="\"$arg\""
;;
esac
@@ -4979,7 +5010,7 @@
;;
*.$objext)
-@@ -1516,7 +1825,7 @@
+@@ -1547,7 +1825,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4988,7 +5019,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1564,12 +1873,17 @@
+@@ -1595,12 +1873,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5007,7 +5038,7 @@
else
# Dry-run case.
-@@ -1623,7 +1937,6 @@
+@@ -1654,7 +1937,6 @@
arg="\"$arg\""
;;
esac
@@ -5015,7 +5046,7 @@
;;
esac # arg
-@@ -1637,48 +1950,7 @@
+@@ -1668,48 +1950,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5065,7 +5096,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +1983,9 @@
+@@ -1742,9 +1983,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5078,7 +5109,7 @@
fi
fi
-@@ -1722,7 +1994,7 @@
+@@ -1753,7 +1994,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5087,7 +5118,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2004,7 @@
+@@ -1763,7 +2004,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5096,7 +5127,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1776,7 +2048,6 @@
+@@ -1807,7 +2048,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5104,7 +5135,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1785,7 +2056,7 @@
+@@ -1816,7 +2056,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5113,7 +5144,7 @@
;;
esac
done
-@@ -1811,7 +2082,10 @@
+@@ -1842,7 +2082,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5125,7 +5156,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2097,23 @@
+@@ -1854,18 +2097,23 @@
lib=
found=no
case $deplib in
@@ -5154,7 +5185,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2174,6 @@
+@@ -1926,18 +2174,6 @@
fi
fi
;; # -l
@@ -5173,7 +5204,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2189,11 @@
+@@ -1953,11 +2189,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5186,7 +5217,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2221,22 @@
+@@ -1985,7 +2221,22 @@
fi
case $linkmode in
lib)
@@ -5210,7 +5241,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2286,15 @@
+@@ -2035,15 +2286,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5229,7 +5260,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2310,8 @@
+@@ -2059,6 +2310,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5238,7 +5269,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2319,6 @@
+@@ -2066,13 +2319,6 @@
*) . ./$lib ;;
esac
@@ -5252,7 +5283,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2329,32 @@
+@@ -2083,33 +2329,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5299,7 +5330,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2362,18 @@
+@@ -2117,16 +2362,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5321,7 +5352,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 +2410,19 @@
+@@ -2163,11 +2410,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5345,7 +5376,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2430,7 @@
+@@ -2175,7 +2430,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -5354,7 +5385,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2457,7 @@
+@@ -2202,7 +2457,7 @@
continue
fi
@@ -5363,7 +5394,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2209,12 +2495,12 @@
+@@ -2240,12 +2495,12 @@
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
# We need to hardcode the library path
@@ -5378,7 +5409,7 @@
esac
fi
-@@ -2251,24 +2537,29 @@
+@@ -2282,24 +2537,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -5414,7 +5445,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2617,10 @@
+@@ -2357,9 +2617,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5426,7 +5457,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2631,10 @@
+@@ -2370,9 +2631,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5438,7 +5469,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2362,11 +2655,15 @@
+@@ -2393,11 +2655,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -5458,7 +5489,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2671,7 @@
+@@ -2405,7 +2671,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -5467,7 +5498,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2694,9 @@
+@@ -2428,9 +2694,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5479,7 +5510,7 @@
;;
esac
fi
-@@ -2416,7 +2713,7 @@
+@@ -2447,7 +2713,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -5488,7 +5519,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2756,8 @@
+@@ -2490,7 +2756,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5498,7 +5529,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2767,9 @@
+@@ -2500,9 +2767,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5510,7 +5541,7 @@
;;
esac
fi
-@@ -2530,17 +2828,16 @@
+@@ -2561,17 +2828,16 @@
fi
fi
else
@@ -5532,7 +5563,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2851,7 @@
+@@ -2585,7 +2851,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -5541,7 +5572,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2893,18 @@
+@@ -2627,20 +2893,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
@@ -5566,7 +5597,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 +2912,45 @@
+@@ -2648,55 +2912,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -5642,7 +5673,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +3037,8 @@
+@@ -2783,7 +3037,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -5652,7 +5683,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3098,19 @@
+@@ -2843,19 +3098,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -5675,7 +5706,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3121,7 @@
+@@ -2866,7 +3121,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
@@ -5684,7 +5715,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3169,13 @@
+@@ -2914,13 +3169,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -5700,7 +5731,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2918,6 +3204,11 @@
+@@ -2949,6 +3204,11 @@
age="$number_minor"
revision="$number_minor"
;;
@@ -5712,7 +5743,7 @@
esac
;;
no)
-@@ -2929,36 +3220,36 @@
+@@ -2960,36 +3220,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -5759,7 +5790,7 @@
fi
# Calculate the version variables.
-@@ -2975,7 +3266,7 @@
+@@ -3006,7 +3266,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -5768,7 +5799,7 @@
;;
freebsd-aout)
-@@ -3047,7 +3338,7 @@
+@@ -3078,7 +3338,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -5777,7 +5808,7 @@
;;
esac
-@@ -3098,9 +3389,15 @@
+@@ -3129,9 +3389,15 @@
tempremovelist=`$echo "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
@@ -5794,7 +5825,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3122,9 +3419,9 @@
+@@ -3153,9 +3419,9 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
@@ -5807,7 +5838,7 @@
done
if test -n "$xrpath"; then
-@@ -3137,7 +3434,7 @@
+@@ -3168,7 +3434,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -5816,7 +5847,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,14 +3467,19 @@
+@@ -3201,14 +3467,19 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -5839,7 +5870,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3221,11 +3523,11 @@
+@@ -3252,11 +3523,11 @@
int main() { return 0; }
EOF
$rm conftest
@@ -5853,7 +5884,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,11 +3564,11 @@
+@@ -3293,11 +3564,11 @@
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
@@ -5867,7 +5898,7 @@
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
-@@ -3314,7 +3616,7 @@
+@@ -3345,7 +3616,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5876,7 +5907,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 +3685,7 @@
+@@ -3414,7 +3685,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5885,7 +5916,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 +3765,7 @@
+@@ -3494,7 +3765,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -5894,7 +5925,7 @@
;;
esac
-@@ -3509,17 +3811,39 @@
+@@ -3540,17 +3811,39 @@
fi
fi
fi
@@ -5941,7 +5972,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3532,7 +3856,7 @@
+@@ -3563,7 +3856,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -5950,7 +5981,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3587,7 +3911,7 @@
+@@ -3618,7 +3911,7 @@
fi
# Get the real and link names of the library.
@@ -5959,7 +5990,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3603,6 +3927,7 @@
+@@ -3634,6 +3927,7 @@
fi
lib="$output_objdir/$realname"
@@ -5967,7 +5998,7 @@
for link
do
linknames="$linknames $link"
-@@ -3617,10 +3942,11 @@
+@@ -3648,10 +3942,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -5980,7 +6011,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +3956,9 @@
+@@ -3661,6 +3956,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -5990,7 +6021,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +3979,12 @@
+@@ -3681,12 +3979,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6005,7 +6036,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +3992,13 @@
+@@ -3694,67 +3992,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6076,7 +6107,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 +4009,27 @@
+@@ -3765,31 +4009,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6118,7 +6149,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +4048,7 @@
+@@ -3808,6 +4048,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -6126,7 +6157,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +4058,13 @@
+@@ -3817,13 +4058,13 @@
delfiles=
last_robj=
k=1
@@ -6142,7 +6173,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +4078,9 @@
+@@ -3837,9 +4078,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6154,7 +6185,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +4100,13 @@
+@@ -3859,13 +4100,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6170,7 +6201,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4131,54 @@
+@@ -3890,28 +4131,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6230,7 +6261,7 @@
fi
# Create links to the real library.
-@@ -3928,7 +4226,7 @@
+@@ -3959,7 +4226,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6239,7 +6270,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3957,64 +4255,10 @@
+@@ -3988,64 +4255,10 @@
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
@@ -6306,7 +6337,7 @@
fi
fi
-@@ -4022,10 +4266,11 @@
+@@ -4053,10 +4266,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"
@@ -6319,7 +6350,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4283,7 @@
+@@ -4069,7 +4283,7 @@
$run ${rm}r $gentop
fi
@@ -6328,7 +6359,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4296,18 @@
+@@ -4082,17 +4296,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -6349,7 +6380,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4319,7 @@
+@@ -4104,7 +4319,7 @@
$run ${rm}r $gentop
fi
@@ -6358,7 +6389,7 @@
;;
prog)
-@@ -4098,24 +4344,50 @@
+@@ -4129,24 +4344,50 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6415,7 +6446,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4160,10 +4432,15 @@
+@@ -4191,10 +4432,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -6431,7 +6462,7 @@
;;
esac
done
-@@ -4277,13 +4554,25 @@
+@@ -4308,13 +4554,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -6461,7 +6492,7 @@
fi
fi
-@@ -4334,7 +4623,26 @@
+@@ -4365,7 +4623,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -6488,7 +6519,7 @@
const char *name;
lt_ptr address;
}
-@@ -4381,20 +4689,33 @@
+@@ -4412,20 +4689,33 @@
esac
# Now compile the dynamic symbol file.
@@ -6527,7 +6558,7 @@
;;
esac
else
-@@ -4407,17 +4728,6 @@
+@@ -4438,17 +4728,6 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
@@ -6545,7 +6576,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'`
-@@ -4426,7 +4736,7 @@
+@@ -4457,7 +4736,7 @@
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
@@ -6554,7 +6585,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4434,7 +4744,7 @@
+@@ -4465,7 +4744,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -6563,7 +6594,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4493,7 +4803,7 @@
+@@ -4524,7 +4803,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -6572,7 +6603,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4548,10 +4858,10 @@
+@@ -4579,10 +4858,10 @@
fi
# Quote $echo for shipping.
@@ -6587,7 +6618,7 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4883,13 @@
+@@ -4604,11 +4883,13 @@
*) exeext= ;;
esac
case $host in
@@ -6606,7 +6637,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4898,7 @@
+@@ -4617,7 +4898,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -6615,7 +6646,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4602,6 +4914,9 @@
+@@ -4633,6 +4914,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -6625,7 +6656,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4927,19 @@
+@@ -4643,15 +4927,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -6650,7 +6681,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4949,32 @@
+@@ -4661,17 +4949,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -6685,7 +6716,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4649,30 +4983,52 @@
+@@ -4680,30 +4983,52 @@
{
char **newargz;
int i;
@@ -6747,7 +6778,7 @@
}
void *
-@@ -4685,59 +5041,159 @@
+@@ -4716,59 +5041,159 @@
return p;
}
@@ -6778,10 +6809,8 @@
base = name + 1;
- return (char *) base;
+ return base;
- }
-
--char *
--fnqualify(const char *path)
++}
++
+int
+check_executable(const char * path)
+{
@@ -6805,8 +6834,10 @@
+ return 1;
+ else
+ return 0;
-+}
-+
+ }
+
+-char *
+-fnqualify(const char *path)
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise */
+char *
@@ -6821,14 +6852,14 @@
char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char* concat_name;
-+
+
+- assert(path != NULL);
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-- assert(path != NULL);
+- /* Is it qualified already? */
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
-
-- /* Is it qualified already? */
++
+ /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
@@ -6929,7 +6960,7 @@
{
size_t len, patlen;
-@@ -4757,7 +5213,7 @@
+@@ -4788,7 +5213,7 @@
}
static void
@@ -6938,7 +6969,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5233,16 @@
+@@ -4808,16 +5233,16 @@
va_end (ap);
}
EOF
@@ -6965,7 +6996,7 @@
$echo > $output "\
#! $SHELL
-@@ -4807,7 +5263,7 @@
+@@ -4838,7 +5263,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -6974,7 +7005,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5342,7 @@
+@@ -4917,7 +5342,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -6983,7 +7014,7 @@
fi
fi
-@@ -4936,34 +5392,32 @@
+@@ -4967,34 +5392,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -7024,7 +7055,7 @@
;;
esac
-@@ -4986,78 +5440,78 @@
+@@ -5017,78 +5440,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7164,7 +7195,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5520,18 @@
+@@ -5097,31 +5520,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7199,7 +7230,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5539,7 @@
+@@ -5129,7 +5539,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7208,7 +7239,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5550,13 @@
+@@ -5140,12 +5550,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7223,7 +7254,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5588,13 @@
+@@ -5177,11 +5588,13 @@
fi
done
# Quote the link command for shipping.
@@ -7240,16 +7271,66 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5612,7 @@
+@@ -5199,55 +5612,11 @@
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
- exit 1
+- fi
+- if test "x$EGREP" = x ; then
+- EGREP=egrep
+- fi
+- # We do not want portage's install root ($D) present. Check only for
+- # this if the .la is being installed.
+- if test "$installed" = yes && test "$D"; then
+- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$libdir/$name"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_1"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
+- fi
+- ;;
+- *)
+- if test "$installed" = yes; then
+- # Rather use S=WORKDIR if our version of portage supports it.
+- # This is because some ebuild (gcc) do not use $S as buildroot.
+- if test "$PWORKDIR"; then
+- S="$PWORKDIR"
+- fi
+- # We do not want portage's build root ($S) present.
+- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+- # We do not want portage's install root ($D) present.
+- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+- if test -n "$my_little_ninja_foo_2" && test "$S"; then
+- mynewdependency_lib=""
+- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_4"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
+ exit $EXIT_FAILURE
fi
- newdependency_libs="$newdependency_libs $libdir/$name"
++ newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5626,7 @@
++ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+@@ -5257,7 +5626,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
@@ -7258,7 +7339,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5637,30 @@
+@@ -5268,11 +5637,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
@@ -7290,7 +7371,18 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5704,7 @@
+@@ -5280,10 +5668,6 @@
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+- # Do not add duplicates
+- if test "$installed" = yes && test "$D"; then
+- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- fi
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5320,7 +5704,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -7299,7 +7391,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5717,7 @@
+@@ -5333,7 +5717,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -7308,7 +7400,7 @@
;;
# libtool install mode
-@@ -5265,11 +5728,11 @@
+@@ -5344,11 +5728,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -7322,7 +7414,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5741,14 @@
+@@ -5357,14 +5741,14 @@
shift
else
install_prog=
@@ -7339,7 +7431,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5766,31 @@
+@@ -5382,28 +5766,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -7379,7 +7471,7 @@
continue
fi
;;
-@@ -5333,7 +5799,7 @@
+@@ -5412,7 +5799,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -7388,7 +7480,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5809,13 @@
+@@ -5422,13 +5809,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -7404,7 +7496,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5825,7 @@
+@@ -5438,7 +5825,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -7413,7 +7505,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5846,7 @@
+@@ -5459,7 +5846,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -7422,7 +7514,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5858,7 @@
+@@ -5471,7 +5858,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -7431,7 +7523,7 @@
;;
esac
done
-@@ -5421,7 +5887,7 @@
+@@ -5500,7 +5887,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7440,7 +7532,7 @@
fi
library_names=
-@@ -5463,7 +5929,7 @@
+@@ -5542,7 +5929,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
@@ -7449,7 +7541,7 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5478,7 +5944,7 @@
+@@ -5557,7 +5944,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -7458,7 +7550,7 @@
fi
fi
-@@ -5502,23 +5968,36 @@
+@@ -5581,23 +5968,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -7499,7 +7591,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +6035,7 @@
+@@ -5635,7 +6035,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -7508,7 +7600,7 @@
;;
esac
-@@ -5574,7 +6053,7 @@
+@@ -5653,7 +6053,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -7517,7 +7609,7 @@
;;
*)
-@@ -5612,23 +6091,21 @@
+@@ -5691,23 +6091,21 @@
notinst_deplibs=
relink_command=
@@ -7550,7 +7642,7 @@
fi
finalize=yes
-@@ -5650,30 +6127,21 @@
+@@ -5729,30 +6127,21 @@
done
relink_command=
@@ -7590,7 +7682,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
-@@ -5697,7 +6165,7 @@
+@@ -5776,7 +6165,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -7599,7 +7691,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +6197,17 @@
+@@ -5808,16 +6197,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -7619,7 +7711,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +6221,9 @@
+@@ -5831,9 +6221,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -7631,7 +7723,7 @@
fi
;;
-@@ -5773,10 +6242,11 @@
+@@ -5852,10 +6242,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -7644,7 +7736,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,9 +6263,9 @@
+@@ -5872,9 +6263,9 @@
fi
# Exit here if they wanted silent mode.
@@ -7656,7 +7748,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5828,8 +6298,8 @@
+@@ -5907,8 +6298,8 @@
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -7667,7 +7759,7 @@
;;
# libtool execute mode
-@@ -5841,7 +6311,7 @@
+@@ -5920,7 +6311,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -7676,7 +7768,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +6319,7 @@
+@@ -5928,7 +6319,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -7685,7 +7777,7 @@
fi
dir=
-@@ -5860,7 +6330,7 @@
+@@ -5939,7 +6330,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7694,7 +7786,7 @@
fi
# Read the libtool library.
-@@ -5887,7 +6357,7 @@
+@@ -5966,7 +6357,7 @@
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -7703,7 +7795,7 @@
fi
;;
-@@ -5967,7 +6437,7 @@
+@@ -6046,7 +6437,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -7712,7 +7804,7 @@
fi
;;
-@@ -5995,7 +6465,7 @@
+@@ -6074,7 +6465,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -7721,7 +7813,7 @@
fi
rmdirs=
-@@ -6045,15 +6515,24 @@
+@@ -6124,15 +6515,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -7749,7 +7841,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6544,11 @@
+@@ -6144,10 +6544,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -7762,7 +7854,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6558,8 @@
+@@ -6157,7 +6558,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -7772,7 +7864,7 @@
fi
;;
-@@ -6107,7 +6588,7 @@
+@@ -6186,7 +6588,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -7781,7 +7873,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6633,20 @@
+@@ -6231,20 +6633,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -7805,7 +7897,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6682,7 @@
+@@ -6280,7 +6682,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -7814,7 +7906,7 @@
;;
clean)
-@@ -6313,6 +6794,8 @@
+@@ -6392,6 +6794,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
@@ -7823,7 +7915,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 +6837,14 @@
+@@ -6433,14 +6837,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -7840,7 +7932,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6375,12 +6858,11 @@
+@@ -6454,12 +6858,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Deleted: kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/10_gcc4.2_support.diff
Modified: kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/11_add_useractions_examples.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff 2007-05-11 12:33:22 UTC (rev 6147)
+++ kde-extras/krusader/tags/1.80.0~beta2-1/debian/patches/11_add_useractions_examples.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,9 +1,9 @@
diff -Nur krusader-1.80.0~beta1/krusader/useraction_examples.xml krusader-1.80.0~beta1.new/krusader/useraction_examples.xml
--- krusader-1.80.0~beta1/krusader/useraction_examples.xml 2006-03-19 23:05:26.000000000 +0100
+++ krusader-1.80.0~beta1.new/krusader/useraction_examples.xml 2007-01-07 17:47:43.000000000 +0100
-@@ -78,4 +78,97 @@
- <command>%aColSort("Modified")%</command>
- <defaultshortcut>Win+4</defaultshortcut>
+@@ -87,4 +87,97 @@
+ <command>%_Copy("%aCurrent%", "%_Ask("New filename", "%aCurrent%.old")%")%</command>
+ <defaultshortcut>Shift+F5</defaultshortcut>
</action>
+ <action name="archive2dir" >
+ <title>Archive to Dir</title>
Modified: kde-extras/krusader/trunk/debian/changelog
===================================================================
--- kde-extras/krusader/trunk/debian/changelog 2007-05-11 16:38:58 UTC (rev 6151)
+++ kde-extras/krusader/trunk/debian/changelog 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,11 +1,18 @@
-krusader (1.80.0~beta1-2) UNRELEASED; urgency=low
+krusader (1.80.0~beta2-1) unstable; urgency=low
- * NOT RELEASED YET
- * Update debian/watch
- * Robust get-orig-source target
+ * New upstream release.
- -- Mark Purcell <msp at debian.org> Sat, 3 Mar 2007 18:45:34 +0000
+ [Fathi Boudra]
+ * Update copyright.
+ * Remove gcc4.2 support patch. Merged upstream.
+ * Update useractions examples patch.
+ [Mark Purcell]
+ * Update debian/watch.
+ * Robust get-orig-source target.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 18:12:49 +0200
+
krusader (1.80.0~beta1-1) experimental; urgency=low
* Add debug package
Modified: kde-extras/krusader/trunk/debian/copyright
===================================================================
--- kde-extras/krusader/trunk/debian/copyright 2007-05-11 16:38:58 UTC (rev 6151)
+++ kde-extras/krusader/trunk/debian/copyright 2007-05-11 19:03:00 UTC (rev 6152)
@@ -40,6 +40,9 @@
Copyright for libisofs, licensed under the GPL:
(C) 2002 György Szombathelyi <gyurco at users.sourceforge.net>
+Copyright for kcmdmodebutton class:
+ (C) 2006 Vaclav Juza <vaclavjuza at gmail.com>
+
License:
This package is free software; you can redistribute it and/or modify
Modified: kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff 2007-05-11 16:38:58 UTC (rev 6151)
+++ kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,1095 +1,66 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile 2003-05-08 21:09:27.000000000 +0200
-+++ b/admin/compile 2007-01-07 17:41:38.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 2004-07-07 17:54:48.000000000 +0200
-+++ b/admin/depcomp 2007-01-07 17:41:38.000000000 +0100
-@@ -1,7 +1,9 @@
- #! /bin/sh
--
- # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+scriptversion=2005-07-09.11
-+
-+# 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 @@
-
- # 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
-@@ -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 2004-07-07 17:54:48.000000000 +0200
-+++ b/admin/install-sh 2007-01-07 17:41:38.000000000 +0100
-@@ -1,19 +1,38 @@
+--- a/admin/install-sh 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/install-sh 2007-05-11 20:27:29.000000000 +0200
+@@ -1,7 +1,7 @@
#!/bin/sh
--#
# install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
+
+-scriptversion=2005-11-07.23
+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 @@
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -58,21 +58,7 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
+-posix_glob=
+-posix_mkdir=
-
--while [ x"$1" != x ]; do
-- case $1 in
-- -c) instcmd=$cpprog
-- shift
-- continue;;
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
-
-- -d) dir_arg=true
-- shift
-- continue;;
+-# Desired mode of installed file.
+-mode=0755
-
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
-
-- -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;;
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -125,7 +111,7 @@
--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;;
+ --help) echo "$usage"; exit $?;;
--while [ $# -ne 0 ] ; do
-- pathcomp=$pathcomp$1
-+ -T) no_target_directory=true
- shift
-+ continue;;
+- -m) mode=$2
++ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+@@ -178,8 +164,6 @@
+ exit 0
+ fi
-- 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
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-
--if [ x"$dir_arg" != x ]
--then
-- $doit $instcmd "$dst" &&
+ for src
+ do
+ # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
-- 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
+ if test -n "$dir_arg"; then
+ dst=$src
+- dstdir=$dst
+- test -d "$dstdir"
+- dstdir_status=$?
+- else
+ src=
-+
+
+ if test -d "$dst"; then
+ mkdircmd=:
+ chmodcmd=
@@ -1097,42 +68,58 @@
+ 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
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+- dstdir=$dst
+- dst=$dstdir/`basename "$src"`
+- dstdir_status=0
+- else
+- # Prefer dirname, but fall back on a substitute if dirname fails.
+- dstdir=`
+- (dirname "$dst") 2>/dev/null ||
+- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$dst" : 'X\(//\)[^/]' \| \
+- X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+- echo X"$dst" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'
+- `
+-
+- test -d "$dstdir"
+- dstdir_status=$?
+ dst=$dst/`basename "$src"`
-+ fi
-+ fi
-+
+ fi
+ fi
+
+- obsolete_mkdir_used=false
+ # This sed command emulates the dirname command.
+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-+
+
+- if test $dstdir_status != 0; then
+- case $posix_mkdir in
+- '')
+- posix_mkdir=false
+- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+- posix_mkdir=true
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+- fi ;;
+- esac
+ # Make sure that the destination directory exists.
-+
+
+- if
+- $posix_mkdir && {
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
@@ -1145,12 +132,76 @@
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
+ IFS=$oIFS
-+
+
+- # With -d, create the new directory with the user-specified mode.
+- # Otherwise, create it using the same intermediate mode that
+- # mkdir -p would use when creating intermediate directories.
+- # POSIX says that this mode is "$(umask -S),u+wx", so use that
+- # if umask -S works.
+-
+- if test -n "$dir_arg"; then
+- mkdir_mode=$mode
+- else
+- case $intermediate_mode in
+- '')
+- if umask_S=`(umask -S) 2>/dev/null`; then
+- intermediate_mode=$umask_S,u+wx
+- else
+- intermediate_mode=$test_mode
+- fi ;;
+- esac
+- mkdir_mode=$intermediate_mode
+- fi
+-
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
+- then :
+- else
+ pathcomp=
-+
+
+- # mkdir does not conform to POSIX, or it failed possibly due to
+- # a race condition. Create the directory the slow way, step by
+- # step, checking for races as we go.
+-
+- case $dstdir in
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
+- esac
+-
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
+-
+- oIFS=$IFS
+- IFS=/
+- $posix_glob && set -f
+- set fnord $dstdir
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
-+ shift
+ shift
+- $posix_glob && set +f
+- IFS=$oIFS
+-
+- for d
+- do
+- test "x$d" = x && continue
+-
+- pathcomp=$pathcomp$d
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # Don't fail if two instances are running concurrently.
+- test -d "$pathcomp" || exit 1
+- fi
+- pathcomp=$pathcomp/
+- done
+- obsolete_mkdir_used=true
+- fi
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp"
+ # mkdir can fail with a `File exist' error in case several
@@ -1160,101 +211,101 @@
+ fi
+ pathcomp=$pathcomp/
+ done
-+ fi
-+
-+ if test -n "$dir_arg"; then
+ fi
+
+ if test -n "$dir_arg"; then
+- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
+ $doit $mkdircmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
-+ else
+ 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
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
+
+ # 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"; } \
+
+ # Copy the file name to the temp name.
+ $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+
-+ # Now rename the file to the real destination.
+
+ # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+ || {
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # 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.
-+ {
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+- if test -f "$dst"; then
+- $doit $rmcmd -f "$dst" 2>/dev/null \
+- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ if test -f "$dstdir/$dstfile"; then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+ || {
+ || {
+- echo "$0: cannot unlink or rename $dst" >&2
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+ (exit 1); exit 1
-+ }
-+ else
-+ :
-+ fi
-+ } &&
-+
-+ # Now rename the file to the real destination.
+ (exit 1); exit 1
+ }
+ else
+@@ -385,14 +304,17 @@
+ } &&
+
+ # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ }
+ }
+- } || exit 1
+-
+- trap '' 0
+- fi
+ }
+ fi || { (exit 1); exit 1; }
-+done
+ done
- # The final little trick to "correctly" pass the exit status to the exit trap.
--
- {
-- (exit 0); exit
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
+ (exit 0); exit 0
- }
++}
+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2003-05-08 21:09:28.000000000 +0200
-+++ b/admin/missing 2007-01-07 17:41:38.000000000 +0100
-@@ -1,6 +1,10 @@
+--- a/admin/missing 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/missing 2007-05-11 20:27:29.000000000 +0200
+@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+
+
+-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
-+
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
+ # 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 @@
+@@ -19,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
@@ -1265,213 +316,22 @@
# 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
+@@ -87,12 +87,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-+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>."
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing 0.4 - GNU automake"
-+ echo "missing $scriptversion (GNU Automake)"
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
+ 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
+@@ -288,11 +288,18 @@
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."
@@ -1493,493 +353,3 @@
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 2003-05-08 21:09:28.000000000 +0200
-+++ b/admin/mkinstalldirs 2007-01-07 17:41:38.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 2002-04-15 20:42:54.000000000 +0200
-+++ b/admin/ylwrap 2007-01-07 17:41:38.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: kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff 2007-05-11 16:38:58 UTC (rev 6151)
+++ kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
--- a/admin/libtool.m4.in 2006-01-15 12:08:34.000000000 +0100
-+++ b/admin/libtool.m4.in 2007-01-07 17:41:38.000000000 +0100
++++ b/admin/libtool.m4.in 2007-05-11 20:27:29.000000000 +0200
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3795,8 +3795,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 2006-01-15 12:08:34.000000000 +0100
-+++ b/admin/ltmain.sh 2007-01-07 17:41:38.000000000 +0100
+--- a/admin/ltmain.sh 2007-01-08 17:29:47.000000000 +0100
++++ b/admin/ltmain.sh 2007-05-11 20:27:29.000000000 +0200
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -3841,16 +3841,23 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@
+@@ -36,14 +64,7 @@
:
else
# Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-# Same for EGREP, and just to be sure, do LTCC as well
+-if test "x$EGREP" = x ; then
+- EGREP=egrep
+-fi
+-if test "x$LTCC" = x ; then
+- LTCC=${CC-gcc}
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +73,9 @@
+@@ -52,19 +73,9 @@
cat <<EOF
$*
EOF
@@ -3871,7 +3878,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -70,14 +88,15 @@
+@@ -77,14 +88,15 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
@@ -3894,7 +3901,7 @@
;;
esac
-@@ -94,12 +113,14 @@
+@@ -101,12 +113,14 @@
fi
# Make sure IFS has a sensible default
@@ -3911,7 +3918,7 @@
fi
# Global variables.
-@@ -111,6 +132,8 @@
+@@ -118,41 +132,60 @@
show="$echo"
show_help=
execute_dlfiles=
@@ -3920,7 +3927,31 @@
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
-@@ -118,10 +141,51 @@
+-if test -z "$max_cmd_len"; then
+- i=0
+- testring="ABCD"
+- new_result=
+-
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- max_cmd_len="$new_result" &&
+- test "$i" != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring="$testring$testring"
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- max_cmd_len=`expr $max_cmd_len \/ 2`
+-fi
+-
+ #####################################
# Shell function definitions:
# This seems to be the best place for them
@@ -3973,7 +4004,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +194,16 @@
+@@ -161,17 +194,16 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -3998,7 +4029,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,181 @@
+@@ -185,9 +217,181 @@
$echo $win32_libid_type
}
@@ -4180,7 +4211,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +411,13 @@
+@@ -207,12 +411,13 @@
;;
tag)
tagname="$arg"
@@ -4195,7 +4226,7 @@
;;
esac
-@@ -191,10 +427,10 @@
+@@ -222,10 +427,10 @@
# not specially marked.
;;
*)
@@ -4208,7 +4239,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -220,24 +456,25 @@
+@@ -251,24 +456,25 @@
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
@@ -4239,7 +4270,7 @@
;;
--dry-run | -n)
-@@ -256,7 +493,7 @@
+@@ -287,7 +493,7 @@
else
$echo "disable static libraries"
fi
@@ -4248,7 +4279,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +505,19 @@
+@@ -299,13 +505,19 @@
--quiet | --silent)
show=:
@@ -4269,7 +4300,7 @@
;;
-dlopen)
-@@ -285,7 +528,7 @@
+@@ -316,7 +528,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4278,7 +4309,7 @@
;;
*)
-@@ -298,9 +541,21 @@
+@@ -329,9 +541,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4301,7 +4332,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +566,7 @@
+@@ -342,7 +566,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4310,7 +4341,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +609,7 @@
+@@ -385,7 +609,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4319,7 +4350,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +624,15 @@
+@@ -400,13 +624,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4336,7 +4367,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +651,19 @@
+@@ -425,24 +651,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4366,7 +4397,7 @@
continue
;;
-@@ -424,7 +676,7 @@
+@@ -455,7 +676,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4375,7 +4406,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +714,10 @@
+@@ -493,7 +714,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4387,7 +4418,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +729,11 @@
+@@ -505,11 +729,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -4401,7 +4432,7 @@
;;
*)
# Get the name of the library object.
-@@ -511,51 +766,39 @@
+@@ -542,51 +766,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -4480,7 +4511,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +811,7 @@
+@@ -599,7 +811,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -4489,7 +4520,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +822,7 @@
+@@ -610,7 +822,7 @@
fi
$run $rm $removelist
@@ -4498,7 +4529,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +841,7 @@
+@@ -629,7 +841,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -4507,7 +4538,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +851,7 @@
+@@ -639,7 +851,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -4516,7 +4547,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +869,19 @@
+@@ -657,14 +869,19 @@
compiler."
$run $rm $removelist
@@ -4538,7 +4569,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +903,18 @@
+@@ -686,18 +903,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -4562,7 +4593,7 @@
fi
fi
-@@ -681,7 +929,7 @@
+@@ -712,7 +929,7 @@
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -4571,7 +4602,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +949,7 @@
+@@ -732,7 +949,7 @@
compiler."
$run $rm $removelist
@@ -4580,7 +4611,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +970,9 @@
+@@ -753,7 +970,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -4591,7 +4622,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +986,9 @@
+@@ -767,9 +986,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -4603,7 +4634,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1001,7 @@
+@@ -782,7 +1001,7 @@
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -4612,7 +4643,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1021,7 @@
+@@ -802,7 +1021,7 @@
compiler."
$run $rm $removelist
@@ -4621,7 +4652,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1059,7 @@
+@@ -840,7 +1059,7 @@
$run $rm "$lockfile"
fi
@@ -4630,7 +4661,7 @@
;;
# libtool link mode
-@@ -835,7 +1085,7 @@
+@@ -866,7 +1085,7 @@
;;
esac
libtool_args="$nonopt"
@@ -4639,7 +4670,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1097,6 @@
+@@ -878,7 +1097,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -4647,7 +4678,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1117,8 @@
+@@ -899,6 +1117,8 @@
no_install=no
objs=
non_pic_objects=
@@ -4656,7 +4687,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,6 +1132,8 @@
+@@ -912,6 +1132,8 @@
vinfo=
vinfo_number=no
@@ -4665,7 +4696,7 @@
# We need to know -static, to get the right output filenames.
for arg
do
-@@ -893,14 +1146,15 @@
+@@ -924,14 +1146,15 @@
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
@@ -4682,7 +4713,7 @@
break
;;
esac
-@@ -912,7 +1166,6 @@
+@@ -943,7 +1166,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -4690,7 +4721,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1229,7 @@
+@@ -1007,7 +1229,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -4699,7 +4730,7 @@
fi
prev=
continue
-@@ -991,6 +1244,11 @@
+@@ -1022,6 +1244,11 @@
prev=
continue
;;
@@ -4711,7 +4742,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1281,7 @@
+@@ -1054,7 +1281,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4720,7 +4751,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1329,17 @@
+@@ -1102,12 +1329,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -4739,7 +4770,7 @@
else
# Dry-run case.
-@@ -1097,7 +1360,7 @@
+@@ -1128,7 +1360,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -4748,7 +4779,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1372,7 @@
+@@ -1140,7 +1372,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4757,7 +4788,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1412,15 @@
+@@ -1180,16 +1412,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -4783,7 +4814,7 @@
prev=
continue
;;
-@@ -1210,7 +1472,7 @@
+@@ -1241,7 +1472,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -4792,7 +4823,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1482,18 @@
+@@ -1251,6 +1482,18 @@
continue
;;
@@ -4811,7 +4842,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1520,8 @@
+@@ -1277,7 +1520,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -4821,7 +4852,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1535,15 @@
+@@ -1291,10 +1535,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -4837,7 +4868,7 @@
;;
esac
continue
-@@ -1272,26 +1552,35 @@
+@@ -1303,26 +1552,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -4878,7 +4909,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1301,18 +1590,41 @@
+@@ -1332,18 +1590,41 @@
continue
;;
@@ -4927,7 +4958,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1635,7 @@
+@@ -1354,9 +1635,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -4938,7 +4969,7 @@
continue
;;
-@@ -1365,6 +1675,11 @@
+@@ -1396,6 +1675,11 @@
-o) prev=output ;;
@@ -4950,7 +4981,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1702,7 @@
+@@ -1418,7 +1702,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4959,7 +4990,7 @@
;;
esac
case "$xrpath " in
-@@ -1473,11 +1788,6 @@
+@@ -1504,11 +1788,6 @@
continue
;;
@@ -4971,7 +5002,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1798,6 @@
+@@ -1519,7 +1798,6 @@
arg="\"$arg\""
;;
esac
@@ -4979,7 +5010,7 @@
;;
*.$objext)
-@@ -1516,7 +1825,7 @@
+@@ -1547,7 +1825,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4988,7 +5019,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1564,12 +1873,17 @@
+@@ -1595,12 +1873,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5007,7 +5038,7 @@
else
# Dry-run case.
-@@ -1623,7 +1937,6 @@
+@@ -1654,7 +1937,6 @@
arg="\"$arg\""
;;
esac
@@ -5015,7 +5046,7 @@
;;
esac # arg
-@@ -1637,48 +1950,7 @@
+@@ -1668,48 +1950,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5065,7 +5096,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +1983,9 @@
+@@ -1742,9 +1983,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5078,7 +5109,7 @@
fi
fi
-@@ -1722,7 +1994,7 @@
+@@ -1753,7 +1994,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5087,7 +5118,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2004,7 @@
+@@ -1763,7 +2004,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5096,7 +5127,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1776,7 +2048,6 @@
+@@ -1807,7 +2048,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5104,7 +5135,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1785,7 +2056,7 @@
+@@ -1816,7 +2056,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5113,7 +5144,7 @@
;;
esac
done
-@@ -1811,7 +2082,10 @@
+@@ -1842,7 +2082,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5125,7 +5156,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2097,23 @@
+@@ -1854,18 +2097,23 @@
lib=
found=no
case $deplib in
@@ -5154,7 +5185,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2174,6 @@
+@@ -1926,18 +2174,6 @@
fi
fi
;; # -l
@@ -5173,7 +5204,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2189,11 @@
+@@ -1953,11 +2189,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5186,7 +5217,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2221,22 @@
+@@ -1985,7 +2221,22 @@
fi
case $linkmode in
lib)
@@ -5210,7 +5241,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2286,15 @@
+@@ -2035,15 +2286,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5229,7 +5260,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2310,8 @@
+@@ -2059,6 +2310,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5238,7 +5269,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2319,6 @@
+@@ -2066,13 +2319,6 @@
*) . ./$lib ;;
esac
@@ -5252,7 +5283,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2329,32 @@
+@@ -2083,33 +2329,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5299,7 +5330,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2362,18 @@
+@@ -2117,16 +2362,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5321,7 +5352,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 +2410,19 @@
+@@ -2163,11 +2410,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5345,7 +5376,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2430,7 @@
+@@ -2175,7 +2430,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -5354,7 +5385,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2457,7 @@
+@@ -2202,7 +2457,7 @@
continue
fi
@@ -5363,7 +5394,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2209,12 +2495,12 @@
+@@ -2240,12 +2495,12 @@
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
# We need to hardcode the library path
@@ -5378,7 +5409,7 @@
esac
fi
-@@ -2251,24 +2537,29 @@
+@@ -2282,24 +2537,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -5414,7 +5445,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2617,10 @@
+@@ -2357,9 +2617,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5426,7 +5457,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2631,10 @@
+@@ -2370,9 +2631,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5438,7 +5469,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2362,11 +2655,15 @@
+@@ -2393,11 +2655,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -5458,7 +5489,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2671,7 @@
+@@ -2405,7 +2671,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -5467,7 +5498,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2694,9 @@
+@@ -2428,9 +2694,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5479,7 +5510,7 @@
;;
esac
fi
-@@ -2416,7 +2713,7 @@
+@@ -2447,7 +2713,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -5488,7 +5519,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2756,8 @@
+@@ -2490,7 +2756,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5498,7 +5529,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2767,9 @@
+@@ -2500,9 +2767,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -5510,7 +5541,7 @@
;;
esac
fi
-@@ -2530,17 +2828,16 @@
+@@ -2561,17 +2828,16 @@
fi
fi
else
@@ -5532,7 +5563,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2851,7 @@
+@@ -2585,7 +2851,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -5541,7 +5572,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2893,18 @@
+@@ -2627,20 +2893,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
@@ -5566,7 +5597,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 +2912,45 @@
+@@ -2648,55 +2912,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -5642,7 +5673,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +3037,8 @@
+@@ -2783,7 +3037,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -5652,7 +5683,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3098,19 @@
+@@ -2843,19 +3098,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -5675,7 +5706,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3121,7 @@
+@@ -2866,7 +3121,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
@@ -5684,7 +5715,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3169,13 @@
+@@ -2914,13 +3169,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -5700,7 +5731,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2918,6 +3204,11 @@
+@@ -2949,6 +3204,11 @@
age="$number_minor"
revision="$number_minor"
;;
@@ -5712,7 +5743,7 @@
esac
;;
no)
-@@ -2929,36 +3220,36 @@
+@@ -2960,36 +3220,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -5759,7 +5790,7 @@
fi
# Calculate the version variables.
-@@ -2975,7 +3266,7 @@
+@@ -3006,7 +3266,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -5768,7 +5799,7 @@
;;
freebsd-aout)
-@@ -3047,7 +3338,7 @@
+@@ -3078,7 +3338,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -5777,7 +5808,7 @@
;;
esac
-@@ -3098,9 +3389,15 @@
+@@ -3129,9 +3389,15 @@
tempremovelist=`$echo "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
@@ -5794,7 +5825,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3122,9 +3419,9 @@
+@@ -3153,9 +3419,9 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
@@ -5807,7 +5838,7 @@
done
if test -n "$xrpath"; then
-@@ -3137,7 +3434,7 @@
+@@ -3168,7 +3434,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -5816,7 +5847,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,14 +3467,19 @@
+@@ -3201,14 +3467,19 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -5839,7 +5870,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3221,11 +3523,11 @@
+@@ -3252,11 +3523,11 @@
int main() { return 0; }
EOF
$rm conftest
@@ -5853,7 +5884,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,11 +3564,11 @@
+@@ -3293,11 +3564,11 @@
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
@@ -5867,7 +5898,7 @@
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
-@@ -3314,7 +3616,7 @@
+@@ -3345,7 +3616,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5876,7 +5907,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 +3685,7 @@
+@@ -3414,7 +3685,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5885,7 +5916,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 +3765,7 @@
+@@ -3494,7 +3765,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -5894,7 +5925,7 @@
;;
esac
-@@ -3509,17 +3811,39 @@
+@@ -3540,17 +3811,39 @@
fi
fi
fi
@@ -5941,7 +5972,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3532,7 +3856,7 @@
+@@ -3563,7 +3856,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -5950,7 +5981,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3587,7 +3911,7 @@
+@@ -3618,7 +3911,7 @@
fi
# Get the real and link names of the library.
@@ -5959,7 +5990,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3603,6 +3927,7 @@
+@@ -3634,6 +3927,7 @@
fi
lib="$output_objdir/$realname"
@@ -5967,7 +5998,7 @@
for link
do
linknames="$linknames $link"
-@@ -3617,10 +3942,11 @@
+@@ -3648,10 +3942,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -5980,7 +6011,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +3956,9 @@
+@@ -3661,6 +3956,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -5990,7 +6021,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +3979,12 @@
+@@ -3681,12 +3979,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6005,7 +6036,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +3992,13 @@
+@@ -3694,67 +3992,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6076,7 +6107,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 +4009,27 @@
+@@ -3765,31 +4009,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6118,7 +6149,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +4048,7 @@
+@@ -3808,6 +4048,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -6126,7 +6157,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +4058,13 @@
+@@ -3817,13 +4058,13 @@
delfiles=
last_robj=
k=1
@@ -6142,7 +6173,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +4078,9 @@
+@@ -3837,9 +4078,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6154,7 +6185,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +4100,13 @@
+@@ -3859,13 +4100,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6170,7 +6201,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4131,54 @@
+@@ -3890,28 +4131,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6230,7 +6261,7 @@
fi
# Create links to the real library.
-@@ -3928,7 +4226,7 @@
+@@ -3959,7 +4226,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6239,7 +6270,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3957,64 +4255,10 @@
+@@ -3988,64 +4255,10 @@
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
@@ -6306,7 +6337,7 @@
fi
fi
-@@ -4022,10 +4266,11 @@
+@@ -4053,10 +4266,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"
@@ -6319,7 +6350,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4283,7 @@
+@@ -4069,7 +4283,7 @@
$run ${rm}r $gentop
fi
@@ -6328,7 +6359,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4296,18 @@
+@@ -4082,17 +4296,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -6349,7 +6380,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4319,7 @@
+@@ -4104,7 +4319,7 @@
$run ${rm}r $gentop
fi
@@ -6358,7 +6389,7 @@
;;
prog)
-@@ -4098,24 +4344,50 @@
+@@ -4129,24 +4344,50 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6415,7 +6446,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4160,10 +4432,15 @@
+@@ -4191,10 +4432,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -6431,7 +6462,7 @@
;;
esac
done
-@@ -4277,13 +4554,25 @@
+@@ -4308,13 +4554,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -6461,7 +6492,7 @@
fi
fi
-@@ -4334,7 +4623,26 @@
+@@ -4365,7 +4623,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -6488,7 +6519,7 @@
const char *name;
lt_ptr address;
}
-@@ -4381,20 +4689,33 @@
+@@ -4412,20 +4689,33 @@
esac
# Now compile the dynamic symbol file.
@@ -6527,7 +6558,7 @@
;;
esac
else
-@@ -4407,17 +4728,6 @@
+@@ -4438,17 +4728,6 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
@@ -6545,7 +6576,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'`
-@@ -4426,7 +4736,7 @@
+@@ -4457,7 +4736,7 @@
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
@@ -6554,7 +6585,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4434,7 +4744,7 @@
+@@ -4465,7 +4744,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -6563,7 +6594,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4493,7 +4803,7 @@
+@@ -4524,7 +4803,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -6572,7 +6603,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4548,10 +4858,10 @@
+@@ -4579,10 +4858,10 @@
fi
# Quote $echo for shipping.
@@ -6587,7 +6618,7 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4883,13 @@
+@@ -4604,11 +4883,13 @@
*) exeext= ;;
esac
case $host in
@@ -6606,7 +6637,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4898,7 @@
+@@ -4617,7 +4898,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -6615,7 +6646,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4602,6 +4914,9 @@
+@@ -4633,6 +4914,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -6625,7 +6656,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4927,19 @@
+@@ -4643,15 +4927,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -6650,7 +6681,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4949,32 @@
+@@ -4661,17 +4949,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -6685,7 +6716,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4649,30 +4983,52 @@
+@@ -4680,30 +4983,52 @@
{
char **newargz;
int i;
@@ -6747,7 +6778,7 @@
}
void *
-@@ -4685,59 +5041,159 @@
+@@ -4716,59 +5041,159 @@
return p;
}
@@ -6778,10 +6809,8 @@
base = name + 1;
- return (char *) base;
+ return base;
- }
-
--char *
--fnqualify(const char *path)
++}
++
+int
+check_executable(const char * path)
+{
@@ -6805,8 +6834,10 @@
+ return 1;
+ else
+ return 0;
-+}
-+
+ }
+
+-char *
+-fnqualify(const char *path)
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise */
+char *
@@ -6821,14 +6852,14 @@
char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char* concat_name;
-+
+
+- assert(path != NULL);
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-- assert(path != NULL);
+- /* Is it qualified already? */
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
-
-- /* Is it qualified already? */
++
+ /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
@@ -6929,7 +6960,7 @@
{
size_t len, patlen;
-@@ -4757,7 +5213,7 @@
+@@ -4788,7 +5213,7 @@
}
static void
@@ -6938,7 +6969,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5233,16 @@
+@@ -4808,16 +5233,16 @@
va_end (ap);
}
EOF
@@ -6965,7 +6996,7 @@
$echo > $output "\
#! $SHELL
-@@ -4807,7 +5263,7 @@
+@@ -4838,7 +5263,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -6974,7 +7005,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5342,7 @@
+@@ -4917,7 +5342,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -6983,7 +7014,7 @@
fi
fi
-@@ -4936,34 +5392,32 @@
+@@ -4967,34 +5392,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -7024,7 +7055,7 @@
;;
esac
-@@ -4986,78 +5440,78 @@
+@@ -5017,78 +5440,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7164,7 +7195,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5520,18 @@
+@@ -5097,31 +5520,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7199,7 +7230,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5539,7 @@
+@@ -5129,7 +5539,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7208,7 +7239,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5550,13 @@
+@@ -5140,12 +5550,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7223,7 +7254,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5588,13 @@
+@@ -5177,11 +5588,13 @@
fi
done
# Quote the link command for shipping.
@@ -7240,16 +7271,66 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5612,7 @@
+@@ -5199,55 +5612,11 @@
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
- exit 1
+- fi
+- if test "x$EGREP" = x ; then
+- EGREP=egrep
+- fi
+- # We do not want portage's install root ($D) present. Check only for
+- # this if the .la is being installed.
+- if test "$installed" = yes && test "$D"; then
+- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$libdir/$name"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_1"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
+- fi
+- ;;
+- *)
+- if test "$installed" = yes; then
+- # Rather use S=WORKDIR if our version of portage supports it.
+- # This is because some ebuild (gcc) do not use $S as buildroot.
+- if test "$PWORKDIR"; then
+- S="$PWORKDIR"
+- fi
+- # We do not want portage's build root ($S) present.
+- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+- # We do not want portage's install root ($D) present.
+- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+- if test -n "$my_little_ninja_foo_2" && test "$S"; then
+- mynewdependency_lib=""
+- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_4"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
+ exit $EXIT_FAILURE
fi
- newdependency_libs="$newdependency_libs $libdir/$name"
++ newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5626,7 @@
++ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+@@ -5257,7 +5626,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
@@ -7258,7 +7339,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5637,30 @@
+@@ -5268,11 +5637,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
@@ -7290,7 +7371,18 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5704,7 @@
+@@ -5280,10 +5668,6 @@
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+- # Do not add duplicates
+- if test "$installed" = yes && test "$D"; then
+- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- fi
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5320,7 +5704,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -7299,7 +7391,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5717,7 @@
+@@ -5333,7 +5717,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -7308,7 +7400,7 @@
;;
# libtool install mode
-@@ -5265,11 +5728,11 @@
+@@ -5344,11 +5728,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -7322,7 +7414,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5741,14 @@
+@@ -5357,14 +5741,14 @@
shift
else
install_prog=
@@ -7339,7 +7431,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5766,31 @@
+@@ -5382,28 +5766,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -7379,7 +7471,7 @@
continue
fi
;;
-@@ -5333,7 +5799,7 @@
+@@ -5412,7 +5799,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -7388,7 +7480,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5809,13 @@
+@@ -5422,13 +5809,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -7404,7 +7496,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5825,7 @@
+@@ -5438,7 +5825,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -7413,7 +7505,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5846,7 @@
+@@ -5459,7 +5846,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -7422,7 +7514,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5858,7 @@
+@@ -5471,7 +5858,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -7431,7 +7523,7 @@
;;
esac
done
-@@ -5421,7 +5887,7 @@
+@@ -5500,7 +5887,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7440,7 +7532,7 @@
fi
library_names=
-@@ -5463,7 +5929,7 @@
+@@ -5542,7 +5929,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
@@ -7449,7 +7541,7 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5478,7 +5944,7 @@
+@@ -5557,7 +5944,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -7458,7 +7550,7 @@
fi
fi
-@@ -5502,23 +5968,36 @@
+@@ -5581,23 +5968,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -7499,7 +7591,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +6035,7 @@
+@@ -5635,7 +6035,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -7508,7 +7600,7 @@
;;
esac
-@@ -5574,7 +6053,7 @@
+@@ -5653,7 +6053,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -7517,7 +7609,7 @@
;;
*)
-@@ -5612,23 +6091,21 @@
+@@ -5691,23 +6091,21 @@
notinst_deplibs=
relink_command=
@@ -7550,7 +7642,7 @@
fi
finalize=yes
-@@ -5650,30 +6127,21 @@
+@@ -5729,30 +6127,21 @@
done
relink_command=
@@ -7590,7 +7682,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
-@@ -5697,7 +6165,7 @@
+@@ -5776,7 +6165,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -7599,7 +7691,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +6197,17 @@
+@@ -5808,16 +6197,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -7619,7 +7711,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +6221,9 @@
+@@ -5831,9 +6221,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -7631,7 +7723,7 @@
fi
;;
-@@ -5773,10 +6242,11 @@
+@@ -5852,10 +6242,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -7644,7 +7736,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,9 +6263,9 @@
+@@ -5872,9 +6263,9 @@
fi
# Exit here if they wanted silent mode.
@@ -7656,7 +7748,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5828,8 +6298,8 @@
+@@ -5907,8 +6298,8 @@
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -7667,7 +7759,7 @@
;;
# libtool execute mode
-@@ -5841,7 +6311,7 @@
+@@ -5920,7 +6311,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -7676,7 +7768,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +6319,7 @@
+@@ -5928,7 +6319,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -7685,7 +7777,7 @@
fi
dir=
-@@ -5860,7 +6330,7 @@
+@@ -5939,7 +6330,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7694,7 +7786,7 @@
fi
# Read the libtool library.
-@@ -5887,7 +6357,7 @@
+@@ -5966,7 +6357,7 @@
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -7703,7 +7795,7 @@
fi
;;
-@@ -5967,7 +6437,7 @@
+@@ -6046,7 +6437,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -7712,7 +7804,7 @@
fi
;;
-@@ -5995,7 +6465,7 @@
+@@ -6074,7 +6465,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -7721,7 +7813,7 @@
fi
rmdirs=
-@@ -6045,15 +6515,24 @@
+@@ -6124,15 +6515,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -7749,7 +7841,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6544,11 @@
+@@ -6144,10 +6544,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -7762,7 +7854,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6558,8 @@
+@@ -6157,7 +6558,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -7772,7 +7864,7 @@
fi
;;
-@@ -6107,7 +6588,7 @@
+@@ -6186,7 +6588,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -7781,7 +7873,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6633,20 @@
+@@ -6231,20 +6633,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -7805,7 +7897,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6682,7 @@
+@@ -6280,7 +6682,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -7814,7 +7906,7 @@
;;
clean)
-@@ -6313,6 +6794,8 @@
+@@ -6392,6 +6794,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
@@ -7823,7 +7915,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 +6837,14 @@
+@@ -6433,14 +6837,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -7840,7 +7932,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6375,12 +6858,11 @@
+@@ -6454,12 +6858,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Deleted: kde-extras/krusader/trunk/debian/patches/10_gcc4.2_support.diff
Modified: kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff
===================================================================
--- kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff 2007-05-11 16:38:58 UTC (rev 6151)
+++ kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff 2007-05-11 19:03:00 UTC (rev 6152)
@@ -1,9 +1,9 @@
diff -Nur krusader-1.80.0~beta1/krusader/useraction_examples.xml krusader-1.80.0~beta1.new/krusader/useraction_examples.xml
--- krusader-1.80.0~beta1/krusader/useraction_examples.xml 2006-03-19 23:05:26.000000000 +0100
+++ krusader-1.80.0~beta1.new/krusader/useraction_examples.xml 2007-01-07 17:47:43.000000000 +0100
-@@ -78,4 +78,97 @@
- <command>%aColSort("Modified")%</command>
- <defaultshortcut>Win+4</defaultshortcut>
+@@ -87,4 +87,97 @@
+ <command>%_Copy("%aCurrent%", "%_Ask("New filename", "%aCurrent%.old")%")%</command>
+ <defaultshortcut>Shift+F5</defaultshortcut>
</action>
+ <action name="archive2dir" >
+ <title>Archive to Dir</title>
More information about the pkg-kde-commits
mailing list