rev 14014 - in branches/kdebase-legacy/kdebase/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Mar 7 22:14:24 UTC 2009
Author: fabo
Date: 2009-03-07 22:14:01 +0000 (Sat, 07 Mar 2009)
New Revision: 14014
Added:
branches/kdebase-legacy/kdebase/debian/patches/02_autotools_update.diff
branches/kdebase-legacy/kdebase/debian/patches/03_libtool_update.diff
branches/kdebase-legacy/kdebase/debian/patches/04_am_maintainer_mode.diff
branches/kdebase-legacy/kdebase/debian/patches/05_pedantic-errors.diff
branches/kdebase-legacy/kdebase/debian/patches/06_disable_no_undefined.diff
branches/kdebase-legacy/kdebase/debian/patches/77_fix_ftbfs_ucred_redefinition.diff
Removed:
branches/kdebase-legacy/kdebase/debian/patches/01_kdebase_branch_r829407.diff
branches/kdebase-legacy/kdebase/debian/patches/common/
Modified:
branches/kdebase-legacy/kdebase/debian/changelog
branches/kdebase-legacy/kdebase/debian/control
branches/kdebase-legacy/kdebase/debian/patches/01_admin_cleanup.diff
branches/kdebase-legacy/kdebase/debian/patches/10_kdmrc_defaults.diff
branches/kdebase-legacy/kdebase/debian/patches/11_genkdmconf.diff
branches/kdebase-legacy/kdebase/debian/patches/14_kdm_no_custom.diff
branches/kdebase-legacy/kdebase/debian/patches/15_cups_docroot.diff
branches/kdebase-legacy/kdebase/debian/patches/16_kdm_X_path.diff
branches/kdebase-legacy/kdebase/debian/patches/18_default_fonts.diff
branches/kdebase-legacy/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
branches/kdebase-legacy/kdebase/debian/patches/20_applications_menu_move.diff
branches/kdebase-legacy/kdebase/debian/patches/23_startkde_kpersonalizer.diff
branches/kdebase-legacy/kdebase/debian/patches/25_khelp_htdig.diff
branches/kdebase-legacy/kdebase/debian/patches/26_face_load.diff
branches/kdebase-legacy/kdebase/debian/patches/27_kfreebsd_sysguard.diff
branches/kdebase-legacy/kdebase/debian/patches/28_kdebase_rubberband.diff
branches/kdebase-legacy/kdebase/debian/patches/34_japanese_konsole_fix.diff
branches/kdebase-legacy/kdebase/debian/patches/38_furry_frosted_animals_support.diff
branches/kdebase-legacy/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff
branches/kdebase-legacy/kdebase/debian/patches/45_klipper_backreferences.diff
branches/kdebase-legacy/kdebase/debian/patches/46_disable_debug_by_default.diff
branches/kdebase-legacy/kdebase/debian/patches/54_seli_xinerama.diff
branches/kdebase-legacy/kdebase/debian/patches/55_kwin_xinerama_xrandr1.2.diff
branches/kdebase-legacy/kdebase/debian/patches/61_khelpcenter_max_results.diff
branches/kdebase-legacy/kdebase/debian/patches/70_kdm_consolekit.diff
branches/kdebase-legacy/kdebase/debian/patches/71_kio_man_utf8.diff
branches/kdebase-legacy/kdebase/debian/patches/72_fix_bashism.diff
branches/kdebase-legacy/kdebase/debian/patches/73_doc_482268.diff
branches/kdebase-legacy/kdebase/debian/patches/74_kdeprint_only_in_kde.diff
branches/kdebase-legacy/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
branches/kdebase-legacy/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
branches/kdebase-legacy/kdebase/debian/patches/97_automake_cleanup.diff
branches/kdebase-legacy/kdebase/debian/patches/98_buildprep.diff
branches/kdebase-legacy/kdebase/debian/patches/series
Log:
* New upstream release.
* Adjust patches to new release:
- 55_kwin_xinerama_xrandr1.2.diff
- 97_automake_cleanup.diff
* Add 77_fix_ftbfs_ucred_redefinition.diff patch. (Closes: #517566)
It fixes ftbfs when glibc >= 2.8 is used, by removing ucred declaration.
This code is outdated and used for glibc < 2.0.
* Build against newer libraw1394 >= 2.0.2. (Closes: #518475)
Modified: branches/kdebase-legacy/kdebase/debian/changelog
===================================================================
--- branches/kdebase-legacy/kdebase/debian/changelog 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/changelog 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,3 +1,16 @@
+kdebase (4:3.5.10.dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Adjust patches to new release:
+ - 55_kwin_xinerama_xrandr1.2.diff
+ - 97_automake_cleanup.diff
+ * Add 77_fix_ftbfs_ucred_redefinition.diff patch. (Closes: #517566)
+ It fixes ftbfs when glibc >= 2.8 is used, by removing ucred declaration.
+ This code is outdated and used for glibc < 2.0.
+ * Build against newer libraw1394 >= 2.0.2. (Closes: #518475)
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 07 Mar 2009 19:21:07 +0100
+
kdebase (4:3.5.9.dfsg.1-6) unstable; urgency=high
* Force iocharset to iso-8859-1 when mouting fat devices. (Closes: #500540)
Modified: branches/kdebase-legacy/kdebase/debian/control
===================================================================
--- branches/kdebase-legacy/kdebase/debian/control 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/control 2009-03-07 22:14:01 UTC (rev 14014)
@@ -11,7 +11,7 @@
libxkbfile-dev, libxxf86misc-dev, libxss-dev, libxtst-dev,
libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev (>= 2.0.2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Modified: branches/kdebase-legacy/kdebase/debian/patches/01_admin_cleanup.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/01_admin_cleanup.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/01_admin_cleanup.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
---- kde/admin/acinclude.m4.in 2008-02-24 17:19:06.000000000 +0200
-+++ kde/admin/acinclude.m4.in 2008-03-08 18:58:20.000000000 +0200
-@@ -1615,6 +1615,11 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1613,6 +1613,11 @@ for a in $qt_libdir/lib`echo ${kde_int_q
fi
done
@@ -12,7 +12,7 @@
AC_SUBST(LIB_QT)
AC_SUBST(LIB_QPE)
-@@ -2698,7 +2703,7 @@
+@@ -2708,7 +2713,7 @@ AC_TRY_LINK(dnl
],
[return (TIFFOpen( "", "r") == 0); ],
[
@@ -21,7 +21,7 @@
], [
kde_cv_libtiff_$1=no
])
-@@ -2762,7 +2767,8 @@
+@@ -2772,7 +2777,8 @@ AC_CACHE_VAL(ac_cv_libexr,
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
@@ -31,7 +31,7 @@
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
-@@ -2778,7 +2784,7 @@
+@@ -2788,7 +2794,7 @@ AC_CACHE_VAL(ac_cv_libexr,
RgbaInputFile file ("dummy");
return 0;
],
@@ -40,7 +40,7 @@
eval "ac_cv_libexr=no"
)
LIBS="$kde_save_LIBS"
-@@ -2787,7 +2793,7 @@
+@@ -2797,7 +2803,7 @@ AC_CACHE_VAL(ac_cv_libexr,
])dnl
if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
@@ -49,7 +49,7 @@
AC_MSG_RESULT($ac_cv_libexr)
else
AC_MSG_RESULT(no)
-@@ -2854,7 +2860,7 @@
+@@ -2864,7 +2870,7 @@ AC_MSG_CHECKING([for jasper])
AC_CACHE_VAL(ac_cv_jasper,
[
kde_save_LIBS="$LIBS"
@@ -58,7 +58,7 @@
kde_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-@@ -2865,7 +2871,7 @@
+@@ -2875,7 +2881,7 @@ AC_TRY_LINK(dnl
[
return( jas_init() );
],
@@ -67,7 +67,7 @@
eval "ac_cv_jasper=no"
)
LIBS="$kde_save_LIBS"
-@@ -4124,7 +4130,7 @@
+@@ -4136,7 +4142,7 @@ Make sure you have the necessary develop
fi
else
AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
@@ -76,7 +76,7 @@
use_pam=yes
dnl darwin claims to be something special
-@@ -4488,7 +4494,7 @@
+@@ -4498,7 +4504,7 @@ AC_CACHE_VAL(kde_cv_try_link_python_$1,
kde_save_cflags="$CFLAGS"
CFLAGS="$CFLAGS $PYTHONINC"
kde_save_libs="$LIBS"
@@ -85,7 +85,7 @@
kde_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PYTHONLIB"
-@@ -4626,7 +4632,7 @@
+@@ -4636,7 +4642,7 @@ else
and contact the authors to let them know about this problem])
])
@@ -94,32 +94,3 @@
AC_SUBST(PYTHONINC)
AC_SUBST(PYTHONLIB)
AC_SUBST(LIBPYTHON)
---- kde/admin/ltmain.sh 2008-02-24 17:49:46.000000000 +0200
-+++ kde/admin/ltmain.sh 2008-02-24 16:51:22.000000000 +0200
-@@ -2377,16 +2377,16 @@
- # It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
-- tmp_libs=
-- for deplib in $dependency_libs; do
-- deplibs="$deplib $deplibs"
-- if test "X$duplicate_deps" = "Xyes" ; then
-- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-- esac
-- fi
-- tmp_libs="$tmp_libs $deplib"
-- done
-+# tmp_libs=
-+# for deplib in $dependency_libs; do
-+# deplibs="$deplib $deplibs"
-+# if test "X$duplicate_deps" = "Xyes" ; then
-+# case "$tmp_libs " in
-+# *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+# esac
-+# fi
-+# tmp_libs="$tmp_libs $deplib"
-+# done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- $echo "$modename: \`$lib' is not a convenience library" 1>&2
- exit $EXIT_FAILURE
Deleted: branches/kdebase-legacy/kdebase/debian/patches/01_kdebase_branch_r829407.diff
Added: branches/kdebase-legacy/kdebase/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/02_autotools_update.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/02_autotools_update.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,1071 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp 2009-03-07 18:40:16.000000000 +0100
++++ b/admin/depcomp 2009-03-07 18:48:34.000000000 +0100
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2007-03-29.01
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -201,34 +215,39 @@
+ # 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"
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$base.u
++ tmpdepfile3=$dir.libs/$base.u
+ "$@" -Wc,-M
+ else
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$dir$base.u
++ tmpdepfile3=$dir$base.u
+ "$@" -M
+ fi
+ 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"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ 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:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -276,6 +295,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +347,13 @@
+
+ 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
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+diff -Nrua a/admin/install-sh b/admin/install-sh
+--- a/admin/install-sh 2009-03-07 18:40:16.000000000 +0100
++++ b/admin/install-sh 2009-03-07 18:48:34.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2005-11-07.23
++scriptversion=2006-12-25.00
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -39,52 +39,68 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
+-posix_glob=
+ posix_mkdir=
+
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
+-
+ # Desired mode of installed file.
+ mode=0755
+
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
+-
++chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+-chgrpcmd=
+-stripcmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+@@ -94,81 +110,86 @@
+ 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.
++ --help display this help and exit.
++ --version display version info and exit.
++
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
+ "
+
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+- -c) shift
+- continue;;
++ -c) ;;
+
+- -d) dir_arg=true
+- shift
+- continue;;
++ -C) copy_on_change=true;;
++
++ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- shift
+- shift
+- continue;;
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
+-
+- -T) no_target_directory=true
+- shift
+- continue;;
++ shift;;
++
++ -s) stripcmd=$stripprog;;
++
++ -t) dst_arg=$2
++ shift;;
++
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # 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
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
++ shift
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dst_arg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dst_arg"
++ shift # fnord
++ fi
++ shift # arg
++ dst_arg=$arg
++ done
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,13 +199,38 @@
+ exit 0
+ fi
+
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
+ for src
+ do
+ # Protect names starting with `-'.
+ case $src in
+- -*) src=./$src ;;
++ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -202,22 +248,22 @@
+ exit 1
+ fi
+
+- if test -z "$dstarg"; then
++ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+- dst=$dstarg
++ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+- -*) dst=./$dst ;;
++ -*) dst=./$dst;;
+ esac
+
+ # 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
++ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+@@ -230,14 +276,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ 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'
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+@@ -250,83 +307,131 @@
+ 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
+-
+- if
+- $posix_mkdir && {
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
+
+ # With -d, create the new directory with the user-specified mode.
+- # Otherwise, 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.
+-
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+- mkdir_mode=$mode
++ mkdir_mode=-m$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
++ mkdir_mode=
+ fi
+
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
+
+- # 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.
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
+ esac
+
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
++ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+- $posix_glob && set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- $posix_glob && set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
+- test "x$d" = x && continue
++ test -z "$d" && 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
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
+- pathcomp=$pathcomp/
++ prefix=$prefix/
+ done
+- obsolete_mkdir_used=true
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
++ fi
+ fi
+ fi
+
+@@ -334,7 +439,7 @@
+ { 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
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+@@ -345,7 +450,7 @@
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -353,41 +458,54 @@
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
+-
+- # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+- || {
+- # The rename failed, perhaps because mv can't rename something else
+- # to itself, or perhaps because mv is so ancient that it does not
+- # support -f.
+-
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
+- 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; :; }; }\
+- || {
+- echo "$0: cannot unlink or rename $dst" >&2
+- (exit 1); exit 1
+- }
+- else
+- :
+- fi
+- } &&
+-
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+- }
+- } || exit 1
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
++
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
+
+ trap '' 0
+ fi
+diff -Nrua a/admin/missing b/admin/missing
+--- a/admin/missing 2009-03-07 18:40:16.000000000 +0100
++++ b/admin/missing 2009-03-07 18:48:34.000000000 +0100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2004-09-07.08
++scriptversion=2006-05-10.23
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+@@ -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
+-# 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
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -87,12 +90,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
++ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
++ exit $?
+ ;;
+
+ -*)
+@@ -106,7 +109,7 @@
+ # 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
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ # The file to touch is that specified with -o ...
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+- fi
++ # ... or it is the one specified with @setfilename ...
++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
++ # ... or it is derived from the source name (dir/f.texi becomes f.info)
++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++ fi
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
+ touch $file
+ ;;
+
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
+--- a/admin/mkinstalldirs 2009-03-07 18:40:16.000000000 +0100
++++ b/admin/mkinstalldirs 2009-03-07 18:48:34.000000000 +0100
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
+diff -Nrua a/admin/ylwrap b/admin/ylwrap
+--- a/admin/ylwrap 2009-03-07 18:40:16.000000000 +0100
++++ b/admin/ylwrap 2009-03-07 18:48:34.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+
+-scriptversion=2005-05-14.22
++scriptversion=2007-11-22.22
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
++# 2007 Free Software Foundation, Inc.
+ #
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+@@ -101,14 +101,14 @@
+ # FIXME: add hostname here for parallel makes that run commands on
+ # other machines. But that might take us over the 14-char limit.
+ dirname=ylwrap$$
+-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
++trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+ mkdir $dirname || exit 1
+
+ cd $dirname
+
+ case $# in
+- 0) $prog "$input" ;;
+- *) $prog "$@" "$input" ;;
++ 0) "$prog" "$input" ;;
++ *) "$prog" "$@" "$input" ;;
+ esac
+ ret=$?
+
Added: branches/kdebase-legacy/kdebase/debian/patches/03_libtool_update.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/03_libtool_update.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/03_libtool_update.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,8958 @@
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+-## Free Software Foundation, Inc.
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
++## 2008 Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 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.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
+
+-# serial 47 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -110,7 +95,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -132,7 +116,7 @@ esac
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -152,7 +136,7 @@ rm="rm -f"
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -172,6 +156,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -184,22 +169,24 @@ test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -209,6 +196,8 @@ file_magic*)
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -240,11 +229,129 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm -r conftest*
++])# _LT_LINKER_BOILERPLATE
++
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -254,12 +361,20 @@ compiler=$CC
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+
+@@ -317,15 +432,15 @@ fi
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -490,18 +605,21 @@ ia64-*-hpux*)
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+- LINUX_64_MODE="32"
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -513,8 +631,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+ esac
+ ;;
+ *64-bit*)
+- LINUX_64_MODE="64"
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -547,6 +667,26 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -570,7 +710,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -578,7 +718,7 @@ AC_CACHE_CHECK([$1], [$2],
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +728,10 @@ AC_CACHE_CHECK([$1], [$2],
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -609,22 +751,28 @@ fi
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -643,7 +791,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- testring="ABCD"
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -672,24 +820,77 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- *)
+- # 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"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_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.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
++ *)
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ = "XX$teststring") >/dev/null 2>&1 &&
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # 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.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+ ])
+@@ -702,7 +903,7 @@ fi
+
+
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +911,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +977,19 @@ int main ()
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+- x$lt_unknown|x*) $3 ;;
++ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+@@ -798,7 +1001,7 @@ rm -fr conftest*
+
+
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,12 +1038,12 @@ else
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+-
++
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -848,7 +1051,7 @@ else
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -869,7 +1072,7 @@ else
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +1085,7 @@ else
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+@@ -914,7 +1117,8 @@ fi
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -922,14 +1126,7 @@ AC_CACHE_CHECK([if $compiler supports -c
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -937,7 +1134,7 @@ AC_CACHE_CHECK([if $compiler supports -c
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1146,18 @@ AC_CACHE_CHECK([if $compiler supports -c
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+- chmod u+w .
+- $rm conftest* out/*
+- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+@@ -1014,8 +1216,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LI
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1064,6 +1266,7 @@ else
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -1072,7 +1275,7 @@ fi
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+- esac
++ esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+
+@@ -1081,11 +1284,12 @@ fi
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1299,58 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -1113,7 +1368,7 @@ aix3*)
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1160,7 +1415,7 @@ aix4* | aix5*)
+ amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+ beos*)
+@@ -1169,7 +1424,7 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1440,7 @@ bsdi4*)
+
+ cygwin* | mingw* | pw32*)
+ version_type=windows
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -1197,7 +1452,8 @@ cygwin* | mingw* | pw32*)
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -1227,7 +1483,7 @@ cygwin* | mingw* | pw32*)
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -1250,13 +1506,9 @@ darwin* | rhapsody*)
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -1273,20 +1525,17 @@ freebsd1*)
+ dynamic_linker=no
+ ;;
+
+-kfreebsd*-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -1304,14 +1553,19 @@ freebsd*)
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+- *) # from 3.2 on
++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -1331,9 +1585,9 @@ hpux9* | hpux10* | hpux11*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+- shrext='.so'
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1602,7 @@ hpux9* | hpux10* | hpux11*)
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1613,7 @@ hpux9* | hpux10* | hpux11*)
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1371,6 +1625,18 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix[[3-9]]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1680,26 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- libsuff=
+- if test "x$LINUX_64_MODE" = x64; then
+- # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64 -a ! -h /lib64; then
+- libsuff=64
+- fi
+- fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -1446,6 +1709,18 @@ linux*)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -1455,7 +1730,7 @@ netbsd*)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -1483,8 +1758,13 @@ nto-qnx*)
+
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- need_version=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1784,7 @@ openbsd*)
+
+ os2*)
+ libname_spec='$name'
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -1522,11 +1802,8 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++ dynamic_linker=no
+ ;;
+
+ solaris*)
+@@ -1554,7 +1831,7 @@ sunos4*)
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1864,29 @@ sysv4*MP*)
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,13 +1900,26 @@ uts4*)
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -1624,6 +1937,9 @@ if test -f "$ltmain" && test -n "$tagnam
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1966,9 @@ if test -f "$ltmain" && test -n "$tagnam
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -1712,7 +2030,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1750,7 +2068,7 @@ AC_ARG_ENABLE([shared],
+
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1862,7 +2180,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -1886,7 +2204,7 @@ dnl not every word. This closes a longs
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1925,7 +2243,7 @@ fi
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -1996,7 +2314,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2028,7 +2346,7 @@ AC_PROG_LD_GNU
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2373,15 @@ case $reload_flag in
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -2063,7 +2390,7 @@ reload_cmds='$LD$reload_flag -o $output$
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2080,7 +2407,7 @@ lt_cv_deplibs_check_method='unknown'
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -2088,44 +2415,42 @@ beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+ cygwin*)
+- lt_cv_deplibs_check_method=pass_all
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+-
++
+ mingw* | pw32*)
+- # win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='win32_libid'
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
+- # this will be overwritten by pass_all, but leave it in just in case
+- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+- ;;
+- *) # Darwin 1.3 on
+- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+- ;;
+- esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-freebsd* | kfreebsd*-gnu)
++freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -2141,7 +2466,7 @@ gnu*)
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2157,43 +2482,27 @@ hpux10.20* | hpux11*)
+ esac
+ ;;
+
++interix[[3-9]]*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+- case $host_os in
+- irix5* | nonstopux*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+- ;;
+- *)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+- ;;
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
+ esac
+- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
+- case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+- arm* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- *)
+- # glibc up to 2.1.1 does not perform some relocations on ARM
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+- esac
+- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -2212,32 +2521,26 @@ nto-qnx*)
+ ;;
+
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+ osf3* | osf4* | osf5*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-sco3.2v5*)
++rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+- lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2561,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
+ ;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -2281,36 +2587,43 @@ AC_DEFUN([AC_PROG_NM],
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2655,13 @@ esac
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -2367,13 +2680,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2724,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2454,7 +2778,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+$
+
+
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2480,43 +2804,16 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+ _LT_AC_SYS_COMPILER
+
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
+- else
+- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2827,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+@@ -2541,7 +2838,7 @@ test "$can_build_shared" = "no" && enabl
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -2550,48 +2847,11 @@ aix3*)
+ fi
+ ;;
+
+-aix4*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+@@ -2616,7 +2876,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2628,6 +2888,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec,
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2643,23 +2904,28 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2670,18 +2936,18 @@ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2965,8 @@ if test "$GXX" = yes; then
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2992,7 @@ if test "$GXX" = yes; then
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+@@ -2748,7 +3014,7 @@ case $host_os in
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -2756,8 +3022,23 @@ case $host_os in
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++ for ld_flag in $LDFLAGS; do
++ case $ld_flag in
++ *-brtl*)
++ aix_use_runtimelinking=yes
++ break
++ ;;
++ esac
++ done
++ ;;
++ esac
++
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -2774,7 +3055,7 @@ case $host_os in
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -2782,7 +3063,7 @@ case $host_os in
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -2793,8 +3074,12 @@ case $host_os in
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -2803,15 +3088,16 @@ case $host_os in
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +3106,12 @@ case $host_os in
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -2835,16 +3120,26 @@ case $host_os in
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
++
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -2858,12 +3153,12 @@ case $host_os in
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +3167,53 @@ case $host_os in
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+-
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ darwin* | rhapsody*)
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++ fi
+ else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3224,14 @@ case $host_os in
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3248,12 @@ case $host_os in
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -2984,11 +3262,11 @@ case $host_os in
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3276,20 @@ case $host_os in
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*) ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -3035,17 +3300,20 @@ case $host_os in
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ aCC*)
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3329,15 @@ case $host_os in
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- ia64*|hppa*64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -3077,11 +3348,25 @@ case $host_os in
+ ;;
+ esac
+ ;;
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # SGI C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -3092,9 +3377,9 @@ case $host_os in
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ fi
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3103,16 +3388,16 @@ case $host_os in
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -3130,20 +3415,44 @@ case $host_os in
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
+ # Intel C++
+ with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- cxx)
++ pgCC* | pgcpp*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
+ # Compaq C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3159,6 +3468,29 @@ case $host_os in
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -3171,7 +3503,7 @@ case $host_os in
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3181,7 +3513,7 @@ case $host_os in
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -3192,15 +3524,35 @@ case $host_os in
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3562,14 @@ case $host_os in
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3587,7 @@ case $host_os in
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3606,13 @@ case $host_os in
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3621,17 @@ case $host_os in
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3650,7 @@ case $host_os in
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3319,27 +3671,14 @@ case $host_os in
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
+- CC)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3691,28 @@ case $host_os in
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -3389,9 +3720,9 @@ case $host_os in
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3732,9 @@ case $host_os in
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | grep -v '^2\.7' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3743,9 @@ case $host_os in
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3423,16 +3754,73 @@ case $host_os in
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+ ;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3469,8 +3857,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3488,12 +3874,13 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -3542,7 +3929,7 @@ if AC_TRY_EVAL(ac_compile); then
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -3582,7 +3969,7 @@ if AC_TRY_EVAL(ac_compile); then
+ fi
+ ;;
+
+- *.$objext|*.$libext)
++ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+@@ -3618,13 +4005,74 @@ fi
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ _LT_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_TAGVAR(postdeps,$1)=
++ ;;
++
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++esac
++])
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3660,20 +4108,31 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +4142,7 @@ test "$can_build_shared" = "no" && enabl
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -3691,8 +4150,10 @@ aix3*)
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4*)
+- test "$enable_shared" = yes && enable_static=no
++aix[[4-9]]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3702,8 +4163,6 @@ AC_MSG_CHECKING([whether to build static
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+
+@@ -3713,8 +4172,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3740,23 +4197,30 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3768,8 +4232,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3779,7 +4241,7 @@ CC="$lt_save_CC"
+
+
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3795,7 +4257,7 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -3803,11 +4265,16 @@ lt_simple_link_test_code="$lt_simple_com
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4300,12 @@ if test -f "$ltmain"; then
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+- fi
++ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3863,6 +4331,7 @@ if test -f "$ltmain"; then
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -3878,6 +4347,7 @@ if test -f "$ltmain"; then
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -3887,7 +4357,7 @@ if test -f "$ltmain"; then
+ _LT_AC_TAGVAR(archive_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_cmds, $1) | \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3924,7 +4394,7 @@ ifelse([$1], [],
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -3953,11 +4423,11 @@ ifelse([$1], [],
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4458,12 @@ fast_install=$enable_fast_install
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -3999,6 +4475,9 @@ AR_FLAGS=$lt_AR_FLAGS
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+@@ -4018,7 +4497,7 @@ LN_S=$lt_LN_S
+ NM=$lt_NM
+
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4528,7 @@ objext="$ac_objext"
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4543,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -4152,6 +4631,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4240,7 +4723,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -4293,7 +4776,10 @@ else
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
+ # libtool script then.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+
+@@ -4320,6 +4806,7 @@ fi
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -4335,9 +4822,6 @@ symcode='[[BCDEGRST]]'
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -4359,14 +4843,30 @@ hpux*) # Its linker distinguishes data f
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux* | k*bsd*-gnu)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+ osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
+-solaris* | sysv5*)
+- symcode='[[BDT]]'
++solaris*)
++ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
+ ;;
+ sysv4)
+ symcode='[[DFNSTU]]'
+@@ -4384,14 +4884,17 @@ esac
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+- symcode='[[ABCDGISTW]]' ;;
++ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4481,7 +4984,7 @@ EOF
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4530,13 +5033,16 @@ AC_MSG_CHECKING([for $compiler option to
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -4547,6 +5053,10 @@ AC_MSG_CHECKING([for $compiler option to
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +5065,7 @@ AC_MSG_CHECKING([for $compiler option to
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -4569,7 +5079,7 @@ AC_MSG_CHECKING([for $compiler option to
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -4580,18 +5090,28 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4599,22 +5119,22 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4627,9 +5147,13 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -4638,20 +5162,26 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- cxx)
++ ;;
++ pgCC* | pgcpp*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4659,6 +5189,14 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -4668,25 +5206,25 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -4700,24 +5238,15 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
+- CC)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -4727,12 +5256,12 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4742,7 +5271,7 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -4750,7 +5279,14 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -4781,14 +5317,17 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4797,6 +5336,11 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -4813,7 +5357,7 @@ AC_MSG_CHECKING([for $compiler option to
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4839,18 +5383,29 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4873,18 +5428,41 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- linux*)
+- case $CC in
++ linux* | k*bsd*-gnu)
++ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -4894,15 +5472,19 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -4911,7 +5493,7 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4924,6 +5506,17 @@ AC_MSG_CHECKING([for $compiler option to
+ fi
+ ;;
+
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4942,7 +5535,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -4951,7 +5544,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4960,6 +5553,16 @@ case "$host_os" in
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+
+
+@@ -4967,11 +5570,12 @@ esac
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -4984,12 +5588,16 @@ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -5010,7 +5618,7 @@ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5020,14 +5628,17 @@ ifelse([$1],[CXX],[
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5037,6 +5648,10 @@ ifelse([$1],[CXX],[
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -5047,9 +5662,30 @@ ifelse([$1],[CXX],[
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5084,7 +5720,7 @@ EOF
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5094,13 +5730,13 @@ EOF
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,23 +5745,79 @@ EOF
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ gnu* | linux* | k*bsd*-gnu)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<EOF 1>&2
+@@ -5139,13 +5831,40 @@ EOF
+
+ EOF
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -5155,24 +5874,19 @@ EOF
+
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5184,14 +5898,14 @@ EOF
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5206,9 +5920,21 @@ EOF
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++ for ld_flag in $LDFLAGS; do
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++ aix_use_runtimelinking=yes
++ break
++ fi
++ done
++ ;;
++ esac
+
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -5225,7 +5951,7 @@ EOF
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -5233,7 +5959,7 @@ EOF
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5244,8 +5970,12 @@ EOF
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5253,30 +5983,30 @@ EOF
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
+- fi
++ shared_flag='${wl}-bM:SRE'
++ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -5285,13 +6015,11 @@ EOF
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5304,7 +6032,7 @@ EOF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -5314,69 +6042,68 @@ EOF
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext=".dll"
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
+ esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
+ ;;
+
+ dgux*)
+@@ -5409,8 +6136,8 @@ EOF
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++ freebsd* | dragonfly*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +6145,7 @@ EOF
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -5432,47 +6159,62 @@ EOF
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+- hpux10* | hpux11*)
++ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+@@ -5486,7 +6228,7 @@ EOF
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +6238,7 @@ EOF
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -5516,23 +6258,28 @@ EOF
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -5540,14 +6287,14 @@ EOF
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +6306,13 @@ EOF
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5573,21 +6320,15 @@ EOF
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
++ wlarc=''
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +6337,17 @@ EOF
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -5606,7 +6356,7 @@ EOF
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5654,36 +6404,45 @@ EOF
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sysv5*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -5701,11 +6460,6 @@ EOF
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5725,14 +6479,15 @@ x|xyes)
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -5827,6 +6582,30 @@ AC_DEFUN([LT_AC_PROG_RC],
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+@@ -5849,18 +6628,19 @@ do
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -5887,5 +6667,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,6 +24,42 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.26 Debian 1.5.26-4"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,7 +72,7 @@ elif test "X`($echo '\t') 2>/dev/null`"
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +81,9 @@ if test "X$1" = X--fallback-echo; then
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +96,15 @@ rm="rm -f"
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -86,20 +113,30 @@ esac
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
++ $lt_var=C
++ export $lt_var
++ fi"
++done
++
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
+
+ # Make sure IFS has a sensible default
+-: ${IFS=" "}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -111,17 +148,62 @@ run=
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible. If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++ if test "$run" = ":"; then
++ # Return a directory name, but don't create it in dry-run mode
++ my_tmpdir="${my_template}-$$"
++ else
++
++ # If mktemp works, use that first and foremost
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++ if test ! -d "$my_tmpdir"; then
++ # Failing that, at least try and use $RANDOM to avoid a race
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++ save_mktempdir_umask=`umask`
++ umask 0077
++ $mkdir "$my_tmpdir"
++ umask $save_mktempdir_umask
++ fi
++
++ # If we're not in dry-run mode, bomb out on failure
++ test -d "$my_tmpdir" || {
++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++ exit $EXIT_FAILURE
++ }
++ fi
++
++ $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+@@ -130,17 +212,22 @@ win32_libid () {
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+- if test "X$win32_nmres" = "Ximport" ; then
+- win32_libid_type="x86 archive import"
+- else
+- win32_libid_type="x86 archive static"
+- fi
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
++ case $win32_nmres in
++ import*) win32_libid_type="x86 archive import";;
++ *) win32_libid_type="x86 archive static";;
++ esac
+ fi
+ ;;
+- *DLL*)
++ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +241,191 @@ win32_libid () {
+ $echo $win32_libid_type
+ }
+
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $exit_status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +445,13 @@ do
+ ;;
+ tag)
+ tagname="$arg"
++ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -191,10 +461,10 @@ do
+ # not specially marked.
+ ;;
+ *)
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+@@ -218,26 +488,28 @@ do
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- exit 0
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2008 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ exit $?
+ ;;
+
+ --config)
+- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+- exit 0
++ exit $?
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+@@ -256,7 +528,7 @@ do
+ else
+ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -268,13 +540,19 @@ do
+
+ --quiet | --silent)
+ show=:
++ preserve_args="$preserve_args $arg"
+ ;;
+
+- --tag) prevopt="--tag" prev=tag ;;
++ --tag)
++ prevopt="--tag"
++ prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
++ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+@@ -285,7 +563,7 @@ do
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -298,9 +576,21 @@ done
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
++case $disable_libs in
++no)
++ ;;
++shared)
++ build_libtool_libs=no
++ build_old_libs=yes
++ ;;
++static)
++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++ ;;
++esac
++
+ # 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 +601,7 @@ if test -z "$show_help"; then
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -354,7 +644,7 @@ if test -z "$show_help"; then
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -369,13 +659,15 @@ if test -z "$show_help"; then
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
++ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
++ later=
+
+ for arg
+ do
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -394,24 +686,19 @@ if test -z "$show_help"; then
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+- -static)
+- build_old_libs=yes
+- continue
+- ;;
+-
+- -prefer-pic)
+- pic_mode=yes
++ -static | -prefer-pic | -prefer-non-pic)
++ later="$later $arg"
+ continue
+ ;;
+
+- -prefer-non-pic)
+- pic_mode=no
++ -no-suppress)
++ suppress_opt=no
+ continue
+ ;;
+
+@@ -424,7 +711,7 @@ if test -z "$show_help"; then
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+@@ -462,7 +749,10 @@ if test -z "$show_help"; then
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -474,11 +764,11 @@ if test -z "$show_help"; then
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+@@ -500,9 +790,11 @@ if test -z "$show_help"; then
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -511,51 +803,39 @@ if test -z "$show_help"; then
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base compile
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case "$base_compile " in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in the base compile command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
++ func_infer_tag $base_compile
++
++ for arg in $later; do
++ case $arg in
++ -static)
++ build_old_libs=yes
++ continue
++ ;;
++
++ -prefer-pic)
++ pic_mode=yes
++ continue
++ ;;
++
++ -prefer-non-pic)
++ pic_mode=no
++ continue
+ ;;
+ esac
+- fi
++ done
+
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+@@ -568,7 +848,7 @@ if test -z "$show_help"; then
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+@@ -579,7 +859,7 @@ if test -z "$show_help"; then
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -598,7 +878,7 @@ if test -z "$show_help"; then
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+@@ -608,7 +888,7 @@ if test -z "$show_help"; then
+ # 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
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -626,14 +906,19 @@ avoid parallel builds (make -j) in this
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -655,18 +940,18 @@ EOF
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -678,10 +963,10 @@ EOF
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -701,7 +986,7 @@ avoid parallel builds (make -j) in this
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +1007,9 @@ pic_object='$objdir/$objname'
+ EOF
+
+ # Allow error messages only from the first compilation.
+- suppress_output=' >/dev/null 2>&1'
++ if test "$suppress_opt" = yes; then
++ suppress_output=' >/dev/null 2>&1'
++ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+@@ -736,9 +1023,9 @@ EOF
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -748,10 +1035,10 @@ EOF
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -771,7 +1058,7 @@ avoid parallel builds (make -j) in this
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+@@ -809,7 +1096,7 @@ EOF
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -835,7 +1122,7 @@ EOF
+ ;;
+ esac
+ libtool_args="$nonopt"
+- base_compile="$nonopt"
++ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+@@ -847,7 +1134,6 @@ EOF
+ old_convenience=
+ deplibs=
+ old_deplibs=
+- add_flags=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+@@ -868,6 +1154,8 @@ EOF
+ no_install=no
+ objs=
+ non_pic_objects=
++ notinst_path= # paths that contain not-installed libtool libraries
++ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+@@ -880,27 +1168,40 @@ EOF
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
++ single_module="${wl}-single_module"
++
++ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- else
++ prefer_static_libs=yes
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- fi
++ prefer_static_libs=built
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+- prefer_static_libs=yes
+ break
+ ;;
+ esac
+@@ -912,7 +1213,6 @@ EOF
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+- base_compile="$base_compile $arg"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+@@ -976,7 +1276,7 @@ EOF
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -991,6 +1291,11 @@ EOF
+ prev=
+ continue
+ ;;
++ precious_regex)
++ precious_files_regex="$arg"
++ prev=
++ continue
++ ;;
+ release)
+ release="-$arg"
+ prev=
+@@ -1023,7 +1328,7 @@ EOF
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1071,12 +1376,17 @@ EOF
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1097,7 +1407,7 @@ EOF
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+@@ -1109,7 +1419,7 @@ EOF
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -1149,16 +1459,15 @@ EOF
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+- framework)
+- case $host in
+- *-*-darwin*)
+- case "$deplibs " in
+- *" $qarg.ltframework "*) ;;
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+- ;;
+- esac
+- ;;
+- esac
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework|darwin_framework_skip)
++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
+@@ -1210,7 +1519,7 @@ EOF
+ -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"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -1220,6 +1529,18 @@ EOF
+ continue
+ ;;
+
++ -framework|-arch|-isysroot)
++ case " $CC " in
++ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
++ prev=darwin_framework_skip ;;
++ *) compiler_flags="$compiler_flags $arg"
++ prev=darwin_framework ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1246,7 +1567,8 @@ EOF
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ absdir="$dir"
++ notinst_path="$notinst_path $dir"
+ fi
+ dir="$absdir"
+ ;;
+@@ -1260,10 +1582,15 @@ EOF
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ continue
+@@ -1272,26 +1599,35 @@ EOF
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-pw32* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-mingw* | *-*-os2*)
++ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ test "X$arg" = "X-lc" && continue
++ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1301,18 +1637,47 @@ EOF
+ continue
+ ;;
+
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+ ;;
+
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
++ # @file GCC response files
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++
+ # 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 +1688,7 @@ EOF
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
+- compiler_flags="$compiler_flags $arg"
+- fi
++ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
+@@ -1341,9 +1704,9 @@ EOF
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1365,6 +1728,11 @@ EOF
+
+ -o) prev=output ;;
+
++ -precious-files-regex)
++ prev=precious_regex
++ continue
++ ;;
++
+ -release)
+ prev=release
+ continue
+@@ -1387,7 +1755,7 @@ EOF
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1397,7 +1765,7 @@ EOF
+ continue
+ ;;
+
+- -static)
++ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -1473,11 +1841,6 @@ EOF
+ continue
+ ;;
+
+- -framework)
+- prev=framework
+- continue
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1851,6 @@ EOF
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+
+ *.$objext)
+@@ -1516,7 +1878,7 @@ EOF
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1564,12 +1926,17 @@ EOF
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1623,7 +1990,6 @@ EOF
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+ esac # arg
+
+@@ -1637,48 +2003,7 @@ EOF
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
+- fi
+-
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base link
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case $base_compile in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in $compile_command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1711,9 +2036,9 @@ EOF
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -1722,7 +2047,7 @@ EOF
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +2057,7 @@ EOF
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+- # don't eliminate duplcations in $postdeps and $predeps
++ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+@@ -1776,7 +2101,6 @@ EOF
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+- notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+@@ -1785,7 +2109,7 @@ EOF
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1811,7 +2135,10 @@ EOF
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -1823,18 +2150,28 @@ EOF
+ lib=
+ found=no
+ case $deplib in
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ compiler_flags="$compiler_flags $deplib"
++ fi
++ continue
++ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+- if test "$pass" = conv && test "$allow_undefined" = yes; then
+- deplibs="$deplib $deplibs"
+- continue
+- fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for search_ext in .la $shrext .so .a; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
++ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+@@ -1895,18 +2232,6 @@ EOF
+ fi
+ fi
+ ;; # -l
+- *.ltframework)
+- if test "$linkmode,$pass" = "prog,link"; then
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- deplibs="$deplib $deplibs"
+- if test "$linkmode" = lib ; then
+- newdependency_libs="$deplib $newdependency_libs"
+- fi
+- fi
+- continue
+- ;;
+ -L*)
+ case $linkmode in
+ lib)
+@@ -1922,11 +2247,11 @@ EOF
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2279,22 @@ EOF
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $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 +2344,15 @@ EOF
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+- $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2368,8 @@ EOF
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2035,13 +2377,6 @@ EOF
+ *) . ./$lib ;;
+ esac
+
+- case $host in
+- *-*-darwin*)
+- # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+- ;;
+- esac
+-
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2387,32 @@ EOF
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- #echo "Adding $deplib to \$deplibs"
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+-
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -2086,16 +2420,18 @@ EOF
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # 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 +2468,19 @@ EOF
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2144,7 +2488,7 @@ EOF
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -2171,7 +2515,7 @@ EOF
+ continue
+ fi
+
+-
++
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+@@ -2207,14 +2551,16 @@ EOF
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2251,24 +2597,29 @@ EOF
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
++ use_static_libs=$prefer_static_libs
++ if test "$use_static_libs" = built && test "$installed" = yes ; then
++ use_static_libs=no
++ fi
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+-
+- # Warn about portability, can't link against -module's on some systems (darwin)
+- if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+- $echo "*** $linklib is not portable!"
+- fi
++ $echo "*** $linklib is not portable!"
++ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+@@ -2326,9 +2677,10 @@ EOF
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$extract_expsyms_cmds\"
++ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2339,9 +2691,10 @@ EOF
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$old_archive_from_expsyms_cmds\"
++ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2362,11 +2715,15 @@ EOF
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a module then we can not link against it, someone
+- # is ignoring the new warnings I added
+- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null |
++ $EGREP ": [^:]* bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+@@ -2374,7 +2731,7 @@ EOF
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+- fi
++ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2754,9 @@ EOF
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2416,7 +2773,7 @@ EOF
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -2459,7 +2816,8 @@ EOF
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+@@ -2469,9 +2827,9 @@ EOF
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2530,17 +2888,16 @@ EOF
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+- #if test -n "$dependency_libs" &&
+- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+- # test "$link_static" = yes; }; then
++ if test -n "$dependency_libs" &&
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -2554,7 +2911,7 @@ EOF
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+- #fi
++ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+@@ -2596,76 +2953,70 @@ EOF
+ 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
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+- # Sure, some shells/systems don't implement the -ef.
+- # Those will have to live with the warning.
+- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+- # we do not want to link against static libs, but need to link against shared
++ # we do not want to link against static libs,
++ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+- fi
++ else
++ # Can't find it, oh well...
++ depdepl=
++ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+- path=""
+ fi
++ path=""
+ ;;
+ *)
+- path="-L$path"
+- ;;
+- esac
+-
++ path="-L$path"
++ ;;
++ esac
+ ;;
+- -l*)
++ -l*)
+ case $host in
+ *-*-darwin*)
+- # Again, we only want to link against shared libraries
+- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+- for tmp in $newlib_search_path ; do
+- if test -f "$tmp/lib$tmp_libs.dylib" ; then
+- eval depdepl="$tmp/lib$tmp_libs.dylib"
+- break
+- fi
+- done
+- path=""
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
+ ;;
+ *) continue ;;
+- esac
+- ;;
+-
+- *.ltframework)
+- case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
+ esac
+ ;;
+-
+ *) continue ;;
+ esac
+ case " $deplibs " in
+- *" $depdepl "*) ;;
+- *) deplibs="$deplibs $depdepl" ;;
+- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2752,7 +3103,8 @@ EOF
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2773,9 +3125,10 @@ EOF
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -2812,19 +3165,19 @@ EOF
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3188,7 @@ EOF
+ 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
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3236,13 @@ EOF
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+-
++
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+@@ -2903,7 +3256,7 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+@@ -2914,9 +3267,15 @@ EOF
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_minor"
++ lt_irix_increment=no
++ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+@@ -2929,36 +3288,36 @@ EOF
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -2975,6 +3334,7 @@ EOF
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+@@ -2989,8 +3349,11 @@ EOF
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3047,7 +3410,7 @@ EOF
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -3098,9 +3461,15 @@ EOF
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext | *$exeext)
++ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
++ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+@@ -3121,11 +3490,11 @@ EOF
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3137,7 +3506,7 @@ EOF
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+@@ -3170,14 +3539,19 @@ EOF
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+@@ -3221,13 +3595,12 @@ EOF
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3262,13 +3635,11 @@ EOF
+ # 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
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3300,7 +3671,7 @@ EOF
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3314,7 +3685,7 @@ EOF
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # 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 +3754,7 @@ EOF
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # 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 +3834,7 @@ EOF
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+@@ -3509,17 +3880,39 @@ EOF
+ fi
+ fi
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- case $host in
+- *-*-darwin*)
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- ;;
+- esac
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ deplibs="$new_libs"
++
++
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+@@ -3532,7 +3925,7 @@ EOF
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+@@ -3564,7 +3957,10 @@ EOF
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -3587,7 +3983,7 @@ EOF
+ fi
+
+ # Get the real and link names of the library.
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -3603,6 +3999,7 @@ EOF
+ fi
+
+ lib="$output_objdir/$realname"
++ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+@@ -3617,10 +4014,11 @@ EOF
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+- eval cmds=\"$export_symbols_cmds\"
++ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+@@ -3630,6 +4028,9 @@ EOF
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3650,12 +4051,12 @@ EOF
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+- *)
++ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+- deplibs="$tmp_deplibs"
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +4064,13 @@ EOF
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ 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 +4081,27 @@ EOF
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+- # Add all flags from the command line. We here create a library,
+- # but those flags were only added to compile_command and
+- # finalize_command, which are only used when creating executables.
+- # So do it by hand here.
+- compiler_flags="$compiler_flags $add_flags"
+- # Only add it to commands which use CC, instead of LD, i.e.
+- # only to $compiler_flags
+- #linker_flags="$linker_flags $add_flags"
+-
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+- eval cmds=\"$module_expsym_cmds\"
++ eval test_cmds=\"$module_expsym_cmds\"
++ cmds=$module_expsym_cmds
+ else
+- eval cmds=\"$module_cmds\"
++ eval test_cmds=\"$module_cmds\"
++ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ eval test_cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ eval test_cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
+ fi
+ fi
+
+- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+@@ -3777,6 +4120,7 @@ EOF
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3786,13 +4130,13 @@ EOF
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3806,9 +4150,9 @@ EOF
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3828,13 +4172,13 @@ EOF
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +4203,54 @@ EOF
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ cmds=$module_expsym_cmds
++ else
++ cmds=$module_cmds
++ fi
++ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
++ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+- eval cmds=\"\$cmds~$rm $delfiles\"
++ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -3900,9 +4270,10 @@ EOF
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -3928,7 +4299,7 @@ EOF
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3949,72 +4320,20 @@ EOF
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4022,10 +4341,11 @@ EOF
+ 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"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4038,7 +4358,7 @@ EOF
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4371,18 @@ EOF
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4073,7 +4394,7 @@ EOF
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+@@ -4098,24 +4419,50 @@ EOF
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+- *-*-darwin*)
++ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $compile_deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $compile_deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ compile_deplibs="$new_libs"
++
++
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+@@ -4160,10 +4507,15 @@ EOF
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ done
+@@ -4277,13 +4629,25 @@ extern \"C\" {
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ fi
+ fi
+
+@@ -4334,7 +4698,26 @@ extern \"C\" {
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4381,20 +4764,33 @@ static const void *lt_preloaded_setup()
+ esac
+
+ # Now compile the dynamic symbol file.
+- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ case $host in
++ *cygwin* | *mingw* )
++ if test -f "$output_objdir/${outputname}.def" ; then
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ else
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ fi
++ ;;
++ * )
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ ;;
++ esac
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -4403,30 +4799,19 @@ static const void *lt_preloaded_setup()
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+- # This does not apply on AIX for ia64, which uses a SysV linker.
+- case "$host" in
+- ia64-*-aix5*) ;;
+- *-*-aix4* | *-*-aix5*)
+- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+- esac
+-
+ 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'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+- status=$?
++ exit_status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+@@ -4434,7 +4819,7 @@ static const void *lt_preloaded_setup()
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+- exit $status
++ exit $exit_status
+ fi
+
+ if test -n "$shlibpath_var"; then
+@@ -4493,7 +4878,7 @@ static const void *lt_preloaded_setup()
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -4507,7 +4892,7 @@ static const void *lt_preloaded_setup()
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4544,14 +4929,14 @@ static const void *lt_preloaded_setup()
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -4573,11 +4958,13 @@ static const void *lt_preloaded_setup()
+ *) exeext= ;;
+ esac
+ case $host in
+- *mingw* )
+- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+- cwrapper=`$echo ${output}.exe`
+- $rm $cwrappersource $cwrapper
+- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ *cygwin* | *mingw* )
++ output_name=`basename $output`
++ output_path=`dirname $output`
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
++ $rm $cwrappersource $cwrapper
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+@@ -4586,7 +4973,7 @@ static const void *lt_preloaded_setup()
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+-
++
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+@@ -4602,6 +4989,9 @@ EOF
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +5002,19 @@ EOF
+ #endif
+
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++# define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++# define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +5024,32 @@ EOF
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
++/* -DDEBUG is fairly common in CFLAGS. */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+
+@@ -4649,30 +5058,52 @@ main (int argc, char *argv[])
+ {
+ char **newargz;
+ int i;
+-
+- program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++ program_name = (char *) xstrdup (base_name (argv[0]));
++ DEBUG("(main) argv[0] : %s\n",argv[0]);
++ DEBUG("(main) program_name : %s\n",program_name);
+ newargz = XMALLOC(char *, argc+2);
+ EOF
+
+- cat >> $cwrappersource <<EOF
+- newargz[0] = "$SHELL";
++ cat >> $cwrappersource <<EOF
++ newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+
+- cat >> $cwrappersource <<"EOF"
+- newargz[1] = fnqualify(argv[0]);
++ cat >> $cwrappersource <<"EOF"
++ newargz[1] = find_executable(argv[0]);
++ if (newargz[1] == NULL)
++ lt_fatal("Couldn't find %s", argv[0]);
++ DEBUG("(main) found exe at : %s\n",newargz[1]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+- strendzap(newargz[1],".exe");
++ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
++
++ for (i=0; i<argc+1; i++)
++ {
++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
++ ;
++ }
++
+ EOF
+
+- cat >> $cwrappersource <<EOF
++ case $host_os in
++ mingw*)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",(char const **)newargz);
++EOF
++ ;;
++ *)
++ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+ EOF
++ ;;
++ esac
+
+- cat >> $cwrappersource <<"EOF"
++ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4685,59 +5116,159 @@ xmalloc (size_t num)
+ return p;
+ }
+
+-char *
++char *
+ xstrdup (const char *string)
+ {
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+ const char *base;
+
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+- if (isalpha (name[0]) && name[1] == ':')
++ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+ name += 2;
+ #endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+- return (char *) base;
++ return base;
++}
++
++int
++check_executable(const char * path)
++{
++ struct stat st;
++
++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++ if ((!path) || (!*path))
++ return 0;
++
++ if ((stat (path, &st) >= 0) &&
++ (
++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++ ((st.st_mode & S_IXUSR) == S_IXUSR))
++ )
++ 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 *
++find_executable (const char* wrapper)
+ {
+- size_t size;
+- char *p;
++ int has_slash = 0;
++ const char* p;
++ const char* p_next;
++ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
++ int tmp_len;
++ char* concat_name;
++
++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+- assert(path != NULL);
++ 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] == ':')
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ else
++ {
++#endif
++ if (IS_DIR_SEPARATOR (wrapper[0]))
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+- if (isalpha (path[0]) && path[1] == ':')
+- return xstrdup (path);
++ }
+ #endif
+- if (IS_DIR_SEPARATOR (path[0]))
+- return xstrdup (path);
+
+- /* prepend the current directory */
+- /* doesn't handle '~' */
++ for (p = wrapper; *p; p++)
++ if (*p == '/')
++ {
++ has_slash = 1;
++ break;
++ }
++ if (!has_slash)
++ {
++ /* no slashes; search PATH */
++ const char* path = getenv ("PATH");
++ if (path != NULL)
++ {
++ for (p = path; *p; p = p_next)
++ {
++ const char* q;
++ size_t p_len;
++ for (q = p; *q; q++)
++ if (IS_PATH_SEPARATOR(*q))
++ break;
++ p_len = q - p;
++ p_next = (*q == '\0' ? q : q + 1);
++ if (p_len == 0)
++ {
++ /* empty path: current directory */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++ }
++ else
++ {
++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, p, p_len);
++ concat_name[p_len] = '/';
++ strcpy (concat_name + p_len + 1, wrapper);
++ }
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ }
++ /* not found in PATH; assume curdir */
++ }
++ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+- p = XMALLOC(char, size);
+- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+- return p;
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ return NULL;
+ }
+
+ char *
+-strendzap(char *str, const char *pat)
++strendzap(char *str, const char *pat)
+ {
+ size_t len, patlen;
+
+@@ -4757,7 +5288,7 @@ strendzap(char *str, const char *pat)
+ }
+
+ static void
+-lt_error_core (int exit_status, const char * mode,
++lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+ {
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4777,16 +5308,16 @@ lt_fatal (const char *message, ...)
+ va_end (ap);
+ }
+ EOF
+- # we should really use a build-platform specific compiler
+- # here, but OTOH, the wrappers (shell script and this C one)
+- # are only useful if you want to execute the "real" binary.
+- # Since the "real" binary is built for $host, then this
+- # wrapper might as well be built for $host, too.
+- $run $LTCC -s -o $cwrapper $cwrappersource
+- ;;
+- esac
+- $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ # we should really use a build-platform specific compiler
++ # here, but OTOH, the wrappers (shell script and this C one)
++ # are only useful if you want to execute the "real" binary.
++ # Since the "real" binary is built for $host, then this
++ # wrapper might as well be built for $host, too.
++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++ ;;
++ esac
++ $rm $output
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -4805,9 +5336,23 @@ EOF
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4886,7 +5431,7 @@ else
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -4936,34 +5481,32 @@ else
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+- # Need to set LD_LIBRARY_PATH, to the value already
+- # computed within libtool.
+ $echo >> $output "\
+- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ \$echo \"\$0: cannot exec \$program \$*\"
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -4986,78 +5529,78 @@ fi\
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+- compiler_flags="$compiler_flags $add_flags"
+-
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+- eval cmds=\"$old_archive_from_new_cmds\"
++ cmds=$old_archive_from_new_cmds
+ else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++ exit $exit_status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+- :
++ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+@@ -5066,31 +5609,18 @@ fi\
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+- done
++ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5098,7 +5628,7 @@ fi\
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+- fi
++ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+@@ -5109,12 +5639,13 @@ fi\
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
++ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+@@ -5146,11 +5677,13 @@ fi\
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+- relink_command=
+- fi
++ relink_command=
++ fi
++
++
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+@@ -5168,7 +5701,7 @@ fi\
+ 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
++ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+@@ -5182,7 +5715,7 @@ fi\
+ 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
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -5193,11 +5726,30 @@ fi\
+ 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
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
++ else
++ newdlfiles=
++ for lib in $dlfiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlfiles="$newdlfiles $abs"
++ done
++ dlfiles="$newdlfiles"
++ newdlprefiles=
++ for lib in $dlprefiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlprefiles="$newdlprefiles $abs"
++ done
++ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+@@ -5241,7 +5793,7 @@ dlpreopen='$dlprefiles'
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -5254,7 +5806,7 @@ relink_command=\"$relink_command\""
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -5265,11 +5817,11 @@ relink_command=\"$relink_command\""
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5278,14 +5830,14 @@ relink_command=\"$relink_command\""
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5303,28 +5855,31 @@ relink_command=\"$relink_command\""
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5333,7 +5888,7 @@ relink_command=\"$relink_command\""
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5343,13 +5898,13 @@ relink_command=\"$relink_command\""
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -5359,7 +5914,7 @@ relink_command=\"$relink_command\""
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -5380,7 +5935,7 @@ relink_command=\"$relink_command\""
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -5392,7 +5947,7 @@ relink_command=\"$relink_command\""
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -5421,7 +5976,7 @@ relink_command=\"$relink_command\""
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -5463,14 +6018,14 @@ relink_command=\"$relink_command\""
+ # 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
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5478,7 +6033,7 @@ relink_command=\"$relink_command\""
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -5502,23 +6057,36 @@ relink_command=\"$relink_command\""
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+- eval cmds=\"$postinstall_cmds\"
++ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -5556,7 +6124,7 @@ relink_command=\"$relink_command\""
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -5574,7 +6142,7 @@ relink_command=\"$relink_command\""
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -5612,23 +6180,21 @@ relink_command=\"$relink_command\""
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -5650,34 +6216,25 @@ relink_command=\"$relink_command\""
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+- tmpdir="/tmp"
+- test -n "$TMPDIR" && tmpdir="$TMPDIR"
+- tmpdir="$tmpdir/libtool-$$"
+- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+- else
+- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+- continue
+- fi
++ tmpdir=`func_mktempdir`
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -5697,7 +6254,7 @@ relink_command=\"$relink_command\""
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5729,16 +6286,17 @@ relink_command=\"$relink_command\""
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+- if test -n "$stripme" && test -n "$striplib"; then
++ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+- eval cmds=\"$old_postinstall_cmds\"
++ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -5752,9 +6310,9 @@ relink_command=\"$relink_command\""
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5773,10 +6331,11 @@ relink_command=\"$relink_command\""
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+- eval cmds=\"$finish_cmds\"
++ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+@@ -5793,9 +6352,9 @@ relink_command=\"$relink_command\""
+ fi
+
+ # Exit here if they wanted silent mode.
+- exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+- $echo "----------------------------------------------------------------------"
++ $echo "X----------------------------------------------------------------------" | $Xsed
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+@@ -5828,8 +6387,8 @@ relink_command=\"$relink_command\""
+ $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."
+- $echo "----------------------------------------------------------------------"
+- exit 0
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -5841,7 +6400,7 @@ relink_command=\"$relink_command\""
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -5849,7 +6408,7 @@ relink_command=\"$relink_command\""
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+@@ -5860,7 +6419,7 @@ relink_command=\"$relink_command\""
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -5886,8 +6445,10 @@ relink_command=\"$relink_command\""
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -5951,12 +6512,12 @@ relink_command=\"$relink_command\""
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -5967,7 +6528,7 @@ relink_command=\"$relink_command\""
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5995,7 +6556,7 @@ relink_command=\"$relink_command\""
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+@@ -6045,15 +6606,24 @@ relink_command=\"$relink_command\""
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+- if test "$mode" = uninstall; then
++ case "$mode" in
++ clean)
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
++ *" $dlname "*) ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ esac
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ ;;
++ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- eval cmds=\"$postuninstall_cmds\"
++ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6635,11 @@ relink_command=\"$relink_command\""
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- eval cmds=\"$old_postuninstall_cmds\"
++ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6078,7 +6649,8 @@ relink_command=\"$relink_command\""
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+- fi
++ ;;
++ esac
+ fi
+ ;;
+
+@@ -6107,7 +6679,7 @@ relink_command=\"$relink_command\""
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+- *.exe)
++ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6724,20 @@ relink_command=\"$relink_command\""
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -6201,7 +6773,7 @@ MODE-ARGS vary depending on the MODE. T
+ a more detailed description of MODE.
+
+ Report bugs to <bug-libtool at gnu.org>."
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -6302,9 +6874,9 @@ The following components of LINK-COMMAND
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6313,12 +6885,16 @@ The following components of LINK-COMMAND
+ -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
++ -precious-files-regex REGEX
++ don't remove output files matching REGEX
+ -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
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -6354,14 +6930,14 @@ Otherwise, only FILE itself is deleted u
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
+
+ # 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 +6951,11 @@ exit 0
+ # configuration. But we'll never go from static-only to shared-only.
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+
+ # Local Variables:
Added: branches/kdebase-legacy/kdebase/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/04_am_maintainer_mode.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/04_am_maintainer_mode.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@ AC_ARG_PROGRAM
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
Added: branches/kdebase-legacy/kdebase/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/05_pedantic-errors.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/05_pedantic-errors.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2173,9 +2173,6 @@ AC_LANG_CPLUSPLUS
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
Added: branches/kdebase-legacy/kdebase/debian/patches/06_disable_no_undefined.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/06_disable_no_undefined.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/06_disable_no_undefined.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1718,15 +1718,6 @@ AC_DEFUN([KDE_CHECK_CLOSURE],
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
Modified: branches/kdebase-legacy/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/10_kdmrc_defaults.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/10_kdmrc_defaults.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
-@@ -442,7 +442,7 @@
+@@ -442,7 +442,7 @@ void KDMAppearanceWidget::load()
config->setGroup("X-*-Greeter");
// Read the greeting string
@@ -9,7 +9,7 @@
// Regular logo or clock
QString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -485,7 +485,7 @@
+@@ -485,7 +485,7 @@ void KDMAppearanceWidget::load()
void KDMAppearanceWidget::defaults()
{
@@ -36,7 +36,7 @@
#endif
#if 0 /*def HASXDMAUTH*/
-@@ -1355,7 +1355,7 @@
+@@ -1355,7 +1355,7 @@ Description:
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -45,7 +45,7 @@
Key: ServerArgsLocal
Type: string
-@@ -1921,10 +1921,10 @@
+@@ -1921,10 +1921,10 @@ Description:
Key: SessionsDirs
Type: list
@@ -58,7 +58,7 @@
Comment:
The directories containing session type definitions in .desktop format.
Description:
-@@ -1948,7 +1948,7 @@
+@@ -1948,7 +1948,7 @@ Description:
Key: UseSessReg
Type: bool
@@ -67,7 +67,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2044,9 +2044,9 @@
+@@ -2044,9 +2044,9 @@ Description:
Key: GreetString
Type: string
@@ -79,7 +79,7 @@
Comment:
The headline in the greeter. The following character pairs are replaced:
- %d -> current display
-@@ -2482,7 +2482,6 @@
+@@ -2482,7 +2482,6 @@ Type: int
Default: 0
User: greeter
Instance: #*/
@@ -87,7 +87,7 @@
Comment:
Random seed for forging saved session types, etc. of unknown users.
This value should be random but constant across the login domain.
-@@ -2579,7 +2578,7 @@
+@@ -2579,7 +2578,7 @@ Key: AllowClose
Type: bool
Default: true
User: greeter
Modified: branches/kdebase-legacy/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/11_genkdmconf.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/11_genkdmconf.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
-@@ -531,7 +531,7 @@
+@@ -531,7 +531,7 @@ static const char def_xaccess[] =
"# right hand sides can match.\n"
"#\n"
"\n"
@@ -9,7 +9,7 @@
"\n"
"#\n"
"# To hardwire a specific terminal to a specific host, you can\n"
-@@ -549,7 +549,7 @@
+@@ -549,7 +549,7 @@ static const char def_xaccess[] =
"# so this may not work in all environments.\n"
"#\n"
"\n"
@@ -18,7 +18,7 @@
"\n"
"#\n"
"# If you'd prefer to configure the set of hosts each terminal sees,\n"
-@@ -585,35 +585,25 @@
+@@ -585,35 +585,25 @@ static const char def_startup[] =
"#! /bin/sh\n"
"# Xstartup - run as root before session starts\n"
"\n"
@@ -72,7 +72,7 @@
static const char def_reset[] =
"#! /bin/sh\n"
-@@ -629,12 +619,13 @@
+@@ -629,12 +619,13 @@ static const char def_reset[] =
"#devname=`echo $DISPLAY | cut -c1-8`\n"
"#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
#else
@@ -91,7 +91,7 @@
static const char def_session1[] =
"#! /bin/sh\n"
-@@ -666,6 +657,7 @@
+@@ -666,6 +657,7 @@ static const char def_session1[] =
" [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
" [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
" [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -99,7 +99,7 @@
" ;;\n"
" */csh|*/tcsh)\n"
" # [t]cshrc is always sourced automatically.\n"
-@@ -682,28 +674,8 @@
+@@ -682,28 +674,8 @@ static const char def_session2[] =
" [ -f $HOME/.profile ] && . $HOME/.profile\n"
" ;;\n"
"esac\n"
@@ -130,7 +130,7 @@
static const char def_background[] =
"[Desktop0]\n"
-@@ -978,29 +950,6 @@
+@@ -978,29 +950,6 @@ getInitTab( void )
if (maxTTY)
return;
Modified: branches/kdebase-legacy/kdebase/debian/patches/14_kdm_no_custom.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/14_kdm_no_custom.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/14_kdm_no_custom.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -364,7 +364,6 @@
+@@ -364,7 +364,6 @@ void
KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
for (uint i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -392,7 +391,6 @@
+@@ -392,7 +391,6 @@ KGreeter::insertSessions()
}
}
putSession( "default", i18n("Default"), false, "default" );
Modified: branches/kdebase-legacy/kdebase/debian/patches/15_cups_docroot.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/15_cups_docroot.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/15_cups_docroot.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/doc/kdeprint/cups-config.docbook
+++ b/doc/kdeprint/cups-config.docbook
-@@ -487,11 +487,11 @@
+@@ -487,11 +487,11 @@ unprivileged account for the server dire
<term><guilabel>Server group</guilabel></term>
<listitem>
<para>The group the server runs under. Normally this must be
@@ -14,7 +14,7 @@
</informalexample>
</listitem>
</varlistentry>
-@@ -1012,7 +1012,7 @@
+@@ -1012,7 +1012,7 @@ format="PNG"/></imageobject>
<listitem>
<para>The root folder for &HTTP; documents that are served. By
default the compiled in folder, <filename
@@ -23,7 +23,7 @@
</listitem>
</varlistentry>
-@@ -1756,7 +1756,7 @@
+@@ -1756,7 +1756,7 @@ over.</para>
<para>The group name for <systemitem
class="groupname">System</systemitem> or printer administration
access. The default varies depending on the operating system, but
Modified: branches/kdebase-legacy/kdebase/debian/patches/16_kdm_X_path.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/16_kdm_X_path.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/16_kdm_X_path.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/backend/server.c
+++ b/kdm/backend/server.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,7 @@ from the copyright holder.
#include <X11/Xlib.h>
#include <stdio.h>
@@ -8,7 +8,7 @@
#include <signal.h>
-@@ -94,6 +95,21 @@
+@@ -94,6 +95,21 @@ StartServerOnce( void )
(void)Signal( SIGUSR1, SIG_IGN );
(void)execv( argv[0], argv );
LogError( "X server %\"s cannot be executed\n", argv[0] );
@@ -32,7 +32,7 @@
LogError( "X server fork failed\n" );
--- a/kdm/backend/dm.c
+++ b/kdm/backend/dm.c
-@@ -39,6 +39,7 @@
+@@ -39,6 +39,7 @@ from the copyright holder.
#include "dm_error.h"
#include <stdio.h>
@@ -40,7 +40,7 @@
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
-@@ -564,6 +565,21 @@
+@@ -564,6 +565,21 @@ StartRemoteLogin( struct display *d )
Debug( "exec %\"[s\n", argv );
(void)execv( argv[0], argv );
LogError( "X server %\"s cannot be executed\n", argv[0] );
Modified: branches/kdebase-legacy/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/18_default_fonts.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/18_default_fonts.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -21,7 +21,7 @@
</ktheme>
--- a/kcontrol/kdm/kdm-font.cpp
+++ b/kcontrol/kdm/kdm-font.cpp
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ void KDMFontWidget::set_def()
{
stdFontChooser->setFont(QFont("Sans Serif", 10));
failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold));
@@ -30,7 +30,7 @@
}
void KDMFontWidget::save()
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ void KDMFontWidget::load()
void KDMFontWidget::defaults()
{
set_def();
@@ -41,7 +41,7 @@
#include "kdm-font.moc"
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -2096,19 +2096,19 @@
+@@ -2096,19 +2096,19 @@ Description:
# This needs to come _in front_ of the font settings to be effective!
Key: AntiAliasing
Type: bool
@@ -67,7 +67,7 @@
The font for the greeter headline.
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ bool FontAASettings::load( bool useDefau
kglobals.setReadDefaults( useDefaults );
kglobals.setGroup("General");
@@ -76,7 +76,7 @@
xft.setHintStyle(hStyle);
xft.apply(); // Save this setting
kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ KXftConfig::Hint::Style FontAASettings::
if(hintingStyle->currentText()==KXftConfig::description((KXftConfig::Hint::Style)s))
return (KXftConfig::Hint::Style)s;
@@ -85,7 +85,7 @@
}
#endif
-@@ -527,13 +527,13 @@
+@@ -527,13 +527,13 @@ KFonts::KFonts(QWidget *parent, const ch
QFont f0("Sans Serif", 10);
QFont f1("Monospace", 10);
QFont f2("Sans Serif", 10);
@@ -103,7 +103,7 @@
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
-@@ -524,7 +524,7 @@
+@@ -524,7 +524,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftHintStyle"))
{
@@ -112,7 +112,7 @@
contents += "Xft.hinting: ";
if(hintStyle.isEmpty())
contents += "-1\n";
-@@ -540,7 +540,7 @@
+@@ -540,7 +540,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftSubPixel"))
{
Modified: branches/kdebase-legacy/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,13 +1,13 @@
--- a/kcontrol/kcontrol/KControl.desktop
+++ b/kcontrol/kcontrol/KControl.desktop
-@@ -90,3 +90,4 @@
+@@ -91,3 +91,4 @@ Name[zu]=Indawo Yokulawula
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;Core;
+OnlyShowIn=KDE;
--- a/kcontrol/kcontrol/kinfocenter.desktop
+++ b/kcontrol/kcontrol/kinfocenter.desktop
-@@ -105,3 +105,4 @@
+@@ -107,3 +107,4 @@ GenericName[zh_TW]=資訊中心
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;System;
Modified: branches/kdebase-legacy/kdebase/debian/patches/20_applications_menu_move.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/20_applications_menu_move.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/20_applications_menu_move.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
-@@ -1669,7 +1669,7 @@
+@@ -1669,7 +1669,7 @@ new menu format:
</para>
<informalexample>
@@ -9,7 +9,7 @@
<programlisting>
<markup>
<Menu>
-@@ -1743,7 +1743,7 @@
+@@ -1743,7 +1743,7 @@ These are controlled by $<envar>XDG_DATA
information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
<informalexample>
Modified: branches/kdebase-legacy/kdebase/debian/patches/23_startkde_kpersonalizer.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/startkde
+++ b/startkde
-@@ -287,17 +287,21 @@
+@@ -287,17 +287,21 @@ echo 'startkde: Starting up...' 1>&2
# run KPersonalizer before the session, if this is the first login
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
Modified: branches/kdebase-legacy/kdebase/debian/patches/25_khelp_htdig.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/25_khelp_htdig.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/25_khelp_htdig.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/khelpcenter/searchhandlers/khc_docbookdig.pl.in
+++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.in
-@@ -26,10 +26,12 @@
+@@ -26,10 +26,12 @@ use strict;
use Getopt::Long;
@@ -14,7 +14,7 @@
my $dbg = 1;
-@@ -89,7 +91,7 @@
+@@ -89,7 +91,7 @@ $ENV{ PATH } = '/bin:/usr/bin';
$ENV{ CDPATH } = '';
$ENV{ ENV } = '';
@@ -23,7 +23,7 @@
my $findcmd = "find $findpath -name index.docbook";
print STDERR "FINDCMD: $findcmd\n";
-@@ -140,7 +142,7 @@
+@@ -140,7 +142,7 @@ case "\$orig" in
help:/*)
orig=\${orig/help:\\//}
orig=\${orig/\/index.docbook/}
@@ -32,7 +32,7 @@
file=index.docbook
;;
*)
-@@ -167,7 +169,7 @@
+@@ -167,7 +169,7 @@ common_dir: $commondir
locale: $locale
database_dir: $htdigdb
database_base: \${database_dir}/$identifier
@@ -43,7 +43,7 @@
ignore_noindex: true
--- a/khelpcenter/searchhandlers/khc_htdig.pl.in
+++ b/khelpcenter/searchhandlers/khc_htdig.pl.in
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ use strict;
use Getopt::Long;
@@ -54,7 +54,7 @@
chomp $kdeprefix;
--- a/khelpcenter/searchhandlers/khc_htsearch.pl
+++ b/khelpcenter/searchhandlers/khc_htsearch.pl
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ use Getopt::Long;
use open IO => ':utf8';
use open ':std';
Modified: branches/kdebase-legacy/kdebase/debian/patches/26_face_load.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/26_face_load.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/26_face_load.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -173,6 +173,13 @@
+@@ -173,6 +173,13 @@ void
KGreeter::insertUser( const QImage &default_pix,
const QString &username, struct passwd *ps )
{
@@ -14,7 +14,7 @@
if (userList)
userList->append( username );
if (!userView)
-@@ -236,6 +243,9 @@
+@@ -236,6 +243,9 @@ KGreeter::insertUser( const QImage &defa
realname.append( "\n" ).append( username );
new UserListViewItem( userView, realname, QPixmap( p ), username );
}
@@ -24,7 +24,7 @@
}
class KCStringList : public QValueList<QCString> {
-@@ -282,15 +292,8 @@
+@@ -282,15 +292,8 @@ KGreeter::insertUsers()
{
struct passwd *ps;
@@ -40,7 +40,7 @@
QImage default_pix;
if (userView) {
-@@ -354,10 +357,6 @@
+@@ -354,10 +357,6 @@ KGreeter::insertUsers()
if (userList)
userList->sort();
}
Modified: branches/kdebase-legacy/kdebase/debian/patches/27_kfreebsd_sysguard.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -1928,6 +1928,7 @@
+@@ -1937,6 +1937,7 @@ AC_MSG_CHECKING([if ksysguardd can be co
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
@@ -10,7 +10,7 @@
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
--- a/configure
+++ b/configure
-@@ -54545,6 +54545,7 @@
+@@ -54578,6 +54578,7 @@ echo $ECHO_N "checking if ksysguardd can
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
@@ -20,7 +20,7 @@
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
--- a/ksysguard/configure.in.in
+++ b/ksysguard/configure.in.in
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ AC_MSG_CHECKING([if ksysguardd can be co
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
Modified: branches/kdebase-legacy/kdebase/debian/patches/28_kdebase_rubberband.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/28_kdebase_rubberband.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/28_kdebase_rubberband.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
-@@ -229,6 +229,14 @@
+@@ -229,6 +229,14 @@ KCMStyle::KCMStyle( QWidget* parent, con
containerLayout->addWidget( lblTooltipEffect, 1, 0 );
containerLayout->addWidget( comboTooltipEffect, 1, 1 );
@@ -15,7 +15,7 @@
comboMenuEffect = new QComboBox( FALSE, containerFrame );
comboMenuEffect->insertItem( i18n("Disable") );
comboMenuEffect->insertItem( i18n("Animate") );
-@@ -236,8 +244,8 @@
+@@ -236,8 +244,8 @@ KCMStyle::KCMStyle( QWidget* parent, con
comboMenuEffect->insertItem( i18n("Make Translucent") );
lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame );
lblMenuEffect->setBuddy( comboMenuEffect );
@@ -26,7 +26,7 @@
comboMenuHandle = new QComboBox( FALSE, containerFrame );
comboMenuHandle->insertItem( i18n("Disable") );
-@@ -245,11 +253,11 @@
+@@ -245,11 +253,11 @@ KCMStyle::KCMStyle( QWidget* parent, con
// comboMenuHandle->insertItem( i18n("Enable") );
lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame );
lblMenuHandle->setBuddy( comboMenuHandle );
@@ -41,7 +41,7 @@
// Push the [label combo] to the left.
comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
-@@ -359,6 +367,7 @@
+@@ -359,6 +367,7 @@ KCMStyle::KCMStyle( QWidget* parent, con
connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty()));
connect( comboTooltipEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
@@ -49,7 +49,7 @@
connect( comboComboEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
connect( comboMenuHandle, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
-@@ -556,6 +565,11 @@
+@@ -556,6 +565,11 @@ void KCMStyle::save()
item = comboTooltipEffect->currentItem();
config.writeEntry( "EffectAnimateTooltip", item == 1);
config.writeEntry( "EffectFadeTooltip", item == 2 );
@@ -61,7 +61,7 @@
item = comboMenuHandle->currentItem();
config.writeEntry( "InsertTearOffHandle", item );
item = comboMenuEffect->currentItem();
-@@ -887,7 +901,11 @@
+@@ -887,7 +901,11 @@ void KCMStyle::loadEffects( KConfig& con
comboTooltipEffect->setCurrentItem( 2 );
else
comboTooltipEffect->setCurrentItem( 0 );
@@ -74,7 +74,7 @@
if ( config.readBoolEntry( "EffectAnimateMenu", false) )
comboMenuEffect->setCurrentItem( 1 );
else if ( config.readBoolEntry( "EffectFadeMenu", false) )
-@@ -898,7 +916,7 @@
+@@ -898,7 +916,7 @@ void KCMStyle::loadEffects( KConfig& con
comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0));
// KStyle Menu transparency and drop-shadow options...
@@ -83,7 +83,7 @@
QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
#ifdef HAVE_XRENDER
-@@ -1027,6 +1045,8 @@
+@@ -1027,6 +1045,8 @@ void KCMStyle::addWhatsThis()
QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
"<b>Fade: </b>Fade in tooltips using alpha-blending.") );
@@ -94,7 +94,7 @@
"<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n"
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
-@@ -126,11 +126,13 @@
+@@ -126,11 +126,13 @@ private:
QFrame* containerFrame;
QGridLayout* containerLayout;
QComboBox* comboTooltipEffect;
@@ -110,7 +110,7 @@
QLabel* lblMenuHandle;
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
-@@ -405,9 +405,11 @@
+@@ -405,9 +405,11 @@ void KonqBaseListViewWidget::contentsMou
{
if ( m_rubber )
{
@@ -125,7 +125,7 @@
}
delete m_selected;
-@@ -417,14 +419,15 @@
+@@ -417,14 +419,15 @@ void KonqBaseListViewWidget::contentsMou
KonqBaseListViewItem* item = isExecuteArea( vp ) ?
static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L;
@@ -144,7 +144,7 @@
m_fileTip->setItem( 0 );
}
if ( e->button() != RightButton )
-@@ -440,9 +443,11 @@
+@@ -440,9 +443,11 @@ void KonqBaseListViewWidget::contentsMou
{
if ( m_rubber )
{
@@ -157,7 +157,7 @@
}
if ( m_scrollTimer )
-@@ -534,23 +539,21 @@
+@@ -534,23 +539,21 @@ void KonqBaseListViewWidget::leaveEvent(
KListView::leaveEvent( e );
}
@@ -187,7 +187,7 @@
}
void KonqBaseListViewWidget::slotAutoScroll()
-@@ -566,10 +569,12 @@
+@@ -566,10 +569,12 @@ void KonqBaseListViewWidget::slotAutoScr
if ( vc == m_rubber->bottomRight() )
return;
@@ -201,7 +201,7 @@
m_rubber->setBottomRight( vc );
QListViewItem *cur = itemAt( QPoint(0,0) );
-@@ -577,12 +582,20 @@
+@@ -577,12 +582,20 @@ void KonqBaseListViewWidget::slotAutoScr
bool block = signalsBlocked();
blockSignals( true );
@@ -224,7 +224,7 @@
rect = QRect( viewportToContents( rect.topLeft() ),
viewportToContents( rect.bottomRight() ) );
-@@ -606,9 +619,26 @@
+@@ -606,9 +619,26 @@ void KonqBaseListViewWidget::slotAutoScr
if ( rect.intersects( nr ) )
{
if ( !cur->isSelected() && cur->isSelectable() )
@@ -253,7 +253,7 @@
cur = cur->itemBelow();
if (cur && !allColumnsShowFocus())
-@@ -625,9 +655,26 @@
+@@ -625,9 +655,26 @@ void KonqBaseListViewWidget::slotAutoScr
if ( rect.intersects( nr ) )
{
if ( !cur->isSelected() && cur->isSelectable() )
@@ -282,7 +282,7 @@
cur = cur->itemAbove();
if (cur && !allColumnsShowFocus())
-@@ -639,7 +686,31 @@
+@@ -639,7 +686,31 @@ void KonqBaseListViewWidget::slotAutoScr
blockSignals( block );
emit selectionChanged();
@@ -315,7 +315,7 @@
const int scroll_margin = 40;
ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin );
-@@ -669,9 +740,12 @@
+@@ -669,9 +740,12 @@ void KonqBaseListViewWidget::slotAutoScr
void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e )
{
@@ -332,7 +332,7 @@
void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e)
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ protected:
virtual void viewportPaintEvent( QPaintEvent *e );
virtual void viewportResizeEvent( QResizeEvent *e );
@@ -341,7 +341,7 @@
virtual void contentsMousePressEvent( QMouseEvent *e );
virtual void contentsMouseReleaseEvent( QMouseEvent *e );
virtual void contentsMouseMoveEvent( QMouseEvent *e );
-@@ -246,7 +246,8 @@
+@@ -246,7 +246,8 @@ protected:
QColor m_itemColor;
QRect *m_rubber;
@@ -353,7 +353,7 @@
bool m_bCaseInsensitive:1;
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/kfileividesktop.cpp
-@@ -134,40 +134,11 @@
+@@ -134,40 +134,11 @@ bool KFileIVIDesktop::shouldUpdateShadow
return false;
}
@@ -395,7 +395,7 @@
int textY = textRect( FALSE ).y();
int align = ((KIconView *) iconView())->itemTextPos() == QIconView::Bottom
? AlignHCenter : AlignAuto;
-@@ -184,12 +155,15 @@
+@@ -184,12 +155,15 @@ void KFileIVIDesktop::drawShadowedText(
int spread = shadowThickness();
if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) {
@@ -415,7 +415,7 @@
// use shadow
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/kfileividesktop.h
-@@ -80,12 +80,7 @@
+@@ -80,12 +80,7 @@ class KFileIVIDesktop : public KFileIVI
virtual void paintItem(QPainter *p, const QColorGroup &cg);
/**
Modified: branches/kdebase-legacy/kdebase/debian/patches/34_japanese_konsole_fix.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/34_japanese_konsole_fix.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/34_japanese_konsole_fix.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -11,7 +11,7 @@
struct interval {
unsigned short first;
unsigned short last;
-@@ -65,7 +69,7 @@
+@@ -65,7 +69,7 @@ static int bisearch(Q_UINT16 ucs, const
* in ISO 10646.
*/
@@ -20,7 +20,7 @@
{
/* sorted list of non-overlapping intervals of non-spacing characters */
static const struct interval combining[] = {
-@@ -131,7 +135,6 @@
+@@ -131,7 +135,6 @@ int konsole_wcwidth(Q_UINT16 ucs)
(ucs >= 0x20000 && ucs <= 0x2ffff) */));
}
@@ -28,7 +28,7 @@
/*
* The following function is the same as konsole_wcwidth(), except that
* spacing characters in the East Asian Ambiguous (A) category as
-@@ -202,15 +205,31 @@
+@@ -202,15 +205,31 @@ int konsole_wcwidth_cjk(Q_UINT16 ucs)
sizeof(ambiguous) / sizeof(struct interval) - 1))
return 2;
Modified: branches/kdebase-legacy/kdebase/debian/patches/38_furry_frosted_animals_support.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/38_furry_frosted_animals_support.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/38_furry_frosted_animals_support.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
-@@ -376,6 +376,8 @@
+@@ -376,6 +376,8 @@ void KPluginOptions::dirLoad( KConfig *c
else {//keep sync with kdebase/nsplugins
paths.append("$HOME/.mozilla/plugins");
paths.append("$HOME/.netscape/plugins");
@@ -11,7 +11,7 @@
paths.append("/usr/lib/browser-plugins");
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,8 @@ QStringList getSearchPaths()
// keep sync with kdebase/kcontrol/konqhtml
paths.append("$HOME/.mozilla/plugins");
paths.append("$HOME/.netscape/plugins");
Modified: branches/kdebase-legacy/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/config.def
+++ b/kdm/config.def
-@@ -2607,7 +2607,7 @@
+@@ -2607,7 +2607,7 @@ Key: Theme
Type: string
Default: ""
User: greeter
Modified: branches/kdebase-legacy/kdebase/debian/patches/45_klipper_backreferences.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/45_klipper_backreferences.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/45_klipper_backreferences.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ URLGrabber::URLGrabber( KConfig* config
{
if( m_config == NULL )
m_config = kapp->config();
@@ -8,7 +8,7 @@
myMenu = 0L;
myPopupKillTimeout = 8;
m_stripWhiteSpace = true;
-@@ -160,6 +159,7 @@
+@@ -160,6 +159,7 @@ void URLGrabber::actionMenu( bool wm_cla
QString item;
myCommandMapper.clear();
@@ -16,7 +16,7 @@
myPopupKillTimer->stop();
delete myMenu;
-@@ -184,6 +184,7 @@
+@@ -184,6 +184,7 @@ void URLGrabber::actionMenu( bool wm_cla
else
id = myMenu->insertItem( SmallIcon(command->pixmap), item);
myCommandMapper.insert( id, command );
@@ -24,7 +24,7 @@
}
}
-@@ -224,19 +225,27 @@
+@@ -224,19 +225,27 @@ void URLGrabber::slotItemSelected( int i
break;
default:
ClipCommand *command = myCommandMapper.find( id );
@@ -57,7 +57,7 @@
if ( cmdLine.isEmpty() )
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
-@@ -72,7 +72,8 @@
+@@ -72,7 +72,8 @@ public:
private:
const ActionList& matchingActions( const QString& );
@@ -67,7 +67,7 @@
void editData();
bool isAvoidedWindow() const;
void actionMenu( bool wm_class_check );
-@@ -83,6 +84,7 @@
+@@ -83,6 +84,7 @@ private:
QString myClipData;
ClipAction *myCurrentAction;
QIntDict<ClipCommand> myCommandMapper;
@@ -75,7 +75,7 @@
KPopupMenu *myMenu;
QTimer *myPopupKillTimer;
int myPopupKillTimeout;
-@@ -127,8 +129,13 @@
+@@ -127,8 +129,13 @@ public:
void setRegExp( const QString& r) { myRegExp = QRegExp( r ); }
QString regExp() const { return myRegExp.pattern(); }
@@ -91,7 +91,7 @@
}
void setDescription( const QString& d) { myDescription = d; }
-@@ -147,9 +154,15 @@
+@@ -147,9 +154,15 @@ public:
*/
void save( KConfig * ) const;
Modified: branches/kdebase-legacy/kdebase/debian/patches/46_disable_debug_by_default.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/46_disable_debug_by_default.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/46_disable_debug_by_default.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdebugdialog/klistdebugdialog.cpp
+++ b/kdebugdialog/klistdebugdialog.cpp
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ void KListDebugDialog::load()
{
pConfig->setGroup( (*it)->name() ); // Group name = debug area code = cb's name
Modified: branches/kdebase-legacy/kdebase/debian/patches/54_seli_xinerama.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/54_seli_xinerama.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/54_seli_xinerama.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -17,7 +17,7 @@
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
-@@ -369,6 +369,17 @@
+@@ -369,6 +369,17 @@ int Minicli::runCommand()
cmd = uri.path();
else
cmd = uri.url();
@@ -35,7 +35,7 @@
// Determine whether the application should be run through
// the command line (terminal) interface...
-@@ -504,7 +515,7 @@
+@@ -504,7 +515,7 @@ int Minicli::runCommand()
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
@@ -44,7 +44,7 @@
return 0;
}
case KURIFilterData::EXECUTABLE:
-@@ -516,7 +527,7 @@
+@@ -516,7 +527,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
@@ -53,7 +53,7 @@
return 0;
}
}
-@@ -551,7 +562,7 @@
+@@ -551,7 +562,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
@@ -62,7 +62,7 @@
return 0;
}
-@@ -559,7 +570,7 @@
+@@ -559,7 +570,7 @@ int Minicli::runCommand()
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
@@ -71,7 +71,7 @@
return 0;
}
-@@ -571,7 +582,7 @@
+@@ -571,7 +582,7 @@ int Minicli::runCommand()
}
}
@@ -82,7 +82,7 @@
{
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
-@@ -516,9 +516,12 @@
+@@ -516,9 +516,12 @@ void KDesktop::popupExecuteCommand(const
if ( m_miniCli->isVisible() ) {
KWin::forceActiveWindow( m_miniCli->winId() );
} else {
@@ -100,7 +100,7 @@
}
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
-@@ -482,27 +482,33 @@
+@@ -482,27 +482,33 @@ bool Client::performMouseCommand( Option
case Options::MouseActivateAndRaise:
replay = isActive(); // for clickraise mode
workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled && replay );
@@ -134,7 +134,7 @@
if( options->moveMode == Options::Transparent && isMovable())
move_faked_activity = workspace()->fakeRequestedActivity( this );
// fallthrough
-@@ -709,6 +715,40 @@
+@@ -709,6 +715,40 @@ void Workspace::slotWindowToDesktop( int
sendClientToDesktop( c, i, true );
}
@@ -177,7 +177,7 @@
*/
--- a/kwin/options.h
+++ b/kwin/options.h
-@@ -124,6 +124,11 @@
+@@ -124,6 +124,11 @@ class Options : public KDecorationOption
*/
enum AltTabStyle { KDE, CDE };
AltTabStyle altTabStyle;
@@ -189,7 +189,7 @@
/**
* Xinerama options
-@@ -133,6 +138,9 @@
+@@ -133,6 +138,9 @@ class Options : public KDecorationOption
bool xineramaMovementEnabled;
bool xineramaMaximizeEnabled;
bool xineramaFullscreenEnabled;
@@ -201,7 +201,7 @@
MoveResizeMode, either Tranparent or Opaque.
--- a/kwin/workspace.h
+++ b/kwin/workspace.h
-@@ -91,6 +91,7 @@
+@@ -91,6 +91,7 @@ class Workspace : public QObject, public
QRect clientArea( clientAreaOption, const QPoint& p, int desktop ) const;
QRect clientArea( clientAreaOption, const Client* c ) const;
@@ -209,7 +209,7 @@
/**
* @internal
-@@ -161,6 +162,13 @@
+@@ -161,6 +162,13 @@ class Workspace : public QObject, public
*/
int numberOfDesktops() const;
void setNumberOfDesktops( int n );
@@ -223,7 +223,7 @@
QWidget* desktopWidget();
-@@ -186,6 +194,7 @@
+@@ -186,6 +194,7 @@ class Workspace : public QObject, public
void sendClientToDesktop( Client* c, int desktop, bool dont_activate );
void windowToPreviousDesktop( Client* c );
void windowToNextDesktop( Client* c );
@@ -231,7 +231,7 @@
// KDE4 remove me - and it's also in the DCOP interface :(
void showWindowMenuAt( unsigned long id, int x, int y );
-@@ -224,6 +233,7 @@
+@@ -224,6 +233,7 @@ class Workspace : public QObject, public
void nextDesktop();
void previousDesktop();
void circulateDesktopApplications();
@@ -239,7 +239,7 @@
QString desktopName( int desk ) const;
virtual void setDesktopLayout(int , int , int );
-@@ -301,6 +311,10 @@
+@@ -301,6 +311,10 @@ class Workspace : public QObject, public
//void slotSwitchToWindow( int );
void slotWindowToDesktop( int );
//void slotWindowToListPosition( int );
@@ -250,7 +250,7 @@
void slotWindowMaximize();
void slotWindowMaximizeVertical();
-@@ -481,6 +495,7 @@
+@@ -481,6 +495,7 @@ class Workspace : public QObject, public
int current_desktop;
int number_of_desktops;
QMemArray<int> desktop_focus_chain;
@@ -260,7 +260,7 @@
Client* active_popup_client;
--- a/kwin/tabbox.cpp
+++ b/kwin/tabbox.cpp
-@@ -23,7 +23,6 @@
+@@ -23,7 +23,6 @@ License. See the file "COPYING" for the
#include <klocale.h>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -268,7 +268,7 @@
#include <kstringhandler.h>
#include <stdarg.h>
#include <kdebug.h>
-@@ -110,26 +109,36 @@
+@@ -110,26 +109,36 @@ void TabBox::createClientList(ClientList
while ( c )
{
@@ -319,7 +319,7 @@
}
if ( chain )
-@@ -156,7 +165,7 @@
+@@ -156,7 +165,7 @@ void TabBox::reset()
{
int w, h, cw = 0, wmax = 0;
@@ -330,7 +330,7 @@
// fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below
--- a/kwin/kcmkwin/kwinoptions/windows.h
+++ b/kwin/kcmkwin/kwinoptions/windows.h
-@@ -86,6 +86,7 @@
+@@ -86,6 +86,7 @@ private slots:
void delayFocusOnTog(bool);
void clickRaiseOnTog(bool);
void updateAltTabMode();
@@ -338,7 +338,7 @@
void changed() { emit KCModule::changed(true); }
-@@ -101,6 +102,8 @@
+@@ -101,6 +102,8 @@ private:
void setDelayFocusInterval(int);
void setDelayFocus(bool);
void setClickRaise(bool);
@@ -347,7 +347,7 @@
void setAltTabMode(bool);
void setTraverseAll(bool);
void setRollOverDesktops(bool);
-@@ -113,6 +116,8 @@
+@@ -113,6 +116,8 @@ private:
QCheckBox *clickRaiseOn;
KIntNumInput *autoRaise;
KIntNumInput *delayFocus;
@@ -367,7 +367,7 @@
// kwm config keywords
#define KWM_ELECTRIC_BORDER "ElectricBorders"
-@@ -209,6 +211,27 @@
+@@ -209,6 +211,27 @@ KFocusConfig::KFocusConfig (bool _standA
QWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over"
" will automatically receive focus.") );
@@ -395,7 +395,7 @@
lay->addWidget(fcsBox);
kbdBox = new QButtonGroup(i18n("Navigation"), this);
-@@ -260,6 +283,8 @@
+@@ -260,6 +283,8 @@ KFocusConfig::KFocusConfig (bool _standA
connect(fcsBox, SIGNAL(clicked(int)), SLOT(changed()));
connect(autoRaise, SIGNAL(valueChanged(int)), SLOT(changed()));
connect(delayFocus, SIGNAL(valueChanged(int)), SLOT(changed()));
@@ -404,7 +404,7 @@
connect(altTabPopup, SIGNAL(clicked()), SLOT(changed()));
connect(traverseAll, SIGNAL(clicked()), SLOT(changed()));
connect(rollOverDesktops, SIGNAL(clicked()), SLOT(changed()));
-@@ -366,6 +391,22 @@
+@@ -366,6 +391,22 @@ void KFocusConfig::delayFocusOnTog(bool
void KFocusConfig::clickRaiseOnTog(bool ) {
}
@@ -427,7 +427,7 @@
void KFocusConfig::setAltTabMode(bool a) {
altTabPopup->setChecked(a);
}
-@@ -412,6 +453,10 @@
+@@ -412,6 +453,10 @@ void KFocusConfig::load( void )
setClickRaise(key != "off");
setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click
setDelayFocusEnabled();
@@ -438,7 +438,7 @@
key = config->readEntry(KWIN_ALTTABMODE, "KDE");
setAltTabMode(key == "KDE");
-@@ -467,6 +512,9 @@
+@@ -467,6 +512,9 @@ void KFocusConfig::save( void )
else
config->writeEntry(KWIN_CLICKRAISE, "off");
@@ -448,7 +448,7 @@
if (altTabPopup->isChecked())
config->writeEntry(KWIN_ALTTABMODE, "KDE");
else
-@@ -500,6 +548,9 @@
+@@ -500,6 +548,9 @@ void KFocusConfig::defaults()
setAutoRaise(false);
setDelayFocus(false);
setClickRaise(true);
@@ -460,7 +460,7 @@
setRollOverDesktops(true);
--- a/kwin/popupinfo.h
+++ b/kwin/popupinfo.h
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ class PopupInfo : public QWidget
{
Q_OBJECT
public:
@@ -469,7 +469,7 @@
~PopupInfo();
void reset();
-@@ -43,6 +43,7 @@
+@@ -43,6 +43,7 @@ class PopupInfo : public QWidget
bool m_show;
bool m_shown;
QString m_infoString;
@@ -479,7 +479,7 @@
} // namespace
--- a/kwin/options.cpp
+++ b/kwin/options.cpp
-@@ -71,6 +71,9 @@
+@@ -71,6 +71,9 @@ unsigned long Options::updateSettings()
altTabStyle = KDE; // what a default :-)
if ( val == "CDE" )
altTabStyle = CDE;
@@ -489,7 +489,7 @@
rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE);
-@@ -100,9 +103,10 @@
+@@ -91,9 +94,10 @@ unsigned long Options::updateSettings()
delete gc;
placement = Placement::policyFromString( config->readEntry("Placement"), true );
@@ -503,7 +503,7 @@
--- a/kwin/placement.cpp
+++ b/kwin/placement.cpp
-@@ -473,7 +473,7 @@
+@@ -473,7 +473,7 @@ void Placement::placeOnMainWindow(Client
it != mainwindows.end();
++it )
{
@@ -512,7 +512,7 @@
continue; // don't consider toolbars etc when placing
++mains_count;
place_on2 = *it;
-@@ -502,6 +502,11 @@
+@@ -502,6 +502,11 @@ void Placement::placeOnMainWindow(Client
}
place_on = place_on2; // use the only window filtered together with 'mains_count'
}
@@ -526,7 +526,7 @@
c->move( geom.topLeft());
--- a/kwin/client.cpp
+++ b/kwin/client.cpp
-@@ -1255,6 +1255,20 @@
+@@ -1255,6 +1255,20 @@ bool Client::isOnCurrentDesktop() const
return isOnDesktop( workspace()->currentDesktop());
}
@@ -549,7 +549,7 @@
{
--- a/kwin/popupinfo.cpp
+++ b/kwin/popupinfo.cpp
-@@ -25,7 +25,6 @@
+@@ -25,7 +25,6 @@ License. See the file "COPYING" for the
#include <klocale.h>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -557,7 +557,7 @@
#include <kstringhandler.h>
#include <kglobalsettings.h>
-@@ -34,8 +33,8 @@
+@@ -34,8 +33,8 @@ License. See the file "COPYING" for the
namespace KWinInternal
{
@@ -568,7 +568,7 @@
{
m_infoString = "";
m_shown = false;
-@@ -60,7 +59,7 @@
+@@ -60,7 +59,7 @@ PopupInfo::~PopupInfo()
*/
void PopupInfo::reset()
{
@@ -579,7 +579,7 @@
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
-@@ -211,14 +211,11 @@
+@@ -211,14 +211,11 @@ void Workspace::updateClientArea()
\sa geometry()
*/
@@ -595,7 +595,7 @@
QRect sarea = screenarea // may be NULL during KWin initialization
? screenarea[ desktop ][ screen ]
: desktopwidget->screenGeometry( screen );
-@@ -263,11 +260,21 @@
+@@ -263,11 +260,21 @@ QRect Workspace::clientArea( clientAreaO
return QRect();
}
@@ -617,7 +617,7 @@
/*!
Client \a c is moved around to position \a pos. This gives the
workspace the opportunity to interveniate and to implement
-@@ -896,10 +903,6 @@
+@@ -896,10 +903,6 @@ void Client::checkWorkspacePosition()
setGeometry( area );
return;
}
@@ -628,7 +628,7 @@
if( isFullScreen())
{
QRect area = workspace()->clientArea( FullScreenArea, this );
-@@ -926,6 +929,10 @@
+@@ -926,6 +929,10 @@ void Client::checkWorkspacePosition()
return;
}
@@ -639,7 +639,7 @@
if( !isShade()) // TODO
{
int old_diff_x = workarea_diff_x;
-@@ -1722,6 +1729,7 @@
+@@ -1722,6 +1729,7 @@ void Client::setGeometry( int x, int y,
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -647,7 +647,7 @@
}
void Client::plainResize( int w, int h, ForceGeometry_t force )
-@@ -1775,6 +1783,7 @@
+@@ -1775,6 +1783,7 @@ void Client::plainResize( int w, int h,
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -655,7 +655,7 @@
}
/*!
-@@ -1795,6 +1804,7 @@
+@@ -1795,6 +1804,7 @@ void Client::move( int x, int y, ForceGe
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -677,7 +677,7 @@
<group name="WM" >
--- a/kwin/client.h
+++ b/kwin/client.h
-@@ -118,6 +118,9 @@
+@@ -118,6 +118,9 @@ class Client : public QObject, public KD
bool isOnCurrentDesktop() const;
bool isOnAllDesktops() const;
void setOnAllDesktops( bool set );
@@ -689,7 +689,7 @@
bool isShown( bool shaded_is_shown ) const;
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ bool Client::manage( Window w, bool isMa
it != mainclients.end();
++it )
{
@@ -698,7 +698,7 @@
continue; // don't consider toolbars etc when placing
maincl = *it;
if( (*it)->isOnCurrentDesktop())
-@@ -202,9 +202,14 @@
+@@ -202,9 +202,14 @@ bool Client::manage( Window w, bool isMa
if( isMapped || session )
area = workspace()->clientArea( FullArea, geom.center(), desktop());
else if( options->xineramaPlacementEnabled )
@@ -717,7 +717,7 @@
{
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
-@@ -71,6 +71,7 @@
+@@ -71,6 +71,7 @@ Workspace::Workspace( bool restore )
QObject (0, "workspace"),
current_desktop (0),
number_of_desktops(0),
@@ -725,7 +725,7 @@
active_popup( NULL ),
active_popup_client( NULL ),
desktop_widget (0),
-@@ -191,7 +192,7 @@
+@@ -191,7 +192,7 @@ Workspace::Workspace( bool restore )
client_keys = new KGlobalAccel( this );
initShortcuts();
tab_box = new TabBox( this );
@@ -734,7 +734,7 @@
init();
-@@ -290,6 +291,7 @@
+@@ -290,6 +291,7 @@ void Workspace::init()
NET::WM2ExtendedStrut |
NET::WM2KDETemporaryRules |
NET::WM2ShowingDesktop |
@@ -742,7 +742,7 @@
NET::WM2DesktopLayout |
0
,
-@@ -1527,6 +1529,83 @@
+@@ -1527,6 +1529,83 @@ void Workspace::setDesktopLayout( int, i
{ // DCOP-only, unused
}
@@ -828,7 +828,7 @@
// rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to
--- a/kwin/activation.cpp
+++ b/kwin/activation.cpp
-@@ -360,6 +360,8 @@
+@@ -360,6 +360,8 @@ void Workspace::takeActivity( Client* c,
return;
}
c->takeActivity( flags, handled, Allowed );
@@ -837,7 +837,7 @@
}
void Workspace::handleTakeActivity( Client* c, Time /*timestamp*/, int flags )
-@@ -413,6 +415,13 @@
+@@ -413,6 +415,13 @@ bool Workspace::activateNextClient( Clie
{
if( !(*it)->isShown( false ) || !(*it)->isOnCurrentDesktop())
continue;
@@ -851,7 +851,7 @@
if( mainwindows.contains( *it ))
{
get_focus = *it;
-@@ -438,6 +447,31 @@
+@@ -438,6 +447,31 @@ bool Workspace::activateNextClient( Clie
return true;
}
@@ -883,7 +883,7 @@
void Workspace::gotFocusIn( const Client* c )
{
-@@ -860,6 +894,8 @@
+@@ -860,6 +894,8 @@ void Client::startupIdChanged()
desktop = asn_data.desktop();
if( !isOnAllDesktops())
workspace()->sendClientToDesktop( this, desktop, true );
Modified: branches/kdebase-legacy/kdebase/debian/patches/55_kwin_xinerama_xrandr1.2.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/55_kwin_xinerama_xrandr1.2.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/55_kwin_xinerama_xrandr1.2.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,7 +1,6 @@
-diff -uNr kdebase-3.5.9.dfsg.1/kwin/geometry.cpp kdebase-3.5.9.dfsg.1.n/kwin/geometry.cpp
---- kdebase-3.5.9.dfsg.1/kwin/geometry.cpp 2008-03-10 16:48:43.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1.n/kwin/geometry.cpp 2008-03-10 16:56:12.000000000 +0200
-@@ -47,6 +47,11 @@
+--- a/kwin/geometry.cpp
++++ b/kwin/geometry.cpp
+@@ -47,6 +47,11 @@ void Workspace::desktopResized()
NETSize desktop_geometry;
desktop_geometry.width = geom.width();
desktop_geometry.height = geom.height();
@@ -13,66 +12,45 @@
rootInfo->setDesktopGeometry( -1, desktop_geometry );
updateClientArea();
-diff -uNr kdebase-3.5.9.dfsg.1/kwin/options.cpp kdebase-3.5.9.dfsg.1.n/kwin/options.cpp
---- kdebase-3.5.9.dfsg.1/kwin/options.cpp 2008-03-10 16:48:43.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1.n/kwin/options.cpp 2008-03-10 16:54:15.000000000 +0200
-@@ -84,23 +84,7 @@
+--- a/kwin/options.cpp
++++ b/kwin/options.cpp
+@@ -84,15 +84,6 @@ unsigned long Options::updateSettings()
if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
focusStealingPreventionLevel = 0;
- KConfig *gc = new KConfig("kdeglobals", false, false);
-- bool isVirtual = KApplication::desktop()->isVirtualDesktop();
- gc->setGroup("Windows");
-- xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", isVirtual ) &&
-- isVirtual;
-- if (xineramaEnabled)
-- {
-- xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true);
-- xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true);
-- xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true);
-- xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true);
-- }
-- else
-- {
-- xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = xineramaFullscreenEnabled = false;
-- }
+- xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true );
+- xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true);
+- xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true);
+- xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true);
+- xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true);
- delete gc;
-+ updateXineramaSettings();
-
+-
placement = Placement::policyFromString( config->readEntry("Placement"), true );
xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ),
-@@ -223,6 +207,27 @@
+ -1, qApp->desktop()->numScreens() - 1 );
+@@ -214,6 +205,17 @@ unsigned long Options::updateSettings()
return changed;
}
+void Options::updateXineramaSettings()
+ {
+ KConfig *gc = new KConfig("kdeglobals", false, false);
-+ bool isVirtual = KApplication::desktop()->isVirtualDesktop();
+ gc->setGroup("Windows");
-+ xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", isVirtual ) &&
-+ isVirtual;
-+ if (xineramaEnabled)
-+ {
-+ xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true);
-+ xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true);
-+ xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true);
-+ xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true);
-+ }
-+ else
-+ {
-+ xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = xineramaFullscreenEnabled = false;
-+ }
++ xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true );
++ xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true);
++ xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", true);
++ xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", true);
++ xineramaFullscreenEnabled = gc->readBoolEntry ("XineramaFullscreenEnabled", true);
+ delete gc;
+ }
-+
// restricted should be true for operations that the user may not be able to repeat
// if the window is moved out of the workspace (e.g. if the user moves a window
-diff -uNr kdebase-3.5.9.dfsg.1/kwin/options.h kdebase-3.5.9.dfsg.1.n/kwin/options.h
---- kdebase-3.5.9.dfsg.1/kwin/options.h 2008-03-10 16:48:43.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1.n/kwin/options.h 2008-03-10 16:54:48.000000000 +0200
-@@ -33,6 +33,7 @@
+--- a/kwin/options.h
++++ b/kwin/options.h
+@@ -33,6 +33,7 @@ class Options : public KDecorationOption
~Options();
virtual unsigned long updateSettings();
Modified: branches/kdebase-legacy/kdebase/debian/patches/61_khelpcenter_max_results.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/61_khelpcenter_max_results.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/61_khelpcenter_max_results.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/khelpcenter/searchhandlers/khc_htsearch.pl
+++ b/khelpcenter/searchhandlers/khc_htsearch.pl
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ my $charset = langCharset( $lang );
$words = encode( $charset, $words );
if ( !open( HTSEARCH, "-|", "$htsearchpath", "-c", "$indexdir/$config.conf",
Modified: branches/kdebase-legacy/kdebase/debian/patches/70_kdm_consolekit.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/70_kdm_consolekit.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/70_kdm_consolekit.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kdm/configure.in.in
+++ b/kdm/configure.in.in
-@@ -240,4 +240,51 @@
+@@ -240,4 +240,51 @@ if test "x$with_kdm_xconsole" = xyes; th
AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
fi
@@ -93,7 +93,7 @@
+#endif /* __CONSOLE_KIT_H */
--- a/kdm/backend/session.c
+++ b/kdm/backend/session.c
-@@ -45,6 +45,10 @@
+@@ -45,6 +45,10 @@ from the copyright holder.
#include <ctype.h>
#include <signal.h>
@@ -104,7 +104,7 @@
struct display *td;
const char *td_setup = "auto";
-@@ -530,6 +534,10 @@
+@@ -530,6 +534,10 @@ ManageSession( struct display *d )
int ex, cmd;
volatile int clientPid = 0;
volatile Time_t tdiff = 0;
@@ -115,7 +115,7 @@
td = d;
Debug( "ManageSession %s\n", d->name );
-@@ -626,7 +634,12 @@
+@@ -626,7 +634,12 @@ ManageSession( struct display *d )
if (td_setup)
SetupDisplay( td_setup );
@@ -128,7 +128,7 @@
LogError( "Client start failed\n" );
SessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
}
-@@ -648,6 +661,14 @@
+@@ -648,6 +661,14 @@ ManageSession( struct display *d )
catchTerm( SIGTERM );
}
}
@@ -145,7 +145,7 @@
* a server crash is noticed - so we sleep a bit and wait
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,8 @@ from the copyright holder.
#ifndef _DM_H_
#define _DM_H_ 1
@@ -154,7 +154,7 @@
#include "greet.h"
#include <config.ci>
-@@ -476,7 +478,11 @@
+@@ -476,7 +478,11 @@ char **GRecvArgv( void );
#define GCONV_BINARY 5
typedef char *(*GConvFunc)( int what, const char *prompt );
int Verify( GConvFunc gconv, int rootok );
@@ -168,7 +168,7 @@
extern char **userEnviron, **systemEnviron;
--- a/kdm/backend/xdmcp.c
+++ b/kdm/backend/xdmcp.c
-@@ -924,6 +924,9 @@
+@@ -924,6 +924,9 @@ manage( struct sockaddr *from, int froml
}
d->clientAddr = clientAddress;
d->connectionType = connectionType;
@@ -740,7 +740,7 @@
+}
--- a/kdm/backend/Imakefile
+++ b/kdm/backend/Imakefile
-@@ -155,13 +155,13 @@
+@@ -155,13 +155,13 @@ PROCTITLE_DEFINES = -DHAS_SETPROCTITLE
netaddr.c reset.c resource.c protodpy.c policy.c \
session.c socket.c streams.c util.c xdmcp.c \
process.c mitauth.c \
@@ -770,7 +770,7 @@
$(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
bin_PROGRAMS = kdm
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ kdm_SOURCES = \
bootman.c \
choose.c \
client.c \
@@ -780,7 +780,7 @@
dm.c \
--- a/kdm/backend/client.c
+++ b/kdm/backend/client.c
-@@ -83,6 +83,10 @@
+@@ -83,6 +83,10 @@ extern int loginsuccess( const char *Use
#endif
#include <signal.h>
@@ -791,7 +791,7 @@
/*
* Session data, mostly what struct verify_info was for
*/
-@@ -1121,8 +1125,13 @@
+@@ -1121,8 +1125,13 @@ static int removeSession;
static int removeCreds;
#endif
@@ -805,7 +805,7 @@
{
const char *home, *sessargs, *desksess;
char **env, *xma;
-@@ -1218,6 +1227,11 @@
+@@ -1218,6 +1227,11 @@ StartClient()
if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbtkfile );
#endif
Modified: branches/kdebase-legacy/kdebase/debian/patches/71_kio_man_utf8.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/71_kio_man_utf8.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/71_kio_man_utf8.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
-@@ -517,6 +517,11 @@
+@@ -517,6 +517,11 @@ void MANProtocol::slotGetStdOutput(KProc
myStdStream += QString::fromLocal8Bit(s, len);
}
@@ -12,7 +12,7 @@
char *MANProtocol::readManPage(const char *_filename)
{
QCString filename = _filename;
-@@ -564,24 +569,20 @@
+@@ -564,24 +569,20 @@ char *MANProtocol::readManPage(const cha
}
lastdir = filename.left(filename.findRev('/'));
@@ -52,7 +52,7 @@
}
--- a/kioslave/man/kio_man.h
+++ b/kioslave/man/kio_man.h
-@@ -61,6 +61,7 @@
+@@ -61,6 +61,7 @@ public:
private slots:
void slotGetStdOutput(KProcess*, char*, int);
Modified: branches/kdebase-legacy/kdebase/debian/patches/72_fix_bashism.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/72_fix_bashism.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/72_fix_bashism.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
---- a/startkde 2008-06-08 18:47:48.000000000 +0100
-+++ b/startkde 2008-06-08 18:48:43.000000000 +0100
-@@ -337,7 +337,7 @@
+--- a/startkde
++++ b/startkde
+@@ -341,7 +341,7 @@ fi
KDE_FULL_SESSION=true
export KDE_FULL_SESSION
xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
Modified: branches/kdebase-legacy/kdebase/debian/patches/73_doc_482268.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/73_doc_482268.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/73_doc_482268.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,11 +1,6 @@
---- a/doc/kate/part.docbook 2006-01-19 17:01:27.000000000 +0000
-+++ b/doc/kate/part.docbook 2008-06-17 15:19:08.000000000 +0100
-@@ -342,16 +342,25 @@
-
- <varlistentry>
- <term><guilabel>Replace With</guilabel></term>
- <listitem><para>This is where to enter the replacement
- string.</para></listitem>
+--- a/doc/kate/part.docbook
++++ b/doc/kate/part.docbook
+@@ -347,6 +347,15 @@ string.</para></listitem>
</varlistentry>
<varlistentry>
@@ -21,8 +16,3 @@
<term><guilabel>Selected Text</guilabel></term>
<listitem>
<para>This option is disabled if no text is selected, or if the
- <guilabel>Prompt on Replace</guilabel>
- option is enabled. If checked, all matches of the search string within
- the selected text will be replaced with the replace string.</para>
- </listitem>
- </varlistentry>
Modified: branches/kdebase-legacy/kdebase/debian/patches/74_kdeprint_only_in_kde.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/74_kdeprint_only_in_kde.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/74_kdeprint_only_in_kde.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
---- kdebase-3.5.9.dfsg.1.orig/kdeprint/printmgr/printers.desktop
-+++ kdebase-3.5.9.dfsg.1/kdeprint/printmgr/printers.desktop
-@@ -227,5 +227,5 @@
+--- a/kdeprint/printmgr/printers.desktop
++++ b/kdeprint/printmgr/printers.desktop
+@@ -231,5 +231,5 @@ Keywords[xh]=shicilela,umshicileli,uphat
Keywords[zh_CN]=print,printer,printing management,打印,打印机,打印管理
Keywords[zh_TW]=print,printer,printing management,列印,印表機,列印管理
Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo
Modified: branches/kdebase-legacy/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kcontrol/kdm/kdm-shut.cpp
+++ b/kcontrol/kdm/kdm-shut.cpp
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ KDMSessionsWidget::KDMSessionsWidget(QWi
QWhatsThis::add( restart_label, wtstr );
QWhatsThis::add( restart_lined, wtstr );
@@ -9,7 +9,7 @@
QGroupBox *group4 = new QGroupBox( i18n("Miscellaneous"), this );
bm_combo = new KBackedComboBox( group4 );
-@@ -100,15 +100,16 @@
+@@ -100,15 +100,16 @@ KDMSessionsWidget::KDMSessionsWidget(QWi
wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
QWhatsThis::add( bm_label, wtstr );
QWhatsThis::add( bm_combo, wtstr );
@@ -28,7 +28,7 @@
main->addStretch();
lgroup0->addRowSpacing(0, group0->fontMetrics().height()/2);
-@@ -129,10 +130,12 @@
+@@ -129,10 +130,12 @@ KDMSessionsWidget::KDMSessionsWidget(QWi
lgroup1->addWidget(restart_label, 1, 3);
lgroup1->addWidget(restart_lined, 1, 4);
@@ -41,7 +41,7 @@
main->activate();
-@@ -148,7 +151,7 @@
+@@ -148,7 +151,7 @@ void KDMSessionsWidget::makeReadOnly()
shutdown_lined->lineEdit()->setReadOnly(true);
shutdown_lined->button()->setEnabled(false);
@@ -50,7 +50,7 @@
}
void KDMSessionsWidget::writeSD(QComboBox *combo)
-@@ -174,7 +177,7 @@
+@@ -174,7 +177,7 @@ void KDMSessionsWidget::save()
config->writeEntry("HaltCmd", shutdown_lined->url(), true);
config->writeEntry("RebootCmd", restart_lined->url(), true);
@@ -59,7 +59,7 @@
}
void KDMSessionsWidget::readSD(QComboBox *combo, QString def)
-@@ -202,7 +205,7 @@
+@@ -202,7 +205,7 @@ void KDMSessionsWidget::load()
restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt"));
@@ -68,7 +68,7 @@
}
-@@ -215,7 +218,7 @@
+@@ -215,7 +218,7 @@ void KDMSessionsWidget::defaults()
sdlcombo->setCurrentItem(SdAll);
sdrcombo->setCurrentItem(SdRoot);
@@ -79,7 +79,7 @@
--- a/kcontrol/kdm/kdm-shut.h
+++ b/kcontrol/kdm/kdm-shut.h
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ private:
QComboBox *sdlcombo, *sdrcombo;
QLabel *sdllabel, *sdrlabel;
KURLRequester *restart_lined, *shutdown_lined;
@@ -90,7 +90,7 @@
--- a/kdm/backend/bootman.c
+++ b/kdm/backend/bootman.c
-@@ -240,8 +240,8 @@
+@@ -240,8 +240,8 @@ static struct {
void (*commit)( void );
} bootOpts[] = {
{ getNull, setNull, 0 },
Modified: branches/kdebase-legacy/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
-@@ -863,6 +863,12 @@
+@@ -863,6 +863,12 @@ QStringList HALBackend::mountoptions(con
value = config.readBoolEntry("utf8", true);
tmp = QString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
@@ -13,7 +13,7 @@
}
if (valids.contains("shortname"))
-@@ -1182,6 +1188,11 @@
+@@ -1182,6 +1188,11 @@ QString HALBackend::mount(const Medium *
soptions << QString("shortname=%1").arg(valids["shortname"]);
}
Added: branches/kdebase-legacy/kdebase/debian/patches/77_fix_ftbfs_ucred_redefinition.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/77_fix_ftbfs_ucred_redefinition.diff (rev 0)
+++ branches/kdebase-legacy/kdebase/debian/patches/77_fix_ftbfs_ucred_redefinition.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -0,0 +1,22 @@
+--- a/kdesu/kdesud/secure.h
++++ b/kdesu/kdesud/secure.h
+@@ -12,19 +12,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+-#ifndef HAVE_STRUCT_UCRED
+-
+-// `struct ucred' is not defined in glibc 2.0.
+-
+-struct ucred {
+- pid_t pid;
+- uid_t uid;
+- gid_t gid;
+-};
+-
+-#endif // HAVE_STRUCT_UCRED
+-
+-
+ /**
+ * The Socket_security class autheticates the peer for you. It provides
+ * the process-id, user-id and group-id plus the MD5 sum of the connected
Modified: branches/kdebase-legacy/kdebase/debian/patches/97_automake_cleanup.diff
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/97_automake_cleanup.diff 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/97_automake_cleanup.diff 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,6 +1,6 @@
---- kdebase-3.5.9.dfsg.1/kate/app/Makefile.am 2005-10-10 18:03:41.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kate/app/Makefile.am 2008-03-08 15:52:38.000000000 +0200
-@@ -12,16 +12,18 @@
+--- a/kate/app/Makefile.am
++++ b/kate/app/Makefile.am
+@@ -12,16 +12,18 @@ libkateinterfaces_la_SOURCES = kateapp.c
kateexternaltools.cpp katesavemodifieddialog.cpp kateviewspacecontainer.cpp \
katemwmodonhddialog.cpp katesession.cpp katemdi.cpp katetabwidget.cpp
@@ -22,9 +22,9 @@
kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kate/utils/Makefile.am 2005-09-10 11:24:58.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kate/utils/Makefile.am 2008-03-08 15:53:00.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kate/utils/Makefile.am
++++ b/kate/utils/Makefile.am
+@@ -8,7 +8,7 @@ libkateutils_la_SOURCES = dockviewbase.c
libkateutils_la_LDFLAGS = $(all_libraries) -no-undefined
@@ -33,9 +33,9 @@
libkateutils_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcheckpass/Makefile.am 2005-11-09 00:36:11.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcheckpass/Makefile.am 2008-03-08 17:45:40.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kcheckpass/Makefile.am
++++ b/kcheckpass/Makefile.am
+@@ -9,7 +9,7 @@ bin_PROGRAMS = kcheckpass
kcheckpass_SOURCES = kcheckpass.c \
checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \
checkpass_osfc2passwd.c checkpass_aix.c
@@ -44,9 +44,9 @@
kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
noinst_HEADERS = kcheckpass.h
---- kdebase-3.5.9.dfsg.1/kcminit/Makefile.am 2006-05-22 21:12:41.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcminit/Makefile.am 2008-03-08 17:43:22.000000000 +0200
-@@ -22,11 +22,11 @@
+--- a/kcminit/Makefile.am
++++ b/kcminit/Makefile.am
+@@ -22,11 +22,11 @@ bin_PROGRAMS=
lib_LTLIBRARIES=
kcminit_la_SOURCES = main.cpp main.skel
@@ -60,9 +60,9 @@
kcminit_startup_la_LDFLAGS = $(all_libraries) -module -avoid-version
AM_CPPFLAGS = $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/access/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/access/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,11 +9,11 @@
+--- a/kcontrol/access/Makefile.am
++++ b/kcontrol/access/Makefile.am
+@@ -9,11 +9,11 @@ kdeinit_LTLIBRARIES = kaccess.la
kaccess_la_SOURCES = kaccess.cpp main.cpp
kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -76,9 +76,9 @@
noinst_HEADERS = kcmaccess.h
---- kdebase-3.5.9.dfsg.1/kcontrol/arts/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/arts/Makefile.am 2008-03-08 17:29:42.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/arts/Makefile.am
++++ b/kcontrol/arts/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la
kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -87,9 +87,9 @@
AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/background/Makefile.am 2006-03-17 12:17:11.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/background/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/background/Makefile.am
++++ b/kcontrol/background/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_background.
kcm_background_la_SOURCES = main.cpp
kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
@@ -98,9 +98,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/bell/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/bell/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/bell/Makefile.am
++++ b/kcontrol/bell/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_bell.la
kcm_bell_la_SOURCES = bell.cpp
kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -109,9 +109,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/clock/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/clock/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/clock/Makefile.am
++++ b/kcontrol/clock/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_clock.la
kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp
kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -120,9 +120,9 @@
AM_CPPFLAGS = $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/colors/Makefile.am 2006-03-17 12:17:17.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/colors/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kcontrol/colors/Makefile.am
++++ b/kcontrol/colors/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la
kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp
kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
@@ -131,9 +131,9 @@
METASOURCES = colorscm.moc widgetcanvas.moc
noinst_HEADERS = colorscm.h widgetcanvas.h
---- kdebase-3.5.9.dfsg.1/kcontrol/componentchooser/Makefile.am 2005-09-10 11:25:04.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/componentchooser/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kcontrol/componentchooser/Makefile.am
++++ b/kcontrol/componentchooser/Makefile.am
+@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_componentch
kcm_componentchooser_la_SOURCES = componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
kcm_componentchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -142,9 +142,9 @@
xdg_apps_DATA = componentchooser.desktop
---- kdebase-3.5.9.dfsg.1/kcontrol/crypto/Makefile.am 2007-10-08 12:51:15.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/crypto/Makefile.am 2008-03-08 17:31:51.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/crypto/Makefile.am
++++ b/kcontrol/crypto/Makefile.am
+@@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certe
AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)
kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
@@ -153,9 +153,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/css/Makefile.am 2005-09-10 11:25:10.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/css/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/css/Makefile.am
++++ b/kcontrol/css/Makefile.am
+@@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
kde_module_LTLIBRARIES = kcm_css.la
kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -164,9 +164,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/display/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/display/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/display/Makefile.am
++++ b/kcontrol/display/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_display.la
kcm_display_la_SOURCES = display.cpp
kcm_display_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -175,9 +175,9 @@
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/dnssd/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/dnssd/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kcontrol/dnssd/Makefile.am
++++ b/kcontrol/dnssd/Makefile.am
+@@ -5,7 +5,7 @@ kcm_kdnssd_la_LDFLAGS = -avoid-version -
kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
xdg_apps_DATA = kcm_kdnssd.desktop
@@ -186,9 +186,9 @@
messages: rc.cpp
$(EXTRACTRC) *.ui *.rc >> rc.cpp
---- kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/Makefile.am 2006-01-19 19:00:46.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kcontrol/ebrowsing/Makefile.am
++++ b/kcontrol/ebrowsing/Makefile.am
+@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la
kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -197,9 +197,9 @@
# Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing kcmshell.
# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
---- kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/ikws/Makefile.am 2005-09-10 11:25:07.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/ikws/Makefile.am 2008-03-08 17:38:35.000000000 +0200
-@@ -9,10 +9,10 @@
+--- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am
++++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am
+@@ -9,10 +9,10 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la
libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -212,31 +212,31 @@
libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \
kuriikwsfilter.cpp searchprovider.cpp
---- kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/localdomain/Makefile.am 2005-09-10 11:25:07.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/localdomain/Makefile.am 2008-03-08 15:55:58.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am
++++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am
+@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO
kde_module_LTLIBRARIES = liblocaldomainurifilter.la
- liblocaldomainurifilter_la_LDFLAGS = -module $(KDE_PLUGIN)
+ liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE)
+liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) -lDCOP
liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel
---- kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/shorturi/Makefile.am 2005-09-10 11:25:07.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/ebrowsing/plugins/shorturi/Makefile.am 2008-03-08 15:55:27.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
++++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
+@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO
kde_module_LTLIBRARIES = libkshorturifilter.la
- libkshorturifilter_la_LDFLAGS = -module $(KDE_PLUGIN)
+ libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
+libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) -lDCOP
libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel
---- kdebase-3.5.9.dfsg.1/kcontrol/energy/Makefile.am 2006-03-17 12:17:17.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/energy/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/energy/Makefile.am
++++ b/kcontrol/energy/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la
kcm_energy_la_SOURCES = energy.cpp
kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -245,8 +245,8 @@
METASOURCES = energy.moc
noinst_HEADERS = energy.h
---- kdebase-3.5.9.dfsg.1/kcontrol/filetypes/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/filetypes/Makefile.am 2008-03-08 13:31:05.000000000 +0200
+--- a/kcontrol/filetypes/Makefile.am
++++ b/kcontrol/filetypes/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(all_includes)
@@ -255,9 +255,9 @@
kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/fonts/Makefile.am 2007-05-14 10:55:34.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/fonts/Makefile.am 2008-03-08 18:56:11.000000000 +0200
-@@ -9,8 +9,9 @@
+--- a/kcontrol/fonts/Makefile.am
++++ b/kcontrol/fonts/Makefile.am
+@@ -9,8 +9,9 @@ AM_CPPFLAGS = $(all_includes) $(LIBFONT
kde_module_LTLIBRARIES = kcm_fonts.la
kcm_fonts_la_SOURCES = fonts.cpp
@@ -269,9 +269,9 @@
METASOURCES = AUTO
noinst_HEADERS = fonts.h kxftconfig.h
---- kdebase-3.5.9.dfsg.1/kcontrol/icons/Makefile.am 2006-03-17 12:17:18.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/icons/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kcontrol/icons/Makefile.am
++++ b/kcontrol/icons/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_icons.la
kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp
kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -280,9 +280,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/info/Makefile.am 2006-07-22 11:15:25.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/info/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kcontrol/info/Makefile.am
++++ b/kcontrol/info/Makefile.am
+@@ -7,7 +7,7 @@ endif
kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp
kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO)
@@ -291,9 +291,9 @@
METASOURCES = AUTO
AM_CPPFLAGS= $(all_includes) $(GLINC)
---- kdebase-3.5.9.dfsg.1/kcontrol/input/Makefile.am 2005-09-10 11:25:07.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/input/Makefile.am 2008-03-08 17:33:03.000000000 +0200
-@@ -22,7 +22,8 @@
+--- a/kcontrol/input/Makefile.am
++++ b/kcontrol/input/Makefile.am
+@@ -22,7 +22,8 @@ kde_module_LTLIBRARIES = kcm_input.la
kcm_input_la_SOURCES = mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui
kcm_input_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -303,9 +303,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/ioslaveinfo/Makefile.am 2006-03-17 12:17:16.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/ioslaveinfo/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/ioslaveinfo/Makefile.am
++++ b/kcontrol/ioslaveinfo/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo
kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -314,9 +314,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/joystick/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/joystick/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kcontrol/joystick/Makefile.am
++++ b/kcontrol/joystick/Makefile.am
+@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_joystick.la
kcm_joystick_la_SOURCES = joystick.cpp joywidget.cpp poswidget.cpp joydevice.cpp caldialog.cpp
@@ -325,9 +325,9 @@
kcm_joystick_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
xdg_apps_DATA = joystick.desktop
---- kdebase-3.5.9.dfsg.1/kcontrol/kcontrol/Makefile.am 2005-10-10 18:03:43.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kcontrol/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -32,7 +32,7 @@
+--- a/kcontrol/kcontrol/Makefile.am
++++ b/kcontrol/kcontrol/Makefile.am
+@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.
moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
proxywidget.cpp kcrootonly.cpp searchwidget.cpp
@@ -336,9 +336,9 @@
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
rccontroldir = $(kde_datadir)/kcontrol
---- kdebase-3.5.9.dfsg.1/kcontrol/kded/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kded/Makefile.am 2008-03-08 17:36:01.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/kded/Makefile.am
++++ b/kcontrol/kded/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kded.la
kcm_kded_la_SOURCES = kcmkded.cpp
kcm_kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -347,9 +347,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/kdm/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kdm/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kcontrol/kdm/Makefile.am
++++ b/kcontrol/kdm/Makefile.am
+@@ -5,7 +5,7 @@ kcm_kdm_la_SOURCES = background.cpp kdm-
kdm-users.cpp kdm-conv.cpp main.cpp kbackedcombobox.cpp
kcm_kdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
@@ -358,8 +358,8 @@
AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
-I$(top_srcdir)/kcontrol/background \
---- kdebase-3.5.9.dfsg.1/kcontrol/keys/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/keys/Makefile.am 2008-03-08 13:31:05.000000000 +0200
+--- a/kcontrol/keys/Makefile.am
++++ b/kcontrol/keys/Makefile.am
@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = kcm_keys.la
@@ -369,9 +369,9 @@
kcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kcmfontinst/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kcmfontinst/Makefile.am 2008-03-08 17:28:32.000000000 +0200
-@@ -4,10 +4,10 @@
+--- a/kcontrol/kfontinst/kcmfontinst/Makefile.am
++++ b/kcontrol/kfontinst/kcmfontinst/Makefile.am
+@@ -4,10 +4,10 @@ FONTINST_PRINT_LIB=../viewpart/libkfonti
endif
kde_module_LTLIBRARIES = kcm_fontinst.la
@@ -384,8 +384,8 @@
xdg_apps_DATA = kcmfontinst.desktop
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kfile-plugin/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kfile-plugin/Makefile.am 2008-03-08 17:29:14.000000000 +0200
+--- a/kcontrol/kfontinst/kfile-plugin/Makefile.am
++++ b/kcontrol/kfontinst/kfile-plugin/Makefile.am
@@ -1,13 +1,13 @@
kde_module_LTLIBRARIES = kfile_font.la
@@ -403,9 +403,9 @@
METASOURCES = AUTO
noinst_HEADERS = KFileFont.h
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kfontinst/Makefile.am 2007-05-14 10:55:38.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kfontinst/Makefile.am 2008-03-08 17:27:30.000000000 +0200
-@@ -11,6 +11,6 @@
+--- a/kcontrol/kfontinst/kfontinst/Makefile.am
++++ b/kcontrol/kfontinst/kfontinst/Makefile.am
+@@ -11,6 +11,6 @@ FontEngine.h \
Fontmap.h \
XConfig.h
@@ -413,9 +413,9 @@
+kfontinst_LDADD = ../../fonts/libkxftconfig.la ../lib/libkfontinst.la
kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kio/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/kio/Makefile.am 2008-03-08 17:35:07.000000000 +0200
-@@ -2,9 +2,9 @@
+--- a/kcontrol/kfontinst/kio/Makefile.am
++++ b/kcontrol/kfontinst/kio/Makefile.am
+@@ -2,9 +2,9 @@ kde_module_LTLIBRARIES = kio_fonts.la
kio_fonts_la_SOURCES = \
KioFonts.cpp
@@ -428,20 +428,19 @@
# The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive.
noinst_HEADERS = \
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/lib/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/lib/Makefile.am 2008-03-08 17:37:04.000000000 +0200
-@@ -9,6 +9,6 @@
+--- a/kcontrol/kfontinst/lib/Makefile.am
++++ b/kcontrol/kfontinst/lib/Makefile.am
+@@ -9,6 +9,6 @@ Misc.h \
FcEngine.h \
KfiConstants.h
-libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
-libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
--AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
+libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIB_KIO) $(LIBXFT_LIB) $(LIB_QT)
+libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -no-undefined
-+AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/thumbnail/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/thumbnail/Makefile.am 2008-03-08 17:39:05.000000000 +0200
+ AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
+--- a/kcontrol/kfontinst/thumbnail/Makefile.am
++++ b/kcontrol/kfontinst/thumbnail/Makefile.am
@@ -1,8 +1,8 @@
kde_module_LTLIBRARIES = fontthumbnail.la
@@ -453,9 +452,9 @@
METASOURCES = AUTO
noinst_HEADERS = FontThumbnail.h
---- kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/viewpart/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kfontinst/viewpart/Makefile.am 2008-03-08 17:19:25.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kcontrol/kfontinst/viewpart/Makefile.am
++++ b/kcontrol/kfontinst/viewpart/Makefile.am
+@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libkfontviewpar
libkfontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
libkfontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -464,9 +463,9 @@
noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
---- kdebase-3.5.9.dfsg.1/kcontrol/kicker/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kicker/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kcontrol/kicker/Makefile.am
++++ b/kcontrol/kicker/Makefile.am
+@@ -7,7 +7,7 @@ kcm_kicker_la_SOURCES = positiontab.ui h
positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp
kcm_kicker_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -475,9 +474,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \
-I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/kio/Makefile.am 2005-09-10 11:25:10.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kio/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/kcontrol/kio/Makefile.am
++++ b/kcontrol/kio/Makefile.am
+@@ -17,7 +17,7 @@ kcm_kio_la_SOURCES = policydlg.cpp kcook
manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
kcm_kio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -486,9 +485,9 @@
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
---- kdebase-3.5.9.dfsg.1/kcontrol/knotify/Makefile.am 2005-09-10 11:25:04.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/knotify/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kcontrol/knotify/Makefile.am
++++ b/kcontrol/knotify/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_knotify.la
kcm_knotify_la_SOURCES = knotify.cpp playersettings.ui
kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -497,9 +496,9 @@
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/konq/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/konq/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/kcontrol/konq/Makefile.am
++++ b/kcontrol/konq/Makefile.am
+@@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desk
desktopbehavior.ui
kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -508,9 +507,9 @@
kcm_konq_la_DATA = overlapping.png onlyone.png
kcm_konq_ladir = $(kde_datadir)/kcontrol/pics
---- kdebase-3.5.9.dfsg.1/kcontrol/konqhtml/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/konqhtml/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/kcontrol/konqhtml/Makefile.am
++++ b/kcontrol/konqhtml/Makefile.am
+@@ -13,7 +13,7 @@ kcm_konqhtml_la_SOURCES = advancedTabDia
filteropts.cpp
kcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -519,9 +518,9 @@
xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
---- kdebase-3.5.9.dfsg.1/kcontrol/konsole/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/konsole/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kcontrol/konsole/Makefile.am
++++ b/kcontrol/konsole/Makefile.am
+@@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.c
schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -530,9 +529,9 @@
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/kthememanager/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/kthememanager/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kcontrol/kthememanager/Makefile.am
++++ b/kcontrol/kthememanager/Makefile.am
+@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kthememanager.la
kcm_kthememanager_la_SOURCES = kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp
@@ -541,9 +540,9 @@
kcm_kthememanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
noinst_HEADERS = kthememanager.h ktheme.h knewthemedlg.h kthemedlg.ui.h
---- kdebase-3.5.9.dfsg.1/kcontrol/launch/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/launch/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/launch/Makefile.am
++++ b/kcontrol/launch/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_laun
AM_CPPFLAGS = $(all_includes)
kcm_launch_la_SOURCES = kcmlaunch.cpp
kcm_launch_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -552,9 +551,9 @@
METASOURCES = AUTO
noinst_HEADERS = kcmlaunch.h
xdg_apps_DATA = kcmlaunch.desktop
---- kdebase-3.5.9.dfsg.1/kcontrol/locale/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/locale/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/kcontrol/locale/Makefile.am
++++ b/kcontrol/locale/Makefile.am
+@@ -10,7 +10,7 @@ METASOURCES = AUTO
noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h
kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -563,9 +562,9 @@
# Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28)
---- kdebase-3.5.9.dfsg.1/kcontrol/nics/Makefile.am 2005-09-10 11:25:05.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/nics/Makefile.am 2008-03-08 15:56:29.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/nics/Makefile.am
++++ b/kcontrol/nics/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
kcm_nic_la_SOURCES = nic.cpp
kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -574,9 +573,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/performance/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/performance/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -2,7 +2,7 @@
+--- a/kcontrol/performance/Makefile.am
++++ b/kcontrol/performance/Makefile.am
+@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_performance
kcm_performance_la_SOURCES = kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui
kcm_performance_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -585,9 +584,9 @@
AM_CPPFLAGS= $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/privacy/Makefile.am 2005-09-10 11:25:09.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/privacy/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kcontrol/privacy/Makefile.am
++++ b/kcontrol/privacy/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_privacy.la
kcm_privacy_la_SOURCES = privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp
kcm_privacy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -596,9 +595,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/randr/Makefile.am 2006-03-17 12:17:17.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/randr/Makefile.am 2008-03-08 17:35:36.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/kcontrol/randr/Makefile.am
++++ b/kcontrol/randr/Makefile.am
+@@ -10,7 +10,7 @@ METASOURCES = AUTO
kcm_randr_la_SOURCES = krandrmodule.cpp
kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -607,7 +606,7 @@
noinst_HEADERS = randr.h krandrmodule.h krandrtray.h krandrapp.h ktimerdialog.h \
krandrpassivepopup.h
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ bin_PROGRAMS = krandrtray
krandrtray_SOURCES = main.cpp krandrtray.cpp krandrapp.cpp krandrpassivepopup.cpp
krandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -616,9 +615,9 @@
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/krandr.pot
---- kdebase-3.5.9.dfsg.1/kcontrol/samba/Makefile.am 2005-09-10 11:25:10.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/samba/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/samba/Makefile.am
++++ b/kcontrol/samba/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_samba.la
kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp
kcm_samba_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -627,9 +626,9 @@
AM_CPPFLAGS = $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/screensaver/Makefile.am 2005-09-10 11:25:10.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/screensaver/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/screensaver/Makefile.am
++++ b/kcontrol/screensaver/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_screensaver
kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
saverconfig.cpp advanceddialog.cpp kswidget.cpp
kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -638,9 +637,9 @@
METASOURCES = AUTO
noinst_HEADERS = scrnsave.h
---- kdebase-3.5.9.dfsg.1/kcontrol/smserver/Makefile.am 2005-09-10 11:25:08.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/smserver/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -2,7 +2,7 @@
+--- a/kcontrol/smserver/Makefile.am
++++ b/kcontrol/smserver/Makefile.am
+@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_smserver.la
kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp
kcm_smserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -649,9 +648,9 @@
AM_CPPFLAGS= $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/spellchecking/Makefile.am 2005-09-10 11:25:12.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/spellchecking/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/spellchecking/Makefile.am
++++ b/kcontrol/spellchecking/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_spellchecki
kcm_spellchecking_la_SOURCES = spellchecking.cpp
kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -660,9 +659,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/style/keramik/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/style/keramik/Makefile.am 2008-03-08 17:25:44.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/style/keramik/Makefile.am
++++ b/kcontrol/style/keramik/Makefile.am
+@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
noinst_HEADERS = keramikconf.h
kde_module_LTLIBRARIES = kstyle_keramik_config.la
kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -671,9 +670,9 @@
kstyle_keramik_config_la_SOURCES = keramikconf.cpp
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/style/Makefile.am 2006-03-17 12:17:17.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/style/Makefile.am 2008-03-08 15:56:57.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kcontrol/style/Makefile.am
++++ b/kcontrol/style/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_style.la
kcm_style_la_SOURCES = kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp
kcm_style_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
@@ -682,9 +681,9 @@
METASOURCES = AUTO
noinst_HEADERS = kcmstyle.h stylepreview.h menupreview.h
---- kdebase-3.5.9.dfsg.1/kcontrol/taskbar/Makefile.am 2005-09-10 11:25:04.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/taskbar/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -2,7 +2,7 @@
+--- a/kcontrol/taskbar/Makefile.am
++++ b/kcontrol/taskbar/Makefile.am
+@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_taskbar.la
kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp
kcm_taskbar_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -693,9 +692,9 @@
AM_CPPFLAGS = -I$(top_builddir)/kicker/taskbar $(all_includes)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kcontrol/usbview/Makefile.am 2006-01-19 19:00:37.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kcontrol/usbview/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/usbview/Makefile.am
++++ b/kcontrol/usbview/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_usb.la
kcm_usb_la_SOURCES = kcmusb.cpp usbdevices.cpp usbdb.cpp
kcm_usb_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -704,9 +703,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/view1394/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/view1394/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kcontrol/view1394/Makefile.am
++++ b/kcontrol/view1394/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_view1394.la
kcm_view1394_la_SOURCES = view1394widget.ui view1394.cpp
kcm_view1394_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -715,9 +714,9 @@
AM_CPPFLAGS= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kcontrol/xinerama/Makefile.am 2005-09-10 11:25:11.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kcontrol/xinerama/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kcontrol/xinerama/Makefile.am
++++ b/kcontrol/xinerama/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_xinerama.la
kcm_xinerama_la_SOURCES = kcmxinerama.cpp xineramawidget.ui
kcm_xinerama_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -726,9 +725,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kdepasswd/kcm/Makefile.am 2005-09-10 11:24:59.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdepasswd/kcm/Makefile.am 2008-03-08 13:34:25.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kdepasswd/kcm/Makefile.am
++++ b/kdepasswd/kcm/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_useraccount
kcm_useraccount_la_SOURCES = main_widget.ui chfnprocess.cpp \
main.cpp chfacedlg.cpp settings.kcfgc pass.kcfgc
kcm_useraccount_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -737,9 +736,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/libkonq $(all_includes)
---- kdebase-3.5.9.dfsg.1/kdepasswd/Makefile.am 2005-09-10 11:24:59.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdepasswd/Makefile.am 2008-03-08 18:30:53.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kdepasswd/Makefile.am
++++ b/kdepasswd/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = kcm
bin_PROGRAMS = kdepasswd
kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp
kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -748,9 +747,9 @@
METASOURCES = AUTO
AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
---- kdebase-3.5.9.dfsg.1/kdeprint/kdeprint_part/Makefile.am 2005-09-10 11:25:38.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdeprint/kdeprint_part/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kdeprint/kdeprint_part/Makefile.am
++++ b/kdeprint/kdeprint_part/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkdeprint_par
libkdeprint_part_la_SOURCES = printpart.cpp
libkdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -759,9 +758,9 @@
noinst_HEADERS = printpart.h
---- kdebase-3.5.9.dfsg.1/kdeprint/kjobviewer/Makefile.am 2005-09-10 11:25:38.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdeprint/kjobviewer/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kdeprint/kjobviewer/Makefile.am
++++ b/kdeprint/kjobviewer/Makefile.am
+@@ -8,7 +8,7 @@ kdeinit_LTLIBRARIES = kjobviewer.la
kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
kjobviewer_la_METASOURCES = AUTO
@@ -770,9 +769,9 @@
kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kjobviewer.h
---- kdebase-3.5.9.dfsg.1/kdeprint/kprinter/Makefile.am 2005-09-10 11:25:39.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdeprint/kprinter/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kdeprint/kprinter/Makefile.am
++++ b/kdeprint/kprinter/Makefile.am
+@@ -7,7 +7,7 @@ lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kprinter.la
kprinter_la_SOURCES = main.cpp printwrapper.cpp
@@ -781,9 +780,9 @@
kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
kprinter_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kdeprint/printmgr/Makefile.am 2006-05-22 21:12:45.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdeprint/printmgr/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kdeprint/printmgr/Makefile.am
++++ b/kdeprint/printmgr/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_printmgr.la
kcm_printmgr_la_SOURCES = kcmprintmgr.cpp
kcm_printmgr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -792,9 +791,9 @@
noinst_HEADERS = kcmprintmgr.h
---- kdebase-3.5.9.dfsg.1/kdeprint/slave/Makefile.am 2005-09-10 11:25:39.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdeprint/slave/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kdeprint/slave/Makefile.am
++++ b/kdeprint/slave/Makefile.am
+@@ -7,7 +7,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = kio_print.la
kio_print_la_SOURCES = kio_print.cpp
@@ -803,8 +802,8 @@
kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kdesktop/Makefile.am 2006-05-22 21:12:51.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdesktop/Makefile.am 2008-03-08 13:31:05.000000000 +0200
+--- a/kdesktop/Makefile.am
++++ b/kdesktop/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes)
@@ -814,9 +813,9 @@
SUBDIRS = . lock pics patterns programs init kwebdesktop
---- kdebase-3.5.9.dfsg.1/kdm/backend/Makefile.am 2008-03-08 19:05:46.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kdm/backend/Makefile.am 2008-03-08 18:33:46.000000000 +0200
-@@ -3,8 +3,8 @@
+--- a/kdm/backend/Makefile.am
++++ b/kdm/backend/Makefile.am
+@@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = foreign
CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \
@@ -827,9 +826,9 @@
bin_PROGRAMS = kdm
kdm_SOURCES = \
---- kdebase-3.5.9.dfsg.1/kdm/kfrontend/Makefile.am 2008-03-08 19:05:43.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kdm/kfrontend/Makefile.am 2008-03-08 18:32:41.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kdm/kfrontend/Makefile.am
++++ b/kdm/kfrontend/Makefile.am
+@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(srcdir)/../backend -I.
bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl
kdm_config_SOURCES = kdm_config.c
@@ -838,9 +837,9 @@
kdm_greet_SOURCES = \
kdm_greet.c \
---- kdebase-3.5.9.dfsg.1/kdmlib/Makefile.am 2005-10-10 18:03:54.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kdmlib/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,11 +4,11 @@
+--- a/kdmlib/Makefile.am
++++ b/kdmlib/Makefile.am
+@@ -4,11 +4,11 @@ kde_module_LTLIBRARIES = kgreet_classic.
kgreet_classic_la_SOURCES = kgreet_classic.cpp
kgreet_classic_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
@@ -854,18 +853,18 @@
noinst_LTLIBRARIES = libdmctl.la
libdmctl_la_SOURCES = dmctl.cpp
---- kdebase-3.5.9.dfsg.1/kfind/Makefile.am 2005-09-10 11:25:00.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kfind/Makefile.am 2008-03-08 18:34:00.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kfind/Makefile.am
++++ b/kfind/Makefile.am
+@@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = libkfindpart.la
libkfindpart_la_SOURCES = kfindpart.cpp
libkfindpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkfindpart_la_LIBADD = libkfind_common.la $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la
+libkfindpart_la_LIBADD = libkfind_common.la $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
- noinst_HEADERS>= kftabdlg.h kfind.h version.h kquery.h kdatecombo.h
+ noinst_HEADERS = kftabdlg.h kfind.h version.h kquery.h kdatecombo.h
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ messages:
bin_PROGRAMS = kfind
kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
@@ -874,9 +873,9 @@
# the library search path.
kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH)
---- kdebase-3.5.9.dfsg.1/khelpcenter/Makefile.am 2005-09-10 11:25:18.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/khelpcenter/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/khelpcenter/Makefile.am
++++ b/khelpcenter/Makefile.am
+@@ -13,7 +13,7 @@ khc_indexbuilder_SOURCES = khc_indexbuil
kdeinit_LTLIBRARIES = khelpcenter.la
khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -885,9 +884,9 @@
khelpcenter_la_SOURCES = navigator.cpp \
navigatoritem.cpp navigatorappitem.cpp view.cpp \
searchwidget.cpp searchengine.cpp \
---- kdebase-3.5.9.dfsg.1/khotkeys/app/Makefile.am 2005-11-19 13:05:32.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/khotkeys/app/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,11 +4,11 @@
+--- a/khotkeys/app/Makefile.am
++++ b/khotkeys/app/Makefile.am
+@@ -4,11 +4,11 @@ kdeinit_LTLIBRARIES = khotkeys.la
kde_module_LTLIBRARIES = kded_khotkeys.la
khotkeys_la_SOURCES = app.cpp app.skel
@@ -901,8 +900,8 @@
kded_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
noinst_HEADERS = app.h kded.h
---- kdebase-3.5.9.dfsg.1/khotkeys/arts/Makefile.am 2006-01-19 19:02:21.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/khotkeys/arts/Makefile.am 2008-03-08 13:31:05.000000000 +0200
+--- a/khotkeys/arts/Makefile.am
++++ b/khotkeys/arts/Makefile.am
@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = khotkeys_arts.la
@@ -912,9 +911,9 @@
khotkeys_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined
INCLUDES = $(all_includes) -I$(srcdir)/../shared/ -I$(srcdir)/../kcontrol -I../kcontrol
---- kdebase-3.5.9.dfsg.1/khotkeys/kcontrol/Makefile.am 2005-11-19 13:05:33.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/khotkeys/kcontrol/Makefile.am 2008-03-08 17:42:42.000000000 +0200
-@@ -12,12 +12,12 @@
+--- a/khotkeys/kcontrol/Makefile.am
++++ b/khotkeys/kcontrol/Makefile.am
+@@ -12,12 +12,12 @@ kcm_khotkeys_la_SOURCES = \
windowselector.cpp gestures_settings_tab.cpp general_settings_tab.cpp \
voicerecorder.cpp voicerecordpage.cpp voice_settings_tab.cpp
@@ -929,9 +928,9 @@
kcm_khotkeys_init_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noinst_HEADERS = menuedit.h window_trigger_widget.h \
---- kdebase-3.5.9.dfsg.1/khotkeys/shared/Makefile.am 2006-01-19 19:02:21.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/khotkeys/shared/Makefile.am 2008-03-08 17:44:01.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/khotkeys/shared/Makefile.am
++++ b/khotkeys/shared/Makefile.am
+@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkhotkeys_shared.la
libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp
@@ -940,9 +939,9 @@
libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined
INCLUDES = $(all_includes)
---- kdebase-3.5.9.dfsg.1/kicker/applets/clock/Makefile.am 2005-09-10 11:25:35.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/clock/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/kicker/applets/clock/Makefile.am
++++ b/kicker/applets/clock/Makefile.am
+@@ -16,7 +16,7 @@ lnk_DATA = clockapplet.desktop
EXTRA_DIST = $(lnk_DATA) $(pic_DATA)
clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -951,9 +950,9 @@
srcdoc:
kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -lkdecore -lkdeui -lkfile
---- kdebase-3.5.9.dfsg.1/kicker/applets/launcher/Makefile.am 2006-03-17 12:17:32.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/launcher/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/kicker/applets/launcher/Makefile.am
++++ b/kicker/applets/launcher/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_DIST = $(lnk_DATA)
launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \
../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \
@@ -962,20 +961,20 @@
kde_kcfg_DATA = launcherapplet.kcfg
---- kdebase-3.5.9.dfsg.1/kicker/applets/lockout/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/lockout/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kicker/applets/lockout/Makefile.am
++++ b/kicker/applets/lockout/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = lockout_panelap
lockout_panelapplet_la_SOURCES = lockout.cpp
lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--lockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
-+lockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+-lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA)
++lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
noinst_HEADERS = lockout.h
---- kdebase-3.5.9.dfsg.1/kicker/applets/media/Makefile.am 2006-07-22 11:15:16.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/media/Makefile.am 2008-03-08 18:36:04.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/kicker/applets/media/Makefile.am
++++ b/kicker/applets/media/Makefile.am
+@@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop
EXTRA_DIST = $(lnk_DATA)
media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -984,9 +983,9 @@
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/applets/menu/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/menu/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kicker/applets/menu/Makefile.am
++++ b/kicker/applets/menu/Makefile.am
+@@ -14,7 +14,7 @@ lnk_DATA = menuapplet.desktop
EXTRA_DIST = $(lnk_DATA)
menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -995,9 +994,9 @@
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/applets/minipager/Makefile.am 2005-09-10 11:25:35.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/minipager/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/kicker/applets/minipager/Makefile.am
++++ b/kicker/applets/minipager/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_DIST = $(lnk_DATA)
minipager_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
minipager_panelapplet_la_LIBADD = $(LIB_KDEUI) \
../../taskmanager/libtaskmanager.la \
@@ -1006,20 +1005,20 @@
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/applets/naughty/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/naughty/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -23,7 +23,7 @@
+--- a/kicker/applets/naughty/Makefile.am
++++ b/kicker/applets/naughty/Makefile.am
+@@ -23,7 +23,7 @@ lnk_DATA = naughtyapplet.desktop
EXTRA_DIST = $(lnk_DATA)
naughty_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
--naughty_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KVM)
-+naughty_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KVM) $(LIB_QT) $(LIB_KDECORE)
+-naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KVM)
++naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KVM) $(LIB_QT) $(LIB_KDECORE)
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/naughtyapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/applets/run/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/run/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/kicker/applets/run/Makefile.am
++++ b/kicker/applets/run/Makefile.am
+@@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop
EXTRA_DIST = $(lnk_DATA)
run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1028,9 +1027,9 @@
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/applets/systemtray/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/systemtray/Makefile.am 2008-03-08 18:36:25.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kicker/applets/systemtray/Makefile.am
++++ b/kicker/applets/systemtray/Makefile.am
+@@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop
EXTRA_DIST = $(lnk_DATA)
systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1039,9 +1038,9 @@
messages:
---- kdebase-3.5.9.dfsg.1/kicker/applets/taskbar/Makefile.am 2005-09-10 11:25:34.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/taskbar/Makefile.am 2008-03-08 18:34:51.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kicker/applets/taskbar/Makefile.am
++++ b/kicker/applets/taskbar/Makefile.am
+@@ -6,7 +6,7 @@ taskbar_panelapplet_la_SOURCES = taskbar
taskbar_panelapplet_la_METASOURCES = AUTO
taskbar_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1050,9 +1049,9 @@
noinst_HEADERS = taskbarapplet.h
---- kdebase-3.5.9.dfsg.1/kicker/applets/trash/Makefile.am 2006-10-01 20:31:52.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/applets/trash/Makefile.am 2008-03-08 18:37:36.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kicker/applets/trash/Makefile.am
++++ b/kicker/applets/trash/Makefile.am
+@@ -14,7 +14,7 @@ lnk_DATA = trashapplet.desktop
EXTRA_DIST = $(lnk_DATA)
trash_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1061,9 +1060,9 @@
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/trashapplet.pot
---- kdebase-3.5.9.dfsg.1/kicker/extensions/dockbar/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/extensions/dockbar/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kicker/extensions/dockbar/Makefile.am
++++ b/kicker/extensions/dockbar/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = dockbar_panelex
dockbar_panelextension_la_SOURCES = dockcontainer.cpp dockbarextension.cpp
dockbar_panelextension_la_METASOURCES = AUTO
dockbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1072,9 +1071,9 @@
noinst_HEADERS = dockcontainer.h dockbarextension.h
---- kdebase-3.5.9.dfsg.1/kicker/extensions/kasbar/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/extensions/kasbar/Makefile.am 2008-03-08 18:35:41.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kicker/extensions/kasbar/Makefile.am
++++ b/kicker/extensions/kasbar/Makefile.am
+@@ -14,7 +14,7 @@ libkasbar_la_SOURCES = kasbar.cpp kasite
kasloaditem.cpp
libkasbar_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
@@ -1083,7 +1082,7 @@
#
# Panel Extension
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ kde_module_LTLIBRARIES = kasbar_panelext
kasbar_panelextension_la_SOURCES = kasbarextension.cpp
kasbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1092,7 +1091,7 @@
noinst_HEADERS = kasbar.h kasitem.h kasbarextension.h \
kastaskitem.h kastasker.h kaspopup.h kasstartupitem.h \
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ bin_PROGRAMS = kasbar
kasbar_SOURCES = kasbarapp.cpp
kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kasbar_LDADD = libkasbar.la \
@@ -1101,9 +1100,9 @@
messages:
---- kdebase-3.5.9.dfsg.1/kicker/extensions/sidebar/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/extensions/sidebar/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kicker/extensions/sidebar/Makefile.am
++++ b/kicker/extensions/sidebar/Makefile.am
+@@ -6,7 +6,7 @@ sidebar_panelextension_la_SOURCES = side
sidebar_panelextension_la_METASOURCES = AUTO
sidebar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1112,9 +1111,9 @@
lnkdir = $(kde_datadir)/kicker/extensions
---- kdebase-3.5.9.dfsg.1/kicker/extensions/taskbar/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/extensions/taskbar/Makefile.am 2008-03-08 18:38:21.000000000 +0200
-@@ -5,10 +5,9 @@
+--- a/kicker/extensions/taskbar/Makefile.am
++++ b/kicker/extensions/taskbar/Makefile.am
+@@ -5,10 +5,9 @@ kde_module_LTLIBRARIES = taskbar_panelex
taskbar_panelextension_la_SOURCES = taskbarextension.cpp taskbarextension.skel
taskbar_panelextension_la_METASOURCES = AUTO
taskbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1127,9 +1126,9 @@
noinst_HEADERS = taskbarextension.h
---- kdebase-3.5.9.dfsg.1/kicker/kicker/Makefile.am 2005-09-10 11:25:31.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/kicker/Makefile.am 2008-03-08 18:36:55.000000000 +0200
-@@ -9,7 +9,8 @@
+--- a/kicker/kicker/Makefile.am
++++ b/kicker/kicker/Makefile.am
+@@ -9,7 +9,8 @@ kdeinit_LTLIBRARIES = kicker.la
CLEANFILES = dummy.cpp
kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \
@@ -1139,9 +1138,9 @@
kicker_la_SOURCES = dummy.cpp
kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
---- kdebase-3.5.9.dfsg.1/kicker/libkicker/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/libkicker/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/kicker/libkicker/Makefile.am
++++ b/kicker/libkicker/Makefile.am
+@@ -11,7 +11,7 @@ libkickermain_la_SOURCES = appletinfo.cp
libkickermain_la_METASOURCES = AUTO
libkickermain_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
@@ -1150,9 +1149,9 @@
kde_kcfg_DATA = kickerSettings.kcfg
---- kdebase-3.5.9.dfsg.1/kicker/menuext/find/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/find/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/find/Makefile.am
++++ b/kicker/menuext/find/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_find
kickermenu_find_la_SOURCES = findmenu.cpp
kickermenu_find_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1161,9 +1160,9 @@
kickermenu_find_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/kate/Makefile.am 2007-01-15 13:31:27.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/kate/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/kate/Makefile.am
++++ b/kicker/menuext/kate/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_kate
kickermenu_kate_la_SOURCES = katesessionmenu.cpp
kickermenu_kate_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1172,9 +1171,9 @@
kickermenu_kate_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/kdeprint/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/kdeprint/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/kdeprint/Makefile.am
++++ b/kicker/menuext/kdeprint/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_kdep
kickermenu_kdeprint_la_SOURCES = print_mnu.cpp
kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1183,9 +1182,9 @@
kickermenu_kdeprint_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/konq-profiles/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/konq-profiles/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/konq-profiles/Makefile.am
++++ b/kicker/menuext/konq-profiles/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konq
kickermenu_konqueror_la_SOURCES = konqy_menu.cpp
kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1194,9 +1193,9 @@
kickermenu_konqueror_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/konsole/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/konsole/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/konsole/Makefile.am
++++ b/kicker/menuext/konsole/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_kons
kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1205,9 +1204,9 @@
kickermenu_konsole_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/prefmenu/Makefile.am 2006-03-17 23:48:32.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/prefmenu/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/prefmenu/Makefile.am
++++ b/kicker/menuext/prefmenu/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_pref
kickermenu_prefmenu_la_SOURCES = prefmenu.cpp
kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1216,9 +1215,9 @@
kickermenu_prefmenu_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/recentdocs/Makefile.am 2006-03-17 12:17:31.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/recentdocs/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/recentdocs/Makefile.am
++++ b/kicker/menuext/recentdocs/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_rece
kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp
kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -1227,9 +1226,9 @@
kickermenu_recentdocs_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/remote/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/remote/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/remote/Makefile.am
++++ b/kicker/menuext/remote/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_remo
kickermenu_remotemenu_la_SOURCES = remotemenu.cpp remotemenu.skel
kickermenu_remotemenu_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1238,9 +1237,9 @@
kickermenu_remotemenu_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/menuext/system/Makefile.am 2006-03-17 23:48:32.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kicker/menuext/system/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kicker/menuext/system/Makefile.am
++++ b/kicker/menuext/system/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_syst
kickermenu_systemmenu_la_SOURCES = systemmenu.cpp
kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -1249,9 +1248,9 @@
kickermenu_systemmenu_la_METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kicker/proxy/Makefile.am 2006-10-01 20:31:51.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/proxy/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,11 +7,11 @@
+--- a/kicker/proxy/Makefile.am
++++ b/kicker/proxy/Makefile.am
+@@ -7,11 +7,11 @@ kdeinit_LTLIBRARIES = appletproxy.la ext
METASOURCES = AUTO
@@ -1265,9 +1264,9 @@
extensionproxy_la_SOURCES = extensionproxy.cpp
extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
---- kdebase-3.5.9.dfsg.1/kicker/taskbar/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/taskbar/Makefile.am 2008-03-08 18:37:14.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kicker/taskbar/Makefile.am
++++ b/kicker/taskbar/Makefile.am
+@@ -9,7 +9,7 @@ libtaskbar_la_SOURCES = taskbarsettings.
libtaskbar_la_METASOURCES = AUTO
libtaskbar_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined
@@ -1276,9 +1275,9 @@
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/libtaskbar.pot
---- kdebase-3.5.9.dfsg.1/kicker/taskmanager/Makefile.am 2005-09-10 11:25:29.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kicker/taskmanager/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kicker/taskmanager/Makefile.am
++++ b/kicker/taskmanager/Makefile.am
+@@ -5,7 +5,7 @@ libtaskmanager_la_SOURCES = tasklmbmenu.
libtaskmanager_la_METASOURCES = AUTO
libtaskmanager_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
@@ -1287,9 +1286,9 @@
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/libtaskmanager.pot
---- kdebase-3.5.9.dfsg.1/kioslave/about/Makefile.am 2006-03-17 12:17:35.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kioslave/about/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kioslave/about/Makefile.am
++++ b/kioslave/about/Makefile.am
+@@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPAT
kde_module_LTLIBRARIES = kio_about.la
kio_about_la_SOURCES = kio_about.cpp
@@ -1298,9 +1297,9 @@
kio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_about.h
---- kdebase-3.5.9.dfsg.1/kioslave/cgi/kcmcgi/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/cgi/kcmcgi/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kioslave/cgi/kcmcgi/Makefile.am
++++ b/kioslave/cgi/kcmcgi/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la
kcm_cgi_la_SOURCES = kcmcgi.cpp
kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -1309,9 +1308,9 @@
INCLUDES= $(all_includes)
---- kdebase-3.5.9.dfsg.1/kioslave/cgi/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/cgi/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/cgi/Makefile.am
++++ b/kioslave/cgi/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kio_cgi.la
kio_cgi_la_SOURCES = cgi.cpp
@@ -1320,9 +1319,9 @@
kio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = cgi.h
---- kdebase-3.5.9.dfsg.1/kioslave/filter/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/filter/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/filter/Makefile.am
++++ b/kioslave/filter/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kio_filter.la
kio_filter_la_SOURCES = filter.cc
@@ -1331,9 +1330,9 @@
kio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = filter.h
---- kdebase-3.5.9.dfsg.1/kioslave/finger/Makefile.am 2005-09-10 11:25:38.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/finger/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kioslave/finger/Makefile.am
++++ b/kioslave/finger/Makefile.am
+@@ -9,7 +9,7 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPAT
kde_module_LTLIBRARIES = kio_finger.la
kio_finger_la_SOURCES = kio_finger.cpp
@@ -1342,9 +1341,9 @@
kio_finger_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_finger.h
---- kdebase-3.5.9.dfsg.1/kioslave/fish/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/fish/Makefile.am 2008-03-08 17:19:25.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kioslave/fish/Makefile.am
++++ b/kioslave/fish/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kio_fish_la_SOURCES = fish.cpp
@@ -1353,20 +1352,20 @@
kio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = fishcode.h fish.h
---- kdebase-3.5.9.dfsg.1/kioslave/floppy/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/floppy/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kioslave/floppy/Makefile.am
++++ b/kioslave/floppy/Makefile.am
+@@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries)
kde_module_LTLIBRARIES = kio_floppy.la
kio_floppy_la_SOURCES = kio_floppy.cpp program.cpp
-kio_floppy_la_LIBADD = $(LIB_KIO)
+kio_floppy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
- kio_floppy_la_LDFLAGS = -module $(KDE_PLUGIN)
+ kio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kdelnk_DATA = floppy.protocol
---- kdebase-3.5.9.dfsg.1/kioslave/home/kdedmodule/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/home/kdedmodule/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/home/kdedmodule/Makefile.am
++++ b/kioslave/home/kdedmodule/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_homedirnotify_la_SOURCES = homedirnotify.cpp homedirnotify.skel homedirnotifymodule.cpp homedirnotifymodule.skel
kded_homedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1375,9 +1374,9 @@
servicesdir = $(kde_servicesdir)/kded
---- kdebase-3.5.9.dfsg.1/kioslave/home/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/home/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kioslave/home/Makefile.am
++++ b/kioslave/home/Makefile.am
+@@ -7,7 +7,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_home.la
kio_home_la_SOURCES = dummy.cpp
@@ -1386,9 +1385,9 @@
kio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
---- kdebase-3.5.9.dfsg.1/kioslave/info/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/info/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kioslave/info/Makefile.am
++++ b/kioslave/info/Makefile.am
+@@ -9,7 +9,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_info.la
kio_info_la_SOURCES = info.cc
@@ -1397,9 +1396,9 @@
kio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = info.h
---- kdebase-3.5.9.dfsg.1/kioslave/ldap/configure.in.in 2005-10-10 18:04:01.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/ldap/configure.in.in 2008-03-08 18:26:23.000000000 +0200
-@@ -69,7 +69,7 @@
+--- a/kioslave/ldap/configure.in.in
++++ b/kioslave/ldap/configure.in.in
+@@ -69,7 +69,7 @@ AC_MSG_CHECKING(whether LDAP support can
fi
LDAP_LIBS="${LDAP_LIBS}-lldap"
fi
@@ -1408,9 +1407,9 @@
kde_safe_LIBS="$LIBS"
kde_safe_CFLAGS="$CFLAGS"
---- kdebase-3.5.9.dfsg.1/kioslave/ldap/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/ldap/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/kioslave/ldap/Makefile.am
++++ b/kioslave/ldap/Makefile.am
+@@ -10,7 +10,7 @@ LDADD = $(LIB_KIO) $(LDAP_LIBS)
kde_module_LTLIBRARIES = kio_ldap.la
kio_ldap_la_SOURCES = kio_ldap.cpp
@@ -1419,9 +1418,9 @@
kio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_ldap.h
---- kdebase-3.5.9.dfsg.1/kioslave/mac/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/mac/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kioslave/mac/Makefile.am
++++ b/kioslave/mac/Makefile.am
+@@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPAT
kde_module_LTLIBRARIES = kio_mac.la
kio_mac_la_SOURCES = kio_mac.cpp
@@ -1430,9 +1429,9 @@
kio_mac_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_mac.h
---- kdebase-3.5.9.dfsg.1/kioslave/man/Makefile.am 2006-03-17 12:17:36.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kioslave/man/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -16,13 +16,13 @@
+--- a/kioslave/man/Makefile.am
++++ b/kioslave/man/Makefile.am
+@@ -16,13 +16,13 @@ kio_man_test_LDADD = man2html.lo kio_man
kde_module_LTLIBRARIES = kio_man.la libkmanpart.la
kio_man_la_SOURCES = man2html.cpp kio_man.cpp
@@ -1448,9 +1447,9 @@
libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kdelnk_DATA = man.protocol kmanpart.desktop
---- kdebase-3.5.9.dfsg.1/kioslave/media/kcmodule/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/kcmodule/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/kioslave/media/kcmodule/Makefile.am
++++ b/kioslave/media/kcmodule/Makefile.am
+@@ -9,7 +9,7 @@ kcm_media_la_SOURCES = notifiermodule.cp
main.cpp
kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1459,9 +1458,9 @@
noinst_HEADERS = notifiermodule.h managermodule.h \
serviceconfigdialog.h mimetypelistboxitem.h \
---- kdebase-3.5.9.dfsg.1/kioslave/media/kfile-plugin/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/kfile-plugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -2,7 +2,7 @@
+--- a/kioslave/media/kfile-plugin/Makefile.am
++++ b/kioslave/media/kfile-plugin/Makefile.am
+@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kfile_media.la
kfile_media_la_SOURCES = kfilemediaplugin.cpp
kfile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
@@ -1470,9 +1469,9 @@
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = kfile_media.desktop
---- kdebase-3.5.9.dfsg.1/kioslave/media/Makefile.am 2006-07-22 11:15:45.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/kioslave/media/Makefile.am
++++ b/kioslave/media/Makefile.am
+@@ -11,7 +11,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_media.la
kio_media_la_SOURCES = dummy.cpp
@@ -1481,9 +1480,9 @@
kio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
---- kdebase-3.5.9.dfsg.1/kioslave/media/mediamanager/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/mediamanager/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -24,7 +24,8 @@
+--- a/kioslave/media/mediamanager/Makefile.am
++++ b/kioslave/media/mediamanager/Makefile.am
+@@ -24,7 +24,8 @@ noinst_LTLIBRARIES = $(LINUXCDPOLLING_LI
kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1493,9 +1492,9 @@
servicesdir = $(kde_servicesdir)/kded
---- kdebase-3.5.9.dfsg.1/kioslave/media/medianotifier/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/medianotifier/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kioslave/media/medianotifier/Makefile.am
++++ b/kioslave/media/medianotifier/Makefile.am
+@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libmediacommon
kde_module_LTLIBRARIES = kded_medianotifier.la
kded_medianotifier_la_LDFLAGS = -module -avoid-version $(all_libraries)
kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KDECORE) \
@@ -1504,9 +1503,9 @@
kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \
notificationdialog.cpp notificationdialogview.ui
---- kdebase-3.5.9.dfsg.1/kioslave/media/propsdlgplugin/Makefile.am 2006-07-22 11:15:43.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/media/propsdlgplugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -2,7 +2,7 @@
+--- a/kioslave/media/propsdlgplugin/Makefile.am
++++ b/kioslave/media/propsdlgplugin/Makefile.am
+@@ -2,7 +2,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = media_propsdlgplugin.la
@@ -1515,9 +1514,9 @@
media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
AM_CPPFLAGS = $(all_includes)
---- kdebase-3.5.9.dfsg.1/kioslave/nfs/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/nfs/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kioslave/nfs/Makefile.am
++++ b/kioslave/nfs/Makefile.am
+@@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries) $(KDE_RPAT
kde_module_LTLIBRARIES = kio_nfs.la
kio_nfs_la_SOURCES = kio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
@@ -1526,9 +1525,9 @@
kio_nfs_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = nfs_prot.h mount.h
---- kdebase-3.5.9.dfsg.1/kioslave/nntp/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/nntp/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/nntp/Makefile.am
++++ b/kioslave/nntp/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/
kde_module_LTLIBRARIES = kio_nntp.la
kio_nntp_la_SOURCES = nntp.cpp
@@ -1537,9 +1536,9 @@
kio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kioslave/pop3/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/pop3/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/pop3/Makefile.am
++++ b/kioslave/pop3/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/
kde_module_LTLIBRARIES = kio_pop3.la
kio_pop3_la_SOURCES = pop3.cc
@@ -1548,9 +1547,9 @@
kio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = pop3.h
---- kdebase-3.5.9.dfsg.1/kioslave/remote/kdedmodule/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/remote/kdedmodule/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/remote/kdedmodule/Makefile.am
++++ b/kioslave/remote/kdedmodule/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_remotedirnotify_la_SOURCES = remotedirnotify.cpp remotedirnotify.skel remotedirnotifymodule.cpp remotedirnotifymodule.skel
kded_remotedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1559,9 +1558,9 @@
servicesdir = $(kde_servicesdir)/kded
---- kdebase-3.5.9.dfsg.1/kioslave/remote/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/remote/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kioslave/remote/Makefile.am
++++ b/kioslave/remote/Makefile.am
+@@ -7,7 +7,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_remote.la
kio_remote_la_SOURCES = dummy.cpp
@@ -1570,9 +1569,9 @@
kio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
---- kdebase-3.5.9.dfsg.1/kioslave/settings/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/settings/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/settings/Makefile.am
++++ b/kioslave/settings/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
kde_module_LTLIBRARIES = kio_settings.la
kio_settings_la_SOURCES = kio_settings.cc
@@ -1581,9 +1580,9 @@
kio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = kio_settings.h
---- kdebase-3.5.9.dfsg.1/kioslave/sftp/Makefile.am 2005-09-10 11:25:38.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/sftp/Makefile.am 2008-03-08 13:36:37.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kioslave/sftp/Makefile.am
++++ b/kioslave/sftp/Makefile.am
+@@ -14,7 +14,7 @@ ksshprocesstest_LDADD = $(LIB_KSYCOCA) k
kde_module_LTLIBRARIES = kio_sftp.la
kio_sftp_la_SOURCES = process.cpp atomicio.cpp kio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
@@ -1592,9 +1591,9 @@
kio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = atomicio.h kio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
---- kdebase-3.5.9.dfsg.1/kioslave/system/kdedmodule/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/system/kdedmodule/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kioslave/system/kdedmodule/Makefile.am
++++ b/kioslave/system/kdedmodule/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
kded_systemdirnotify_la_SOURCES = systemdirnotify.cpp systemdirnotify.skel systemdirnotifymodule.cpp systemdirnotifymodule.skel
kded_systemdirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1603,9 +1602,9 @@
servicesdir = $(kde_servicesdir)/kded
---- kdebase-3.5.9.dfsg.1/kioslave/system/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/system/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kioslave/system/Makefile.am
++++ b/kioslave/system/Makefile.am
+@@ -6,7 +6,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_system.la
kio_system_la_SOURCES = dummy.cpp
@@ -1614,20 +1613,20 @@
kio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
dummy.cpp:
---- kdebase-3.5.9.dfsg.1/kioslave/smb/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/smb/Makefile.am 2008-03-08 18:23:01.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/kioslave/smb/Makefile.am
++++ b/kioslave/smb/Makefile.am
+@@ -12,7 +12,7 @@ kio_smb_la_SOURCES = kio_smb.cpp \
kio_smb_internal.cpp \
kio_smb_mount.cpp
-kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS)
+kio_smb_la_LIBADD = -lkio -lsmbclient $(LIB_QT) $(LIB_KDECORE)
- kio_smb_la_LDFLAGS = -module $(KDE_PLUGIN)
+ kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
---- kdebase-3.5.9.dfsg.1/kioslave/smtp/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/smtp/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kioslave/smtp/Makefile.am
++++ b/kioslave/smtp/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/
kde_module_LTLIBRARIES = kio_smtp.la
kio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
@@ -1636,9 +1635,9 @@
kio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h
---- kdebase-3.5.9.dfsg.1/kioslave/tar/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/tar/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kioslave/tar/Makefile.am
++++ b/kioslave/tar/Makefile.am
+@@ -7,7 +7,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_tar.la
kio_tar_la_SOURCES = tar.cc
@@ -1647,9 +1646,9 @@
kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
check_PROGRAMS = ktartest
---- kdebase-3.5.9.dfsg.1/kioslave/thumbnail/configure.in.in 2006-07-22 11:15:46.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/thumbnail/configure.in.in 2008-03-08 18:29:30.000000000 +0200
-@@ -9,6 +9,9 @@
+--- a/kioslave/thumbnail/configure.in.in
++++ b/kioslave/thumbnail/configure.in.in
+@@ -9,6 +9,9 @@ if test "x$with_openexr" != xno; then
if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
AC_MSG_ERROR([--with-openexr was given, but test for OpenEXR failed])
fi
@@ -1659,9 +1658,9 @@
fi
AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
---- kdebase-3.5.9.dfsg.1/kioslave/thumbnail/Makefile.am 2006-01-19 19:00:59.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kioslave/thumbnail/Makefile.am 2008-03-08 18:30:15.000000000 +0200
-@@ -20,31 +20,31 @@
+--- a/kioslave/thumbnail/Makefile.am
++++ b/kioslave/thumbnail/Makefile.am
+@@ -20,31 +20,31 @@ kde_module_LTLIBRARIES = kio_thumbnail.l
$(EXR_MODULE)
kio_thumbnail_la_SOURCES = thumbnail.cpp
@@ -1700,9 +1699,9 @@
exrthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = thumbnail.h imagecreator.h textcreator.h htmlcreator.h \
---- kdebase-3.5.9.dfsg.1/kioslave/trash/kfile-plugin/Makefile.am 2005-09-10 11:25:36.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/trash/kfile-plugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kioslave/trash/kfile-plugin/Makefile.am
++++ b/kioslave/trash/kfile-plugin/Makefile.am
+@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kfile_trash.la
kfile_trash_la_SOURCES = kfile_trash.cpp
kfile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -1711,9 +1710,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kioslave/trash/Makefile.am 2005-09-10 11:25:37.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kioslave/trash/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kioslave/trash/Makefile.am
++++ b/kioslave/trash/Makefile.am
+@@ -6,7 +6,7 @@ SUBDIRS = . kfile-plugin
kde_module_LTLIBRARIES = kio_trash.la
kio_trash_la_SOURCES = kio_trash.cpp
@@ -1722,9 +1721,9 @@
kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
bin_PROGRAMS = ktrash
---- kdebase-3.5.9.dfsg.1/klipper/Makefile.am 2006-03-17 12:17:30.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/klipper/Makefile.am 2008-03-08 13:31:45.000000000 +0200
-@@ -16,11 +16,11 @@
+--- a/klipper/Makefile.am
++++ b/klipper/Makefile.am
+@@ -16,11 +16,11 @@ libklipper_common_la_SOURCES = main.cpp
libklipper_common_la_METASOURCES = AUTO
libklipper_common_la_LDFLAGS = $(all_libraries)
@@ -1738,9 +1737,9 @@
klipper_panelapplet_la_SOURCES = applet.cpp applet.skel
klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version
---- kdebase-3.5.9.dfsg.1/kmenuedit/Makefile.am 2006-03-17 12:17:38.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kmenuedit/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -15,11 +15,11 @@
+--- a/kmenuedit/Makefile.am
++++ b/kmenuedit/Makefile.am
+@@ -15,11 +15,11 @@ libkmenueditcommon_la_LIBADD = $(LIB_KDE
libkmenueditcommon_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmenuedit_la_SOURCES = main.cpp
@@ -1754,9 +1753,9 @@
kcontroledit_la_LDFLAGS = $(all_libraries) -module -avoid-version
noinst_HEADERS = kmenuedit.h treeview.h basictab.h khotkeys.h \
---- kdebase-3.5.9.dfsg.1/konqueror/about/Makefile.am 2005-09-10 11:25:48.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/about/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/konqueror/about/Makefile.am
++++ b/konqueror/about/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = konq_aboutpage.
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
konq_aboutpage_la_SOURCES = konq_aboutpage.cc
konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -1765,9 +1764,9 @@
kde_services_DATA = konq_aboutpage.desktop
kde_servicetypes_DATA = konqaboutpage.desktop
---- kdebase-3.5.9.dfsg.1/konqueror/client/Makefile.am 2005-09-10 11:25:48.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/client/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/konqueror/client/Makefile.am
++++ b/konqueror/client/Makefile.am
+@@ -6,7 +6,7 @@ kdeinit_LTLIBRARIES = kfmclient.la
INCLUDES= -I.. $(all_includes)
kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1776,9 +1775,9 @@
kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
noinst_HEADERS = kfmclient.h
---- kdebase-3.5.9.dfsg.1/konqueror/iconview/Makefile.am 2005-09-10 11:25:46.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/iconview/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/konqueror/iconview/Makefile.am
++++ b/konqueror/iconview/Makefile.am
+@@ -7,7 +7,7 @@ METASOURCES = AUTO
konq_iconview_la_SOURCES = konq_iconview.cc
konq_iconview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -1787,9 +1786,9 @@
noinst_HEADERS = konq_iconview.h
---- kdebase-3.5.9.dfsg.1/konqueror/keditbookmarks/Makefile.am 2005-09-10 11:25:49.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/keditbookmarks/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/konqueror/keditbookmarks/Makefile.am
++++ b/konqueror/keditbookmarks/Makefile.am
+@@ -14,7 +14,7 @@ dcop_DCOPIDLNG = true
keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp \
testlink.cpp favicons.cpp updater.cpp exporters.cpp kbookmarknotifier.stub bookmarkinfo.cpp kebsearchline.cpp settings.kcfgc
kbookmarknotifier_DIR = $(includedir)
@@ -1798,9 +1797,9 @@
keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
rcdir = $(kde_datadir)/keditbookmarks
---- kdebase-3.5.9.dfsg.1/konqueror/kttsplugin/Makefile.am 2005-09-10 11:25:46.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/kttsplugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/konqueror/kttsplugin/Makefile.am
++++ b/konqueror/kttsplugin/Makefile.am
+@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la
libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp
@@ -1809,9 +1808,9 @@
libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
pluginsdir = $(kde_datadir)/khtml/kpartplugins
---- kdebase-3.5.9.dfsg.1/konqueror/listview/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/listview/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/konqueror/listview/Makefile.am
++++ b/konqueror/listview/Makefile.am
+@@ -13,7 +13,7 @@ konq_listview_la_SOURCES = konq_listview
konq_listviewsettings.kcfgc
konq_listview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -1820,9 +1819,9 @@
kde_services_DATA = konq_treeview.desktop konq_detailedlistview.desktop \
konq_textview.desktop konq_infolistview.desktop
---- kdebase-3.5.9.dfsg.1/konqueror/Makefile.am 2007-10-08 12:51:30.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -49,7 +49,7 @@
+--- a/konqueror/Makefile.am
++++ b/konqueror/Makefile.am
+@@ -49,7 +49,7 @@ noinst_HEADERS = KonqMainWindowIface.h K
konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1831,9 +1830,9 @@
# Hmm, this experiment of a static konq failed, don't trust it...
# (but feel free to fix it :)
---- kdebase-3.5.9.dfsg.1/konqueror/preloader/Makefile.am 2006-03-17 12:17:39.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/konqueror/preloader/Makefile.am 2008-03-08 18:39:34.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/konqueror/preloader/Makefile.am
++++ b/konqueror/preloader/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_konqy_prel
INCLUDES= -I.. $(all_includes)
kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1842,9 +1841,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/konqueror/remoteencodingplugin/Makefile.am 2005-09-10 11:25:46.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/remoteencodingplugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/konqueror/remoteencodingplugin/Makefile.am
++++ b/konqueror/remoteencodingplugin/Makefile.am
+@@ -3,7 +3,7 @@ METASOURCES=AUTO
kde_module_LTLIBRARIES = konq_remoteencoding.la
konq_remoteencoding_la_SOURCES = kremoteencodingplugin.cpp
@@ -1853,9 +1852,9 @@
konq_remoteencoding_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
iconviewdir = $(kde_datadir)/konqiconview/kpartplugins
---- kdebase-3.5.9.dfsg.1/konqueror/shellcmdplugin/Makefile.am 2005-09-10 11:25:48.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/shellcmdplugin/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/konqueror/shellcmdplugin/Makefile.am
++++ b/konqueror/shellcmdplugin/Makefile.am
+@@ -4,7 +4,7 @@ METASOURCES=AUTO
kde_module_LTLIBRARIES = konq_shellcmdplugin.la
konq_shellcmdplugin_la_SOURCES = kshellcmdexecutor.cpp kshellcmddialog.cpp \
kshellcmdplugin.cpp
@@ -1864,9 +1863,9 @@
konq_shellcmdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
iconviewdir = $(kde_datadir)/konqiconview/kpartplugins
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/Makefile.am 2008-03-08 18:43:24.000000000 +0200
-@@ -22,11 +22,11 @@
+--- a/konqueror/sidebar/Makefile.am
++++ b/konqueror/sidebar/Makefile.am
+@@ -22,11 +22,11 @@ kde_module_LTLIBRARIES = konq_sidebar.la
# the Part's source, library search path, and link libraries
konq_sidebar_la_SOURCES = konqsidebar.cpp sidebar_widget.cpp
konq_sidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
@@ -1880,18 +1879,18 @@
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/bookmark_module/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/bookmark_module/Makefile.am 2008-03-08 18:42:45.000000000 +0200
-@@ -6,5 +6,5 @@
+--- a/konqueror/sidebar/trees/bookmark_module/Makefile.am
++++ b/konqueror/sidebar/trees/bookmark_module/Makefile.am
+@@ -6,5 +6,5 @@ METASOURCES = AUTO
konq_sidebartree_bookmarks_la_SOURCES = bookmark_module.cpp bookmark_item.cpp
konq_sidebartree_bookmarks_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-konq_sidebartree_bookmarks_la_LIBADD = ../../libkonqsidebarplugin.la ../libkonq_sidebar_tree.la
+konq_sidebartree_bookmarks_la_LIBADD = ../libkonq_sidebar_tree.la $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KIO) $(LIB_KDECORE) $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/dirtree_module/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/dirtree_module/Makefile.am 2008-03-08 18:44:23.000000000 +0200
-@@ -5,6 +5,6 @@
+--- a/konqueror/sidebar/trees/dirtree_module/Makefile.am
++++ b/konqueror/sidebar/trees/dirtree_module/Makefile.am
+@@ -5,6 +5,6 @@ kde_module_LTLIBRARIES = konq_sidebartre
METASOURCES = AUTO
konq_sidebartree_dirtree_la_SOURCES = dirtree_module.cpp dirtree_item.cpp
konq_sidebartree_dirtree_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -1899,9 +1898,9 @@
+konq_sidebartree_dirtree_la_LIBADD = ../libkonq_sidebar_tree.la $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KIO) $(LIB_KDECORE) $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/history_module/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/history_module/Makefile.am 2008-03-08 18:42:24.000000000 +0200
-@@ -7,10 +7,10 @@
+--- a/konqueror/sidebar/trees/history_module/Makefile.am
++++ b/konqueror/sidebar/trees/history_module/Makefile.am
+@@ -7,10 +7,10 @@ METASOURCES = AUTO
konq_sidebartree_history_la_SOURCES = history_module.cpp history_item.cpp \
history_settings.cpp history_settings.skel
konq_sidebartree_history_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -1914,18 +1913,18 @@
+kcm_history_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
xdg_apps_DATA = kcmhistory.desktop
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/trees/Makefile.am 2008-03-08 18:44:13.000000000 +0200
-@@ -13,5 +13,5 @@
+--- a/konqueror/sidebar/trees/Makefile.am
++++ b/konqueror/sidebar/trees/Makefile.am
+@@ -13,5 +13,5 @@ libkonq_sidebar_tree_la_LIBADD = $(top_b
konqsidebar_tree_la_SOURCES = konqsidebar_tree.cpp
konqsidebar_tree_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-konqsidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ../libkonqsidebarplugin.la libkonq_sidebar_tree.la
+konqsidebar_tree_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ../libkonqsidebarplugin.la libkonq_sidebar_tree.la $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KIO) $(LIB_KDECORE) $(LIB_KPARTS)
---- kdebase-3.5.9.dfsg.1/konqueror/sidebar/web_module/Makefile.am 2005-09-10 11:25:47.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/konqueror/sidebar/web_module/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/konqueror/sidebar/web_module/Makefile.am
++++ b/konqueror/sidebar/web_module/Makefile.am
+@@ -6,7 +6,7 @@ METASOURCES = AUTO
konqsidebar_web_la_SOURCES = web_module.cpp
konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -1934,9 +1933,9 @@
#plugindir=$(kde_datadir)/konqsidebartng/entries
#plugin_DATA=websidebar.desktop
---- kdebase-3.5.9.dfsg.1/konsole/konsole/Makefile.am 2006-03-17 12:17:43.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/konsole/konsole/Makefile.am 2008-03-08 18:46:35.000000000 +0200
-@@ -25,7 +25,7 @@
+--- a/konsole/konsole/Makefile.am
++++ b/konsole/konsole/Makefile.am
+@@ -25,7 +25,7 @@ libkonsolepart_la_SOURCES = TEPty.cpp Bl
sessioniface.skel
libkonsolepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
@@ -1945,7 +1944,7 @@
fontembedder_SOURCES = fontembedder.cpp
fontembedder_LDFLAGS = $(all_libraries)
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ fontembedder_LDADD = $(LIB_QT)
# kwrited kded module
kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel
@@ -1954,7 +1953,7 @@
kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
# konsole kdeinit module
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ konsole_la_SOURCES = TEPty.cpp BlockArra
konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \
zmodem_dialog.cpp printsettings.cpp
konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -1963,9 +1962,9 @@
# kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
# kcmkonsole_LDADD = $(LIB_KDEUI)
---- kdebase-3.5.9.dfsg.1/ksysguard/gui/ksgrd/Makefile.am 2005-09-10 11:26:15.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksysguard/gui/ksgrd/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/ksysguard/gui/ksgrd/Makefile.am
++++ b/ksysguard/gui/ksgrd/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../SensorDisplayLi
lib_LTLIBRARIES = libksgrd.la
libksgrd_la_LDFLAGS = -no-undefined -version-info 3:0:2 $(all_libraries)
@@ -1974,9 +1973,9 @@
# Which sources should be compiled for ksysguard.
libksgrd_la_SOURCES = \
---- kdebase-3.5.9.dfsg.1/ksysguard/gui/Makefile.am 2005-09-10 11:26:15.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksysguard/gui/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -49,7 +49,7 @@
+--- a/ksysguard/gui/Makefile.am
++++ b/ksysguard/gui/Makefile.am
+@@ -49,7 +49,7 @@ sysguard_panelapplet_la_SOURCES = \
sysguard_panelapplet_la_LIBADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
@@ -1985,17 +1984,9 @@
sysguard_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
EXTRA_DIST = $(lnk_DATA)
---- kdebase-3.5.9.dfsg.1/ksysguard/ksysguardd/Makefile.am 2007-05-14 10:55:53.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksysguard/ksysguardd/Makefile.am 2008-03-08 18:50:54.000000000 +0200
-@@ -32,4 +32,4 @@
-
- ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c
- ksysguardd_LDFLAGS = $(all_libraries)
--ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO)
-+ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIB_DNSSD) $(LIB_KINFO)
---- kdebase-3.5.9.dfsg.1/ksmserver/Makefile.am 2006-01-19 19:01:08.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/ksmserver/Makefile.am 2008-03-08 17:19:25.000000000 +0200
-@@ -31,7 +31,7 @@
+--- a/ksmserver/Makefile.am
++++ b/ksmserver/Makefile.am
+@@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.c
KSMServerInterface.skel server.skel
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
@@ -2004,9 +1995,9 @@
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
---- kdebase-3.5.9.dfsg.1/ksplashml/kcmksplash/Makefile.am 2005-09-10 11:25:50.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksplashml/kcmksplash/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/ksplashml/kcmksplash/Makefile.am
++++ b/ksplashml/kcmksplash/Makefile.am
+@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_ksplashthem
kcm_ksplashthemes_la_SOURCES = installer.cpp main.cpp
noinst_HEADERS = installer.h
@@ -2015,9 +2006,9 @@
kcm_ksplashthemes_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
xdg_apps_DATA = ksplashthememgr.desktop
---- kdebase-3.5.9.dfsg.1/ksplashml/themeengine/default/Makefile.am 2005-09-10 11:25:50.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksplashml/themeengine/default/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/ksplashml/themeengine/default/Makefile.am
++++ b/ksplashml/themeengine/default/Makefile.am
+@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = ksplashdefault.
ksplashdefault_la_SOURCES = main.cpp
ksplashdefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module
@@ -2026,9 +2017,9 @@
METASOURCES = AUTO
servicesdir = $(kde_servicesdir)
---- kdebase-3.5.9.dfsg.1/ksplashml/themeengine/Makefile.am 2006-03-17 12:17:40.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/ksplashml/themeengine/Makefile.am 2008-03-08 18:48:43.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/ksplashml/themeengine/Makefile.am
++++ b/ksplashml/themeengine/Makefile.am
+@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libksplashthemes.la
libksplashthemes_la_SOURCES = themeengine.cpp objkstheme.cpp
libksplashthemes_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
@@ -2037,9 +2028,9 @@
METASOURCES = AUTO
# install this header for theme developers.
---- kdebase-3.5.9.dfsg.1/ksplashml/themeengine/redmond/Makefile.am 2005-09-10 11:25:50.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksplashml/themeengine/redmond/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/ksplashml/themeengine/redmond/Makefile.am
++++ b/ksplashml/themeengine/redmond/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/th
ksplashredmond_la_SOURCES = previewredmond.cpp themeredmond.cpp
ksplashredmond_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
@@ -2048,9 +2039,9 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = ksplashredmond.la
---- kdebase-3.5.9.dfsg.1/ksplashml/themeengine/standard/Makefile.am 2005-09-10 11:25:50.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/ksplashml/themeengine/standard/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/ksplashml/themeengine/standard/Makefile.am
++++ b/ksplashml/themeengine/standard/Makefile.am
+@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = ksplashstandard
ksplashstandard_la_SOURCES = themestandardlib.cpp
ksplashstandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module
@@ -2059,9 +2050,9 @@
METASOURCES = AUTO
noinst_HEADERS = themestandard.h wndicon.h wndstatus.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/b2/config/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/b2/config/Makefile.am 2008-03-08 18:52:17.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kwin/clients/b2/config/Makefile.am
++++ b/kwin/clients/b2/config/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_b2_config.
kwin_b2_config_la_SOURCES = config.cpp
kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2070,9 +2061,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/b2/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/b2/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kwin/clients/b2/Makefile.am
++++ b/kwin/clients/b2/Makefile.am
+@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kwin3_b2.la
kwin3_b2_la_SOURCES = b2client.cpp
kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
# kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
@@ -2081,9 +2072,9 @@
METASOURCES = AUTO
noinst_HEADERS = b2client.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/default/config/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/default/config/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kwin/clients/default/config/Makefile.am
++++ b/kwin/clients/default/config/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_default_co
kwin_default_config_la_SOURCES = config.cpp
kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2092,9 +2083,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/default/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/default/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kwin/clients/default/Makefile.am
++++ b/kwin/clients/default/Makefile.am
+@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwin3_default.l
kwin3_default_la_SOURCES = kdedefault.cpp
kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2103,9 +2094,9 @@
METASOURCES = AUTO
noinst_HEADERS = kdedefault.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/keramik/config/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/keramik/config/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kwin/clients/keramik/config/Makefile.am
++++ b/kwin/clients/keramik/config/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_ke
kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2114,9 +2105,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h keramikconfig.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/keramik/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/keramik/Makefile.am 2008-03-08 18:53:22.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/kwin/clients/keramik/Makefile.am
++++ b/kwin/clients/keramik/Makefile.am
+@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kwin3_kerami
kwin3_keramik_la_SOURCES = keramik.cpp
kwin3_keramik_la_COMPILE_FIRST = tiles.h
kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2125,9 +2116,9 @@
#kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kwin/clients/laptop/Makefile.am 2005-09-10 11:25:55.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/laptop/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kwin/clients/laptop/Makefile.am
++++ b/kwin/clients/laptop/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_laptop.la
kwin3_laptop_la_SOURCES = laptopclient.cpp
kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2136,9 +2127,9 @@
METASOURCES = AUTO
noinst_HEADERS = laptopclient.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/modernsystem/config/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/modernsystem/config/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kwin/clients/modernsystem/config/Makefile.am
++++ b/kwin/clients/modernsystem/config/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin_modernsys_
kwin_modernsys_config_la_SOURCES = config.cpp
kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2147,9 +2138,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/modernsystem/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/modernsystem/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kwin/clients/modernsystem/Makefile.am
++++ b/kwin/clients/modernsystem/Makefile.am
+@@ -6,7 +6,7 @@ SUBDIRS = config
kde_module_LTLIBRARIES = kwin3_modernsys.la
kwin3_modernsys_la_SOURCES = modernsys.cpp
@@ -2158,9 +2149,9 @@
kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kwin/clients/plastik/config/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/plastik/config/Makefile.am 2008-03-08 18:51:45.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kwin/clients/plastik/config/Makefile.am
++++ b/kwin/clients/plastik/config/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_plas
kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui
kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2169,9 +2160,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/plastik/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/plastik/Makefile.am 2008-03-08 18:53:10.000000000 +0200
-@@ -12,7 +12,7 @@
+--- a/kwin/clients/plastik/Makefile.am
++++ b/kwin/clients/plastik/Makefile.am
+@@ -12,7 +12,7 @@ kwin_DATA = plastik.desktop
kde_module_LTLIBRARIES = kwin3_plastik.la
kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2180,9 +2171,9 @@
kwin3_plastik_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES)
---- kdebase-3.5.9.dfsg.1/kwin/clients/quartz/config/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/quartz/config/Makefile.am 2008-03-08 18:51:30.000000000 +0200
-@@ -4,7 +4,7 @@
+--- a/kwin/clients/quartz/config/Makefile.am
++++ b/kwin/clients/quartz/config/Makefile.am
+@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_quartz_con
kwin_quartz_config_la_SOURCES = config.cpp
kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2191,9 +2182,9 @@
METASOURCES = AUTO
noinst_HEADERS = config.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/quartz/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/quartz/Makefile.am 2008-03-08 18:52:38.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/kwin/clients/quartz/Makefile.am
++++ b/kwin/clients/quartz/Makefile.am
+@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwin3_quartz.la
kwin3_quartz_la_SOURCES = quartz.cpp
kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2202,9 +2193,9 @@
METASOURCES = AUTO
noinst_HEADERS = quartz.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/redmond/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/redmond/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kwin/clients/redmond/Makefile.am
++++ b/kwin/clients/redmond/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_redmond.l
kwin3_redmond_la_SOURCES = redmond.cpp
kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2213,9 +2204,9 @@
METASOURCES = AUTO
noinst_HEADERS = redmond.h
---- kdebase-3.5.9.dfsg.1/kwin/clients/web/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/clients/web/Makefile.am 2008-03-08 18:52:52.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/kwin/clients/web/Makefile.am
++++ b/kwin/clients/web/Makefile.am
+@@ -6,7 +6,7 @@ kwin3_web_la_SOURCES = Web.cpp WebB
noinst_HEADERS = Web.h WebButton.h
kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -2224,9 +2215,9 @@
METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/
---- kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwindecoration/Makefile.am 2005-09-10 11:25:56.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwindecoration/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -8,7 +8,7 @@
+--- a/kwin/kcmkwin/kwindecoration/Makefile.am
++++ b/kwin/kcmkwin/kwindecoration/Makefile.am
+@@ -8,7 +8,7 @@ noinst_HEADERS = kwindecoration.h kwinde
kcm_kwindecoration_la_LDFLAGS = \
-module -avoid-version $(all_libraries) -no-undefined
@@ -2235,9 +2226,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwinoptions/Makefile.am 2005-09-10 11:26:02.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwinoptions/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -5,7 +5,7 @@
+--- a/kwin/kcmkwin/kwinoptions/Makefile.am
++++ b/kwin/kcmkwin/kwinoptions/Makefile.am
+@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_kwinoptions
kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -2246,9 +2237,9 @@
noinst_HEADERS = windows.h mouse.h
---- kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwinrules/Makefile.am 2006-05-22 21:13:01.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/kcmkwin/kwinrules/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -15,12 +15,12 @@
+--- a/kwin/kcmkwin/kwinrules/Makefile.am
++++ b/kwin/kcmkwin/kwinrules/Makefile.am
+@@ -15,12 +15,12 @@ libkwinrules_la_LIBADD = $(LIB_KDEUI)
kcm_kwinrules_la_SOURCES = kcm.cpp
kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
@@ -2263,9 +2254,9 @@
kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
messages: rc.cpp
---- kdebase-3.5.9.dfsg.1/kwin/lib/Makefile.am 2005-09-10 11:26:02.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/lib/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/kwin/lib/Makefile.am
++++ b/kwin/lib/Makefile.am
+@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkdecorations.la
libkdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \
kdecorationfactory.cpp kcommondecoration.cpp
@@ -2274,9 +2265,9 @@
libkdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
# FRAME
---- kdebase-3.5.9.dfsg.1/kwin/Makefile.am 2005-09-10 11:26:03.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/kwin/Makefile.am 2008-03-08 17:19:25.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/kwin/Makefile.am
++++ b/kwin/Makefile.am
+@@ -17,7 +17,7 @@ kwin_la_SOURCES = workspace.cpp client.c
manage.cpp notifications.cpp activation.cpp useractions.cpp \
geometry.cpp rules.cpp
@@ -2285,9 +2276,9 @@
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h
---- kdebase-3.5.9.dfsg.1/kxkb/Makefile.am 2006-03-17 12:17:41.000000000 +0200
-+++ kdebase-3.5.9.dfsg.1/kxkb/Makefile.am 2008-03-08 18:20:41.000000000 +0200
-@@ -13,14 +13,14 @@
+--- a/kxkb/Makefile.am
++++ b/kxkb/Makefile.am
+@@ -13,14 +13,14 @@ kde_module_LTLIBRARIES = kcm_keyboard.la
kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \
kcmlayout.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui
kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -2304,9 +2295,9 @@
xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop
---- kdebase-3.5.9.dfsg.1/libkonq/favicons/Makefile.am 2005-09-10 11:25:53.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/libkonq/favicons/Makefile.am 2008-03-08 13:31:05.000000000 +0200
-@@ -3,7 +3,7 @@
+--- a/libkonq/favicons/Makefile.am
++++ b/libkonq/favicons/Makefile.am
+@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_favicons.l
INCLUDES = $(all_includes)
kded_favicons_la_SOURCES = favicons.cpp favicons.skel
kded_favicons_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -2315,9 +2306,9 @@
METASOURCES = AUTO
---- kdebase-3.5.9.dfsg.1/libkonq/Makefile.am 2005-10-10 18:04:21.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/libkonq/Makefile.am 2008-03-08 17:20:40.000000000 +0200
-@@ -21,7 +21,7 @@
+--- a/libkonq/Makefile.am
++++ b/libkonq/Makefile.am
+@@ -21,7 +21,7 @@ SUBDIRS = pics favicons
lib_LTLIBRARIES = libkonq.la
libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
@@ -2326,7 +2317,7 @@
libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
konq_xmlguiclient.cc\
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ endif
kde_module_LTLIBRARIES = $(ARTS_MODULE)
konq_sound_la_SOURCES = konq_sound.cc
konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -2335,9 +2326,9 @@
noinst_HEADERS = konq_sound.h
---- kdebase-3.5.9.dfsg.1/nsplugins/Makefile.am 2007-10-08 12:51:24.000000000 +0300
-+++ kdebase-3.5.9.dfsg.1/nsplugins/Makefile.am 2008-03-08 18:45:19.000000000 +0200
-@@ -11,16 +11,16 @@
+--- a/nsplugins/Makefile.am
++++ b/nsplugins/Makefile.am
+@@ -11,16 +11,16 @@ libnsplugin_la_SOURCES = plugin_part.cpp
NSPluginCallbackIface.skel
libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined
Modified: branches/kdebase-legacy/kdebase/debian/patches/98_buildprep.diff
===================================================================
Modified: branches/kdebase-legacy/kdebase/debian/patches/series
===================================================================
--- branches/kdebase-legacy/kdebase/debian/patches/series 2009-03-07 02:36:33 UTC (rev 14013)
+++ branches/kdebase-legacy/kdebase/debian/patches/series 2009-03-07 22:14:01 UTC (rev 14014)
@@ -1,9 +1,8 @@
-common/03_libtool_update.diff
-common/04_am_maintainer_mode.diff
-common/05_pedantic-errors.diff
-common/06_disable_no_undefined.diff
01_admin_cleanup.diff
-01_kdebase_branch_r829407.diff -p0
+03_libtool_update.diff
+04_am_maintainer_mode.diff
+05_pedantic-errors.diff
+06_disable_no_undefined.diff
10_kdmrc_defaults.diff
11_genkdmconf.diff
12_genkdm_make.diff
@@ -37,5 +36,6 @@
74_kdeprint_only_in_kde.diff
75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
+77_fix_ftbfs_ucred_redefinition.diff
97_automake_cleanup.diff
-98_buildprep.diff -p0
+98_buildprep.diff
More information about the pkg-kde-commits
mailing list