rev 14608 - in kde-extras/soundkonverter/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue May 12 14:33:51 UTC 2009
Author: fabo
Date: 2009-05-12 14:33:51 +0000 (Tue, 12 May 2009)
New Revision: 14608
Added:
kde-extras/soundkonverter/trunk/debian/patches/01_gcc4.4_support_bug505724.diff
Removed:
kde-extras/soundkonverter/trunk/debian/patches/07_amarok_script.diff
kde-extras/soundkonverter/trunk/debian/soundkonverter-amarok.install
Modified:
kde-extras/soundkonverter/trunk/debian/README.Debian
kde-extras/soundkonverter/trunk/debian/changelog
kde-extras/soundkonverter/trunk/debian/control
kde-extras/soundkonverter/trunk/debian/patches/02_autotools_update.diff
kde-extras/soundkonverter/trunk/debian/patches/03_libtool_update.diff
kde-extras/soundkonverter/trunk/debian/patches/04_am_maintainer_mode.diff
kde-extras/soundkonverter/trunk/debian/patches/05_pedantic-errors.diff
kde-extras/soundkonverter/trunk/debian/patches/06_disable_no_undefined.diff
kde-extras/soundkonverter/trunk/debian/patches/series
kde-extras/soundkonverter/trunk/debian/rules
Log:
Prepare soundkonverter 0.3.8-3 upload
* Drop soundkonverter-amarok since it doesn't work with amarok 2.
(Closes: #528350)
* Add patch to fix ftbfs with gcc 4.4. Thanks to Martin Michlmayr.
(Closes: #505724)
* Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
Modified: kde-extras/soundkonverter/trunk/debian/README.Debian
===================================================================
--- kde-extras/soundkonverter/trunk/debian/README.Debian 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/README.Debian 2009-05-12 14:33:51 UTC (rev 14608)
@@ -20,11 +20,5 @@
Note: you don't need all of the mentionned programs to use soundKonverter.
- -- Fathi Boudra <fboudra at free.fr> Sat, 13 Oct 2007 14:50:28 +0200
+ -- Fathi Boudra <fabo at debian.org> Sat, 13 Oct 2007 14:50:28 +0200
-To enable the soundkonverter-amarok script just launch soundKonverter once. It
-will create a soundKonverter directory in ~/.kde/share/apps/amarok/scripts.
-The soundkonvert script will now appear in the script manager window of a newly
-started amarok.
-
- -- Michael Meskes <meskes at debian.org> Fri, 27 Jun 2008 20:24:25 +0200
Modified: kde-extras/soundkonverter/trunk/debian/changelog
===================================================================
--- kde-extras/soundkonverter/trunk/debian/changelog 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/changelog 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,3 +1,13 @@
+soundkonverter (0.3.8-3) unstable; urgency=low
+
+ * Drop soundkonverter-amarok since it doesn't work with amarok 2.
+ (Closes: #528350)
+ * Add patch to fix ftbfs with gcc 4.4. Thanks to Martin Michlmayr.
+ (Closes: #505724)
+ * Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 12 May 2009 16:04:07 +0200
+
soundkonverter (0.3.8-2) unstable; urgency=low
* Changed build dependency from automake-1.9 to automake. (Closes: #488814)
Modified: kde-extras/soundkonverter/trunk/debian/control
===================================================================
--- kde-extras/soundkonverter/trunk/debian/control 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/control 2009-05-12 14:33:51 UTC (rev 14608)
@@ -5,7 +5,7 @@
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>, Michael Meskes <meskes at debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, automake, kdelibs4-dev,
libcdparanoia0-dev, libtag1-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.kde-apps.org/content/show.php?content=29024
Package: soundkonverter
@@ -14,7 +14,6 @@
Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac,
kdemultimedia-kio-plugins, mp3gain, mplayer, mppenc, speex, timidity,
vorbis-tools, vorbisgain, wavpack
-Suggests: soundkonverter-amarok
Description: audio converter frontend for KDE
soundKonverter is a frontend to various audio converters.
.
@@ -26,18 +25,5 @@
soundKonverter supports reading and writing tags for many formats, so the tags
are preserved when converting files.
.
- It comes with an Amarok script.
- .
- See 'soundkonverter-amarok' package for more informations.
- .
See README.Debian for more informations on supported formats.
-Package: soundkonverter-amarok
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- soundkonverter, amarok, ruby, libqt0-ruby1.8
-Description: audio converter frontend for KDE (Amarok script)
- Amarok script for soundKonverter. It allows you to easily transcode files when
- transfering to your media device.
- .
- See 'soundKonverter' package for more informations.
Added: kde-extras/soundkonverter/trunk/debian/patches/01_gcc4.4_support_bug505724.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/01_gcc4.4_support_bug505724.diff (rev 0)
+++ kde-extras/soundkonverter/trunk/debian/patches/01_gcc4.4_support_bug505724.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -0,0 +1,72 @@
+--- a/src/metadata/wav/wavproperties.cpp
++++ b/src/metadata/wav/wavproperties.cpp
+@@ -29,6 +29,7 @@
+
+ #include "wavfile.h"
+
++#include <stdio.h>
+ #include <netinet/in.h> // ntohl
+
+ using namespace TagLib;
+--- a/src/metadata/wav/wavfile.cpp
++++ b/src/metadata/wav/wavfile.cpp
+@@ -29,6 +29,8 @@
+ #include <taglib/audioproperties.h>
+ #include <taglib/tag.h>
+
++#include <stdio.h>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+--- a/src/metadata/wav/wavfiletyperesolver.cpp
++++ b/src/metadata/wav/wavfiletyperesolver.cpp
+@@ -22,6 +22,7 @@
+ #include "wavfiletyperesolver.h"
+ #include "wavfile.h"
+
++#include <stdio.h>
+ #include <string.h>
+
+ TagLib::File *WavFileTypeResolver::createFile(const char *fileName,
+--- a/src/metadata/audible/audibleproperties.cpp
++++ b/src/metadata/audible/audibleproperties.cpp
+@@ -29,6 +29,7 @@
+
+ #include "taglib_audiblefile.h"
+
++#include <cstdio>
+ #include <netinet/in.h> // ntohl
+
+ using namespace TagLib;
+--- a/src/metadata/audible/audibletag.cpp
++++ b/src/metadata/audible/audibletag.cpp
+@@ -28,6 +28,7 @@
+ #include <taglib/tag.h>
+
+ #include <netinet/in.h> // ntohl
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+--- a/src/metadata/audible/taglib_audiblefile.cpp
++++ b/src/metadata/audible/taglib_audiblefile.cpp
+@@ -29,6 +29,8 @@
+ #include <taglib/tfile.h>
+ #include <taglib/audioproperties.h>
+
++#include <cstdio>
++
+ namespace TagLib {
+ ////////////////////////////////////////////////////////////////////////////////
+ // public members
+--- a/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
++++ b/src/metadata/audible/taglib_audiblefiletyperesolver.cpp
+@@ -22,6 +22,7 @@
+ #include "taglib_audiblefiletyperesolver.h"
+ #include "taglib_audiblefile.h"
+
++#include <stdio.h>
+ #include <string.h>
+
+ TagLib::File *AudibleFileTypeResolver::createFile(const char *fileName,
Modified: kde-extras/soundkonverter/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/02_autotools_update.diff 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/02_autotools_update.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,6 +1,5 @@
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp 2007-04-30 13:30:44.000000000 +0200
-+++ b/admin/depcomp 2007-10-13 16:25:01.000000000 +0200
+--- a/admin/depcomp
++++ b/admin/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -10,7 +9,7 @@
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-@@ -467,7 +467,8 @@
+@@ -467,7 +467,8 @@ cpp)
done
"$@" -E |
Modified: kde-extras/soundkonverter/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/03_libtool_update.diff 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/03_libtool_update.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,6 +1,5 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-04-30 13:30:44.000000000 +0200
-+++ b/admin/libtool.m4.in 2007-10-13 16:25:01.000000000 +0200
+--- 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
@@ -35,7 +34,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -82,7 +67,7 @@
+@@ -82,7 +67,7 @@ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +43,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -132,7 +117,7 @@
+@@ -132,7 +117,7 @@ esac
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -53,7 +52,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -152,7 +137,7 @@
+@@ -152,7 +137,7 @@ rm="rm -f"
default_ofile=libtool
can_build_shared=yes
@@ -62,7 +61,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -172,6 +157,7 @@
+@@ -172,6 +157,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -70,7 +69,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -184,22 +170,24 @@
+@@ -184,22 +170,24 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -98,7 +97,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -240,11 +228,58 @@
+@@ -240,11 +228,58 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -157,7 +156,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -254,12 +289,20 @@
+@@ -254,12 +289,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],
@@ -183,7 +182,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -317,15 +360,15 @@
+@@ -317,15 +360,15 @@ fi
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -202,7 +201,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -490,18 +533,21 @@
+@@ -490,18 +533,21 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -228,7 +227,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,8 +559,10 @@
+@@ -513,8 +559,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
esac
;;
*64-bit*)
@@ -240,7 +239,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -547,6 +595,22 @@
+@@ -547,6 +595,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -263,7 +262,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -570,7 +634,7 @@
+@@ -570,7 +634,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -272,7 +271,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -578,7 +642,7 @@
+@@ -578,7 +642,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 \
@@ -281,7 +280,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -588,8 +652,10 @@
+@@ -588,8 +652,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
@@ -294,7 +293,7 @@
$2=yes
fi
fi
-@@ -609,17 +675,23 @@
+@@ -609,17 +675,23 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -321,7 +320,7 @@
else
$2=yes
fi
-@@ -643,7 +715,7 @@
+@@ -643,7 +715,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
@@ -330,7 +329,7 @@
case $build_os in
msdosdjgpp*)
-@@ -672,24 +744,77 @@
+@@ -672,24 +744,77 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@@ -426,7 +425,7 @@
;;
esac
])
-@@ -702,7 +827,7 @@
+@@ -702,7 +827,7 @@ fi
# _LT_AC_CHECK_DLFCN
@@ -435,7 +434,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +835,7 @@
+@@ -710,7 +835,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)
@@ -444,7 +443,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -776,17 +901,19 @@
+@@ -776,17 +901,19 @@ int main ()
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -466,7 +465,7 @@
esac
else :
# compilation failed
-@@ -798,7 +925,7 @@
+@@ -798,7 +925,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF
@@ -475,7 +474,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -835,7 +962,7 @@
+@@ -835,7 +962,7 @@ else
lt_cv_dlopen_self=yes
])
;;
@@ -484,7 +483,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -869,7 +996,7 @@
+@@ -869,7 +996,7 @@ else
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -493,7 +492,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +1009,7 @@
+@@ -882,7 +1009,7 @@ else
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -502,7 +501,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -914,7 +1041,8 @@
+@@ -914,7 +1041,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -512,7 +511,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -922,14 +1050,7 @@
+@@ -922,14 +1050,7 @@ AC_CACHE_CHECK([if $compiler supports -c
mkdir conftest
cd conftest
mkdir out
@@ -528,7 +527,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -937,7 +1058,7 @@
+@@ -937,7 +1058,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 \
@@ -537,7 +536,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -949,13 +1070,18 @@
+@@ -949,13 +1070,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
@@ -560,7 +559,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1014,8 +1140,8 @@
+@@ -1014,8 +1140,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)" || \
@@ -571,7 +570,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1064,6 +1190,7 @@
+@@ -1064,6 +1190,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -579,7 +578,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1072,7 +1199,7 @@
+@@ -1072,7 +1199,7 @@ fi
*)
AC_MSG_RESULT([no])
;;
@@ -588,7 +587,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1081,11 +1208,12 @@
+@@ -1081,11 +1208,12 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -603,7 +602,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1223,58 @@
+@@ -1095,7 +1223,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -663,7 +662,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1160,7 +1339,7 @@
+@@ -1160,7 +1339,7 @@ aix4* | aix5*)
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -672,7 +671,7 @@
;;
beos*)
-@@ -1169,7 +1348,7 @@
+@@ -1169,7 +1348,7 @@ beos*)
shlibpath_var=LIBRARY_PATH
;;
@@ -681,7 +680,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1364,7 @@
+@@ -1185,7 +1364,7 @@ bsdi4*)
cygwin* | mingw* | pw32*)
version_type=windows
@@ -690,7 +689,7 @@
need_version=no
need_lib_prefix=no
-@@ -1197,7 +1376,8 @@
+@@ -1197,7 +1376,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~
@@ -700,7 +699,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1227,7 +1407,7 @@
+@@ -1227,7 +1407,7 @@ cygwin* | mingw* | pw32*)
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -709,7 +708,7 @@
;;
esac
;;
-@@ -1250,13 +1430,9 @@
+@@ -1250,13 +1430,9 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -726,7 +725,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1273,20 +1449,17 @@
+@@ -1273,20 +1449,17 @@ freebsd1*)
dynamic_linker=no
;;
@@ -758,7 +757,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1304,14 +1477,19 @@
+@@ -1304,14 +1477,19 @@ freebsd*)
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -780,7 +779,7 @@
esac
;;
-@@ -1331,9 +1509,9 @@
+@@ -1331,9 +1509,9 @@ hpux9* | hpux10* | hpux11*)
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -792,7 +791,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1526,7 @@
+@@ -1348,7 +1526,7 @@ hpux9* | hpux10* | hpux11*)
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -801,7 +800,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1537,7 @@
+@@ -1359,7 +1537,7 @@ hpux9* | hpux10* | hpux11*)
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -810,7 +809,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1549,18 @@
+@@ -1371,6 +1549,18 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -829,7 +828,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1604,26 @@
+@@ -1414,29 +1604,26 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -866,7 +865,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1633,18 @@
+@@ -1446,6 +1633,18 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -885,7 +884,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1654,7 @@
+@@ -1455,7 +1654,7 @@ netbsd*)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -894,7 +893,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1682,13 @@
+@@ -1483,8 +1682,13 @@ nto-qnx*)
openbsd*)
version_type=sunos
@@ -909,7 +908,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1708,7 @@
+@@ -1504,7 +1708,7 @@ openbsd*)
os2*)
libname_spec='$name'
@@ -918,7 +917,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,11 +1726,8 @@
+@@ -1522,11 +1726,8 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -932,7 +931,7 @@
;;
solaris*)
-@@ -1554,7 +1755,7 @@
+@@ -1554,7 +1755,7 @@ sunos4*)
need_version=yes
;;
@@ -941,7 +940,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1587,6 +1788,29 @@
+@@ -1587,6 +1788,29 @@ sysv4*MP*)
fi
;;
@@ -971,7 +970,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,13 +1824,19 @@
+@@ -1600,13 +1824,19 @@ uts4*)
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -992,7 +991,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -1624,6 +1854,9 @@
+@@ -1624,6 +1854,9 @@ if test -f "$ltmain" && test -n "$tagnam
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -1002,7 +1001,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1883,9 @@
+@@ -1650,7 +1883,9 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
@@ -1013,7 +1012,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +1947,7 @@
+@@ -1712,7 +1947,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -1022,7 +1021,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1985,7 @@
+@@ -1750,7 +1985,7 @@ AC_ARG_ENABLE([shared],
# AC_DISABLE_SHARED
# -----------------
@@ -1031,7 +1030,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1862,7 +2097,7 @@
+@@ -1862,7 +2097,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -1040,7 +1039,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -1886,7 +2121,7 @@
+@@ -1886,7 +2121,7 @@ dnl not every word. This closes a longs
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -1049,7 +1048,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -1925,7 +2160,7 @@
+@@ -1925,7 +2160,7 @@ fi
# AC_PATH_MAGIC
# -------------
@@ -1058,7 +1057,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -1996,7 +2231,7 @@
+@@ -1996,7 +2231,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,
@@ -1067,7 +1066,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2028,7 +2263,7 @@
+@@ -2028,7 +2263,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,
@@ -1076,7 +1075,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2290,15 @@
+@@ -2055,6 +2290,15 @@ case $reload_flag in
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -1092,7 +1091,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2063,7 +2307,7 @@
+@@ -2063,7 +2307,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],
@@ -1101,7 +1100,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2088,44 +2332,42 @@
+@@ -2088,44 +2332,42 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1163,7 +1162,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2141,7 +2383,7 @@
+@@ -2141,7 +2383,7 @@ gnu*)
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1172,7 +1171,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -2157,43 +2399,27 @@
+@@ -2157,43 +2399,27 @@ hpux10.20* | hpux11*)
esac
;;
@@ -1229,7 +1228,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2212,32 +2438,26 @@
+@@ -2212,32 +2438,26 @@ nto-qnx*)
;;
openbsd*)
@@ -1266,7 +1265,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2258,10 +2478,13 @@
+@@ -2258,10 +2478,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1281,7 +1280,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2281,36 +2504,43 @@
+@@ -2281,36 +2504,43 @@ AC_DEFUN([AC_PROG_NM],
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1349,7 +1348,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2342,13 +2572,13 @@
+@@ -2342,13 +2572,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
@@ -1370,7 +1369,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2367,13 +2597,13 @@
+@@ -2367,13 +2597,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
@@ -1391,7 +1390,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -2411,10 +2641,21 @@
+@@ -2411,10 +2641,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1414,7 +1413,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2454,7 +2695,7 @@
+@@ -2454,7 +2695,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+$
# AC_LIBTOOL_RC
@@ -1423,7 +1422,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2480,43 +2721,16 @@
+@@ -2480,43 +2721,16 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1472,7 +1471,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2744,9 @@
+@@ -2530,9 +2744,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
@@ -1484,7 +1483,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2541,7 +2755,7 @@
+@@ -2541,7 +2755,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1493,7 +1492,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2550,48 +2764,11 @@
+@@ -2550,48 +2764,11 @@ aix3*)
fi
;;
@@ -1544,7 +1543,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2616,7 +2793,7 @@
+@@ -2616,7 +2793,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1553,7 +1552,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2628,6 +2805,7 @@
+@@ -2628,6 +2805,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
@@ -1561,7 +1560,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2645,21 +2823,25 @@
+@@ -2645,21 +2823,25 @@ _LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1590,7 +1589,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2670,18 +2852,18 @@
+@@ -2670,18 +2852,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
@@ -1612,7 +1611,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2699,8 +2881,8 @@
+@@ -2699,8 +2881,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
@@ -1623,7 +1622,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2726,7 +2908,7 @@
+@@ -2726,7 +2908,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.
@@ -1632,7 +1631,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2756,13 +2938,28 @@
+@@ -2756,13 +2938,28 @@ case $host_os in
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1667,7 +1666,7 @@
# have problems creating the table of contents. If linking a library
# or program results in "error TOC overflow" add -mminimal-toc to
# CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-@@ -2774,7 +2971,7 @@
+@@ -2774,7 +2971,7 @@ case $host_os in
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1676,7 +1675,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -2782,7 +2979,7 @@
+@@ -2782,7 +2979,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1685,7 +1684,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -2793,8 +2990,12 @@
+@@ -2793,8 +2990,12 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1698,7 +1697,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2803,15 +3004,16 @@
+@@ -2803,15 +3004,16 @@ case $host_os in
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1719,7 +1718,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -2820,13 +3022,12 @@
+@@ -2820,13 +3022,12 @@ case $host_os in
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1735,7 +1734,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2835,16 +3036,26 @@
+@@ -2835,16 +3036,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'
@@ -1767,7 +1766,7 @@
chorus*)
case $cc_basename in
*)
-@@ -2858,12 +3069,12 @@
+@@ -2858,12 +3069,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'
@@ -1782,7 +1781,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2872,70 +3083,81 @@
+@@ -2872,70 +3083,81 @@ case $host_os in
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1915,7 +1914,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2946,14 +3168,14 @@
+@@ -2946,14 +3168,14 @@ case $host_os in
;;
esac
;;
@@ -1932,7 +1931,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2970,12 +3192,12 @@
+@@ -2970,12 +3192,12 @@ case $host_os in
# location of the library.
case $cc_basename in
@@ -1948,7 +1947,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -2984,11 +3206,11 @@
+@@ -2984,11 +3206,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.
@@ -1962,7 +1961,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2998,33 +3220,20 @@
+@@ -2998,33 +3220,20 @@ case $host_os in
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -2003,7 +2002,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3035,17 +3244,20 @@
+@@ -3035,17 +3244,20 @@ case $host_os in
esac
case $cc_basename in
@@ -2030,7 +2029,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3061,12 +3273,15 @@
+@@ -3061,12 +3273,15 @@ case $host_os in
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -2050,7 +2049,7 @@
;;
esac
fi
-@@ -3077,11 +3292,25 @@
+@@ -3077,11 +3292,25 @@ case $host_os in
;;
esac
;;
@@ -2078,7 +2077,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3092,9 +3321,9 @@
+@@ -3092,9 +3321,9 @@ case $host_os in
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -2090,7 +2089,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3103,16 +3332,16 @@
+@@ -3103,16 +3332,16 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -2111,7 +2110,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -3130,20 +3359,44 @@
+@@ -3130,20 +3359,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'
;;
@@ -2162,7 +2161,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3159,6 +3412,29 @@
+@@ -3159,6 +3412,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'
;;
@@ -2192,7 +2191,7 @@
esac
;;
lynxos*)
-@@ -3171,7 +3447,7 @@
+@@ -3171,7 +3447,7 @@ case $host_os in
;;
mvs*)
case $cc_basename in
@@ -2201,7 +2200,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3181,7 +3457,7 @@
+@@ -3181,7 +3457,7 @@ case $host_os in
;;
esac
;;
@@ -2210,7 +2209,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3192,15 +3468,35 @@
+@@ -3192,15 +3468,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::"'
;;
@@ -2248,7 +2247,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3210,14 +3506,14 @@
+@@ -3210,14 +3506,14 @@ case $host_os in
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2266,7 +2265,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3531,7 @@
+@@ -3235,7 +3531,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}\*'
@@ -2275,7 +2274,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3254,13 +3550,13 @@
+@@ -3254,13 +3550,13 @@ case $host_os in
;;
osf4* | osf5*)
case $cc_basename in
@@ -2291,7 +2290,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3269,17 +3565,17 @@
+@@ -3269,17 +3565,17 @@ case $host_os in
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2313,7 +2312,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3594,7 @@
+@@ -3298,7 +3594,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}\*'
@@ -2322,7 +2321,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3319,27 +3615,14 @@
+@@ -3319,27 +3615,14 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2352,7 +2351,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3352,36 +3635,28 @@
+@@ -3352,36 +3635,28 @@ case $host_os in
;;
solaris*)
case $cc_basename in
@@ -2398,7 +2397,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3389,9 +3664,9 @@
+@@ -3389,9 +3664,9 @@ case $host_os in
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2410,7 +2409,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3401,9 +3676,9 @@
+@@ -3401,9 +3676,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
@@ -2422,7 +2421,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3687,9 @@
+@@ -3412,9 +3687,9 @@ case $host_os in
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2434,7 +2433,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3423,16 +3698,73 @@
+@@ -3423,16 +3698,73 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -2510,7 +2509,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3469,8 +3801,6 @@
+@@ -3469,8 +3801,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)
@@ -2519,7 +2518,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3488,7 +3818,7 @@
+@@ -3488,7 +3818,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2528,7 +2527,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -3542,7 +3872,7 @@
+@@ -3542,7 +3872,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.
@@ -2537,7 +2536,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3582,7 +3912,7 @@
+@@ -3582,7 +3912,7 @@ if AC_TRY_EVAL(ac_compile); then
fi
;;
@@ -2546,7 +2545,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3618,13 +3948,70 @@
+@@ -3618,13 +3948,70 @@ fi
$rm -f confest.$objext
@@ -2618,7 +2617,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3660,20 +4047,31 @@
+@@ -3660,20 +4047,31 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2653,7 +2652,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3683,7 +4081,7 @@
+@@ -3683,7 +4081,7 @@ test "$can_build_shared" = "no" && enabl
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2662,7 +2661,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3691,8 +4089,10 @@
+@@ -3691,8 +4089,10 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2675,7 +2674,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3702,8 +4102,6 @@
+@@ -3702,8 +4102,6 @@ AC_MSG_CHECKING([whether to build static
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2684,7 +2683,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3713,8 +4111,6 @@
+@@ -3713,8 +4111,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)
@@ -2693,7 +2692,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3740,23 +4136,30 @@
+@@ -3740,23 +4136,30 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2726,7 +2725,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -3768,8 +4171,6 @@
+@@ -3768,8 +4171,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)
@@ -2735,7 +2734,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3779,7 +4180,7 @@
+@@ -3779,7 +4180,7 @@ CC="$lt_save_CC"
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2744,7 +2743,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3795,7 +4196,7 @@
+@@ -3795,7 +4196,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2753,7 +2752,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -3803,11 +4204,16 @@
+@@ -3803,11 +4204,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
@@ -2770,7 +2769,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3833,11 +4239,12 @@
+@@ -3833,11 +4239,12 @@ if test -f "$ltmain"; then
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2785,7 +2784,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -3878,6 +4285,7 @@
+@@ -3878,6 +4285,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) \
@@ -2793,7 +2792,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -3887,7 +4295,7 @@
+@@ -3887,7 +4295,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) | \
@@ -2802,7 +2801,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3924,7 +4332,7 @@
+@@ -3924,7 +4332,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2811,7 +2810,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -3953,11 +4361,11 @@
+@@ -3953,11 +4361,11 @@ ifelse([$1], [],
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2825,7 +2824,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3988,6 +4396,12 @@
+@@ -3988,6 +4396,12 @@ fast_install=$enable_fast_install
# The host system.
host_alias=$host_alias
host=$host
@@ -2838,7 +2837,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3999,6 +4413,9 @@
+@@ -3999,6 +4413,9 @@ AR_FLAGS=$lt_AR_FLAGS
# A C compiler.
LTCC=$lt_LTCC
@@ -2848,7 +2847,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -4018,7 +4435,7 @@
+@@ -4018,7 +4435,7 @@ LN_S=$lt_LN_S
NM=$lt_NM
# A symbol stripping program
@@ -2857,7 +2856,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4466,7 @@
+@@ -4049,7 +4466,7 @@ objext="$ac_objext"
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2866,7 +2865,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4064,7 +4481,7 @@
+@@ -4064,7 +4481,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)
@@ -2875,7 +2874,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4240,7 +4657,7 @@
+@@ -4240,7 +4657,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.
@@ -2884,7 +2883,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4293,7 +4710,10 @@
+@@ -4293,7 +4710,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.
@@ -2896,7 +2895,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4320,6 +4740,7 @@
+@@ -4320,6 +4740,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -2904,7 +2903,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4335,9 +4756,6 @@
+@@ -4335,9 +4756,6 @@ symcode='[[BCDEGRST]]'
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2914,7 +2913,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -4359,14 +4777,30 @@
+@@ -4359,14 +4777,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'"
;;
@@ -2947,7 +2946,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4384,14 +4818,17 @@
+@@ -4384,14 +4818,17 @@ esac
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2967,7 +2966,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4530,12 +4967,14 @@
+@@ -4530,12 +4967,14 @@ AC_MSG_CHECKING([for $compiler option to
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2984,7 +2983,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -4547,6 +4986,10 @@
+@@ -4547,6 +4986,10 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2995,7 +2994,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4555,7 +4998,7 @@
+@@ -4555,7 +4998,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.
@@ -3004,7 +3003,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -4580,18 +5023,28 @@
+@@ -4580,18 +5023,28 @@ AC_MSG_CHECKING([for $compiler option to
;;
chorus*)
case $cc_basename in
@@ -3036,7 +3035,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4599,22 +5052,22 @@
+@@ -4599,22 +5052,22 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3065,7 +3064,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4627,9 +5080,13 @@
+@@ -4627,9 +5080,13 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3080,7 +3079,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -4638,20 +5095,26 @@
+@@ -4638,20 +5095,26 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3112,7 +3111,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4659,6 +5122,14 @@
+@@ -4659,6 +5122,14 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -3127,7 +3126,7 @@
;;
esac
;;
-@@ -4668,25 +5139,25 @@
+@@ -4668,25 +5139,25 @@ AC_MSG_CHECKING([for $compiler option to
;;
mvs*)
case $cc_basename in
@@ -3158,7 +3157,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4700,24 +5171,15 @@
+@@ -4700,24 +5171,15 @@ AC_MSG_CHECKING([for $compiler option to
;;
psos*)
;;
@@ -3185,7 +3184,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4727,12 +5189,12 @@
+@@ -4727,12 +5189,12 @@ AC_MSG_CHECKING([for $compiler option to
;;
sunos4*)
case $cc_basename in
@@ -3200,7 +3199,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4742,7 +5204,7 @@
+@@ -4742,7 +5204,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
tandem*)
case $cc_basename in
@@ -3209,7 +3208,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4750,7 +5212,14 @@
+@@ -4750,7 +5212,14 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -3225,7 +3224,7 @@
;;
vxworks*)
;;
-@@ -4781,13 +5250,15 @@
+@@ -4781,13 +5250,15 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3243,7 +3242,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
-@@ -4797,6 +5268,11 @@
+@@ -4797,6 +5268,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -3255,7 +3254,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4813,7 +5289,7 @@
+@@ -4813,7 +5289,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.
@@ -3264,7 +3263,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4839,8 +5315,18 @@
+@@ -4839,8 +5315,18 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -3284,7 +3283,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -4850,7 +5336,7 @@
+@@ -4850,7 +5336,7 @@ AC_MSG_CHECKING([for $compiler option to
_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.
@@ -3293,7 +3292,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4873,18 +5359,41 @@
+@@ -4873,18 +5359,41 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3337,7 +3336,7 @@
esac
;;
-@@ -4894,15 +5403,19 @@
+@@ -4894,15 +5403,19 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3361,7 +3360,7 @@
;;
sunos4*)
-@@ -4911,7 +5424,7 @@
+@@ -4911,7 +5424,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3370,7 +3369,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4924,6 +5437,17 @@
+@@ -4924,6 +5437,17 @@ AC_MSG_CHECKING([for $compiler option to
fi
;;
@@ -3388,7 +3387,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4951,7 +5475,7 @@
+@@ -4951,7 +5475,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
@@ -3397,7 +3396,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4960,6 +5484,16 @@
+@@ -4960,6 +5484,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
@@ -3414,7 +3413,7 @@
])
-@@ -4967,7 +5501,8 @@
+@@ -4967,7 +5501,8 @@ esac
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -3424,7 +3423,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -4984,7 +5519,10 @@
+@@ -4984,7 +5519,10 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3436,7 +3435,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -5010,7 +5548,7 @@
+@@ -5010,7 +5548,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)=
@@ -3445,7 +3444,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -5027,7 +5565,8 @@
+@@ -5027,7 +5565,8 @@ ifelse([$1],[CXX],[
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3455,7 +3454,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5037,6 +5576,10 @@
+@@ -5037,6 +5576,10 @@ ifelse([$1],[CXX],[
with_gnu_ld=no
fi
;;
@@ -3466,7 +3465,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5047,6 +5590,27 @@
+@@ -5047,6 +5590,27 @@ ifelse([$1],[CXX],[
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3494,7 +3493,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -5084,7 +5648,7 @@
+@@ -5084,7 +5648,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
@@ -3503,7 +3502,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5094,13 +5658,13 @@
+@@ -5094,13 +5658,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'
@@ -3520,7 +3519,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5109,23 +5673,79 @@
+@@ -5109,23 +5673,79 @@ EOF
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3606,7 +3605,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -5139,13 +5759,40 @@
+@@ -5139,13 +5759,40 @@ EOF
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3649,7 +3648,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5155,24 +5802,19 @@
+@@ -5155,24 +5802,19 @@ EOF
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3681,7 +3680,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5184,7 +5826,7 @@
+@@ -5184,7 +5826,7 @@ 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
@@ -3690,7 +3689,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5206,9 +5848,21 @@
+@@ -5206,9 +5848,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
@@ -3714,7 +3713,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5225,7 +5879,7 @@
+@@ -5225,7 +5879,7 @@ EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3723,7 +3722,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -5233,7 +5887,7 @@
+@@ -5233,7 +5887,7 @@ EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3732,7 +3731,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5244,8 +5898,12 @@
+@@ -5244,8 +5898,12 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3745,7 +3744,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5253,30 +5911,30 @@
+@@ -5253,30 +5911,30 @@ EOF
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3787,7 +3786,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5285,13 +5943,11 @@
+@@ -5285,13 +5943,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'
@@ -3804,7 +3803,7 @@
fi
fi
;;
-@@ -5304,7 +5960,7 @@
+@@ -5304,7 +5960,7 @@ EOF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3813,7 +3812,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5314,69 +5970,69 @@
+@@ -5314,69 +5970,69 @@ EOF
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3930,7 +3929,7 @@
;;
dgux*)
-@@ -5409,8 +6065,8 @@
+@@ -5409,8 +6065,8 @@ EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3941,7 +3940,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5418,7 +6074,7 @@
+@@ -5418,7 +6074,7 @@ EOF
hpux9*)
if test "$GCC" = yes; then
@@ -3950,7 +3949,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -5432,47 +6088,62 @@
+@@ -5432,47 +6088,62 @@ EOF
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -4037,7 +4036,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5486,7 +6157,7 @@
+@@ -5486,7 +6157,7 @@ EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4046,7 +4045,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -5496,7 +6167,7 @@
+@@ -5496,7 +6167,7 @@ EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -4055,7 +4054,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5516,23 +6187,28 @@
+@@ -5516,23 +6187,28 @@ EOF
;;
openbsd*)
@@ -4100,7 +4099,7 @@
fi
;;
-@@ -5540,14 +6216,14 @@
+@@ -5540,14 +6216,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
@@ -4117,7 +4116,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -5559,13 +6235,13 @@
+@@ -5559,13 +6235,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}\*'
@@ -4133,7 +4132,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5573,21 +6249,15 @@
+@@ -5573,21 +6249,15 @@ EOF
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -4159,7 +4158,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5596,8 +6266,17 @@
+@@ -5596,8 +6266,17 @@ EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -4179,7 +4178,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5606,7 +6285,7 @@
+@@ -5606,7 +6285,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.
@@ -4188,7 +4187,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5654,36 +6333,45 @@
+@@ -5654,36 +6333,45 @@ EOF
fi
;;
@@ -4255,7 +4254,7 @@
;;
uts4*)
-@@ -5701,11 +6389,6 @@
+@@ -5701,11 +6389,6 @@ EOF
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -4267,7 +4266,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5725,14 +6408,15 @@
+@@ -5725,14 +6408,15 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -4285,7 +4284,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5827,6 +6511,30 @@
+@@ -5827,6 +6511,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -4316,7 +4315,7 @@
############################################################
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
-@@ -5849,18 +6557,19 @@
+@@ -5849,18 +6557,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
@@ -4338,16 +4337,15 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -5887,5 +6596,6 @@
+@@ -5887,5 +6596,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])
])
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2007-04-30 13:30:44.000000000 +0200
-+++ b/admin/ltmain.sh 2007-10-13 16:25:01.000000000 +0200
+--- 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.
@@ -4402,7 +4400,7 @@
# 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 @@
+@@ -36,7 +72,7 @@ elif test "X`($echo '\t') 2>/dev/null`"
:
else
# Restart under the correct shell, and then maybe $echo will work.
@@ -4411,7 +4409,7 @@
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +81,9 @@
+@@ -45,19 +81,9 @@ if test "X$1" = X--fallback-echo; then
cat <<EOF
$*
EOF
@@ -4432,7 +4430,7 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -70,14 +96,15 @@
+@@ -70,14 +96,15 @@ rm="rm -f"
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
@@ -4455,7 +4453,7 @@
;;
esac
-@@ -86,20 +113,24 @@
+@@ -86,20 +113,24 @@ 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.
@@ -4488,7 +4486,7 @@
fi
# Global variables.
-@@ -111,17 +142,62 @@
+@@ -111,17 +142,62 @@ run=
show="$echo"
show_help=
execute_dlfiles=
@@ -4552,7 +4550,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +206,22 @@
+@@ -130,17 +206,22 @@ win32_libid () {
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -4583,7 +4581,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +235,191 @@
+@@ -154,9 +235,191 @@ win32_libid () {
$echo $win32_libid_type
}
@@ -4775,7 +4773,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +439,13 @@
+@@ -176,12 +439,13 @@ do
;;
tag)
tagname="$arg"
@@ -4790,7 +4788,7 @@
;;
esac
-@@ -191,10 +455,10 @@
+@@ -191,10 +455,10 @@ do
# not specially marked.
;;
*)
@@ -4803,7 +4801,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -218,26 +482,28 @@
+@@ -218,26 +482,28 @@ do
;;
--version)
@@ -4841,7 +4839,7 @@
;;
--dry-run | -n)
-@@ -256,7 +522,7 @@
+@@ -256,7 +522,7 @@ do
else
$echo "disable static libraries"
fi
@@ -4850,7 +4848,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +534,19 @@
+@@ -268,13 +534,19 @@ do
--quiet | --silent)
show=:
@@ -4871,7 +4869,7 @@
;;
-dlopen)
-@@ -285,7 +557,7 @@
+@@ -285,7 +557,7 @@ do
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4880,7 +4878,7 @@
;;
*)
-@@ -298,9 +570,21 @@
+@@ -298,9 +570,21 @@ done
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4903,7 +4901,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +595,7 @@
+@@ -311,7 +595,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
@@ -4912,7 +4910,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +638,7 @@
+@@ -354,7 +638,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
@@ -4921,7 +4919,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +653,15 @@
+@@ -369,13 +653,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"
@@ -4938,7 +4936,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +680,19 @@
+@@ -394,24 +680,19 @@ if test -z "$show_help"; then
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4968,7 +4966,7 @@
continue
;;
-@@ -424,7 +705,7 @@
+@@ -424,7 +705,7 @@ if test -z "$show_help"; then
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4977,7 +4975,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +743,10 @@
+@@ -462,7 +743,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
@@ -4989,7 +4987,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +758,11 @@
+@@ -474,11 +758,11 @@ if test -z "$show_help"; then
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -5003,7 +5001,7 @@
;;
*)
# Get the name of the library object.
-@@ -500,9 +784,10 @@
+@@ -500,9 +784,10 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -5015,7 +5013,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -511,51 +796,39 @@
+@@ -511,51 +796,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
@@ -5094,7 +5092,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +841,7 @@
+@@ -568,7 +841,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
@@ -5103,7 +5101,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +852,7 @@
+@@ -579,7 +852,7 @@ if test -z "$show_help"; then
fi
$run $rm $removelist
@@ -5112,7 +5110,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +871,7 @@
+@@ -598,7 +871,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"
@@ -5121,7 +5119,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +881,7 @@
+@@ -608,7 +881,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
@@ -5130,7 +5128,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +899,19 @@
+@@ -626,14 +899,19 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5152,7 +5150,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +933,18 @@
+@@ -655,18 +933,18 @@ EOF
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -5176,7 +5174,7 @@
fi
fi
-@@ -681,7 +959,7 @@
+@@ -681,7 +959,7 @@ EOF
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -5185,7 +5183,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +979,7 @@
+@@ -701,7 +979,7 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5194,7 +5192,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +1000,9 @@
+@@ -722,7 +1000,9 @@ pic_object='$objdir/$objname'
EOF
# Allow error messages only from the first compilation.
@@ -5205,7 +5203,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +1016,9 @@
+@@ -736,9 +1016,9 @@ EOF
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -5217,7 +5215,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1031,7 @@
+@@ -751,7 +1031,7 @@ EOF
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -5226,7 +5224,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1051,7 @@
+@@ -771,7 +1051,7 @@ avoid parallel builds (make -j) in this
compiler."
$run $rm $removelist
@@ -5235,7 +5233,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1089,7 @@
+@@ -809,7 +1089,7 @@ EOF
$run $rm "$lockfile"
fi
@@ -5244,7 +5242,7 @@
;;
# libtool link mode
-@@ -835,7 +1115,7 @@
+@@ -835,7 +1115,7 @@ EOF
;;
esac
libtool_args="$nonopt"
@@ -5253,7 +5251,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1127,6 @@
+@@ -847,7 +1127,6 @@ EOF
old_convenience=
deplibs=
old_deplibs=
@@ -5261,7 +5259,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1147,8 @@
+@@ -868,6 +1147,8 @@ EOF
no_install=no
objs=
non_pic_objects=
@@ -5270,7 +5268,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,26 +1162,38 @@
+@@ -881,26 +1162,38 @@ EOF
vinfo=
vinfo_number=no
@@ -5314,7 +5312,7 @@
break
;;
esac
-@@ -912,7 +1205,6 @@
+@@ -912,7 +1205,6 @@ EOF
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -5322,7 +5320,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1268,7 @@
+@@ -976,7 +1268,7 @@ EOF
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -5331,7 +5329,7 @@
fi
prev=
continue
-@@ -991,6 +1283,11 @@
+@@ -991,6 +1283,11 @@ EOF
prev=
continue
;;
@@ -5343,7 +5341,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1320,7 @@
+@@ -1023,7 +1320,7 @@ EOF
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5352,7 +5350,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1368,17 @@
+@@ -1071,12 +1368,17 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5371,7 +5369,7 @@
else
# Dry-run case.
-@@ -1097,7 +1399,7 @@
+@@ -1097,7 +1399,7 @@ EOF
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -5380,7 +5378,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1411,7 @@
+@@ -1109,7 +1411,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5389,7 +5387,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1451,15 @@
+@@ -1149,16 +1451,15 @@ EOF
finalize_command="$finalize_command $qarg"
continue
;;
@@ -5415,7 +5413,7 @@
prev=
continue
;;
-@@ -1210,7 +1511,7 @@
+@@ -1210,7 +1511,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"
@@ -5424,7 +5422,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1521,18 @@
+@@ -1220,6 +1521,18 @@ EOF
continue
;;
@@ -5443,7 +5441,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1559,8 @@
+@@ -1246,7 +1559,8 @@ EOF
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -5453,7 +5451,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1574,15 @@
+@@ -1260,10 +1574,15 @@ EOF
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -5469,7 +5467,7 @@
;;
esac
continue
-@@ -1272,26 +1591,35 @@
+@@ -1272,26 +1591,35 @@ EOF
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -5510,7 +5508,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1301,18 +1629,42 @@
+@@ -1301,18 +1629,42 @@ EOF
continue
;;
@@ -5560,7 +5558,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1675,7 @@
+@@ -1323,9 +1675,7 @@ EOF
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -5571,7 +5569,7 @@
continue
;;
-@@ -1341,9 +1691,9 @@
+@@ -1341,9 +1691,9 @@ EOF
-no-install)
case $host in
@@ -5583,7 +5581,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1365,6 +1715,11 @@
+@@ -1365,6 +1715,11 @@ EOF
-o) prev=output ;;
@@ -5595,7 +5593,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1742,7 @@
+@@ -1387,7 +1742,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5604,7 +5602,7 @@
;;
esac
case "$xrpath " in
-@@ -1397,7 +1752,7 @@
+@@ -1397,7 +1752,7 @@ EOF
continue
;;
@@ -5613,7 +5611,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -1473,11 +1828,6 @@
+@@ -1473,11 +1828,6 @@ EOF
continue
;;
@@ -5625,7 +5623,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1838,6 @@
+@@ -1488,7 +1838,6 @@ EOF
arg="\"$arg\""
;;
esac
@@ -5633,7 +5631,7 @@
;;
*.$objext)
-@@ -1516,7 +1865,7 @@
+@@ -1516,7 +1865,7 @@ EOF
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5642,7 +5640,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1564,12 +1913,17 @@
+@@ -1564,12 +1913,17 @@ EOF
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5661,7 +5659,7 @@
else
# Dry-run case.
-@@ -1623,7 +1977,6 @@
+@@ -1623,7 +1977,6 @@ EOF
arg="\"$arg\""
;;
esac
@@ -5669,7 +5667,7 @@
;;
esac # arg
-@@ -1637,48 +1990,7 @@
+@@ -1637,48 +1990,7 @@ EOF
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5719,7 +5717,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +2023,9 @@
+@@ -1711,9 +2023,9 @@ EOF
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5732,7 +5730,7 @@
fi
fi
-@@ -1722,7 +2034,7 @@
+@@ -1722,7 +2034,7 @@ EOF
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5741,7 +5739,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2044,7 @@
+@@ -1732,7 +2044,7 @@ EOF
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5750,7 +5748,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1776,7 +2088,6 @@
+@@ -1776,7 +2088,6 @@ EOF
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5758,7 +5756,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1785,7 +2096,7 @@
+@@ -1785,7 +2096,7 @@ EOF
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5767,7 +5765,7 @@
;;
esac
done
-@@ -1811,7 +2122,10 @@
+@@ -1811,7 +2122,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5779,7 +5777,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2137,23 @@
+@@ -1823,18 +2137,23 @@ EOF
lib=
found=no
case $deplib in
@@ -5808,7 +5806,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2214,6 @@
+@@ -1895,18 +2214,6 @@ EOF
fi
fi
;; # -l
@@ -5827,7 +5825,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2229,11 @@
+@@ -1922,11 +2229,11 @@ EOF
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5840,7 +5838,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2261,22 @@
+@@ -1954,7 +2261,22 @@ EOF
fi
case $linkmode in
lib)
@@ -5864,7 +5862,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2326,15 @@
+@@ -2004,15 +2326,15 @@ EOF
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5883,7 +5881,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2350,8 @@
+@@ -2028,6 +2350,8 @@ EOF
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5892,7 +5890,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2359,6 @@
+@@ -2035,13 +2359,6 @@ EOF
*) . ./$lib ;;
esac
@@ -5906,7 +5904,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2369,32 @@
+@@ -2052,33 +2369,32 @@ EOF
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5953,7 +5951,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2402,18 @@
+@@ -2086,16 +2402,18 @@ EOF
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5975,7 +5973,7 @@
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
-@@ -2132,11 +2450,19 @@
+@@ -2132,11 +2450,19 @@ EOF
dir="$libdir"
absdir="$libdir"
fi
@@ -5999,7 +5997,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2470,7 @@
+@@ -2144,7 +2470,7 @@ EOF
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -6008,7 +6006,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2497,7 @@
+@@ -2171,7 +2497,7 @@ EOF
continue
fi
@@ -6017,7 +6015,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2207,14 +2533,16 @@
+@@ -2207,14 +2533,16 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -6037,7 +6035,7 @@
esac
fi
-@@ -2251,24 +2579,29 @@
+@@ -2251,24 +2579,29 @@ EOF
fi
link_static=no # Whether the deplib will be linked statically
@@ -6073,7 +6071,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2659,10 @@
+@@ -2326,9 +2659,10 @@ EOF
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6085,7 +6083,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2673,10 @@
+@@ -2339,9 +2673,10 @@ EOF
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6097,7 +6095,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2362,11 +2697,15 @@
+@@ -2362,11 +2697,15 @@ EOF
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -6117,7 +6115,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2713,7 @@
+@@ -2374,7 +2713,7 @@ EOF
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -6126,7 +6124,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2736,9 @@
+@@ -2397,9 +2736,9 @@ EOF
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6138,7 +6136,7 @@
;;
esac
fi
-@@ -2416,7 +2755,7 @@
+@@ -2416,7 +2755,7 @@ EOF
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -6147,7 +6145,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2798,8 @@
+@@ -2459,7 +2798,8 @@ EOF
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6157,7 +6155,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2809,9 @@
+@@ -2469,9 +2809,9 @@ EOF
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6169,7 +6167,7 @@
;;
esac
fi
-@@ -2530,17 +2870,16 @@
+@@ -2530,17 +2870,16 @@ EOF
fi
fi
else
@@ -6191,7 +6189,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2893,7 @@
+@@ -2554,7 +2893,7 @@ EOF
esac
done
dependency_libs="$temp_deplibs"
@@ -6200,7 +6198,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2935,18 @@
+@@ -2596,20 +2935,18 @@ 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
@@ -6225,7 +6223,7 @@
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2617,55 +2954,45 @@
+@@ -2617,55 +2954,45 @@ EOF
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -6301,7 +6299,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +3079,8 @@
+@@ -2752,7 +3079,8 @@ EOF
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -6311,7 +6309,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3140,19 @@
+@@ -2812,19 +3140,19 @@ EOF
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -6334,7 +6332,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3163,7 @@
+@@ -2835,7 +3163,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
@@ -6343,7 +6341,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3211,13 @@
+@@ -2883,13 +3211,13 @@ EOF
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -6359,7 +6357,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2903,7 +3231,7 @@
+@@ -2903,7 +3231,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
@@ -6368,7 +6366,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -2914,9 +3242,15 @@
+@@ -2914,9 +3242,15 @@ EOF
age="0"
;;
irix|nonstopux)
@@ -6385,7 +6383,7 @@
;;
esac
;;
-@@ -2929,36 +3263,36 @@
+@@ -2929,36 +3263,36 @@ EOF
# Check that each of the things are valid numbers.
case $current in
@@ -6432,7 +6430,7 @@
fi
# Calculate the version variables.
-@@ -2975,6 +3309,7 @@
+@@ -2975,6 +3309,7 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -6440,7 +6438,7 @@
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
-@@ -2989,8 +3324,11 @@
+@@ -2989,8 +3324,11 @@ EOF
;;
irix | nonstopux)
@@ -6454,7 +6452,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3047,7 +3385,7 @@
+@@ -3047,7 +3385,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
@@ -6463,7 +6461,7 @@
;;
esac
-@@ -3098,9 +3436,15 @@
+@@ -3098,9 +3436,15 @@ EOF
tempremovelist=`$echo "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
@@ -6480,7 +6478,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3121,11 +3465,11 @@
+@@ -3121,11 +3465,11 @@ EOF
fi
# Eliminate all temporary directories.
@@ -6497,7 +6495,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3137,7 +3481,7 @@
+@@ -3137,7 +3481,7 @@ EOF
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -6506,7 +6504,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,14 +3514,19 @@
+@@ -3170,14 +3514,19 @@ EOF
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -6529,7 +6527,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3221,13 +3570,12 @@
+@@ -3221,13 +3570,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
@@ -6546,7 +6544,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3262,13 +3610,11 @@
+@@ -3262,13 +3610,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
@@ -6562,7 +6560,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3300,7 +3646,7 @@
+@@ -3300,7 +3646,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -6571,7 +6569,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3314,7 +3660,7 @@
+@@ -3314,7 +3660,7 @@ EOF
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6580,7 +6578,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3383,7 +3729,7 @@
+@@ -3383,7 +3729,7 @@ EOF
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6589,7 +6587,7 @@
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3463,7 +3809,7 @@
+@@ -3463,7 +3809,7 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6598,7 +6596,7 @@
;;
esac
-@@ -3509,17 +3855,39 @@
+@@ -3509,17 +3855,39 @@ EOF
fi
fi
fi
@@ -6645,7 +6643,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3532,7 +3900,7 @@
+@@ -3532,7 +3900,7 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -6654,7 +6652,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3564,7 +3932,10 @@
+@@ -3564,7 +3932,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -6666,7 +6664,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -3587,7 +3958,7 @@
+@@ -3587,7 +3958,7 @@ EOF
fi
# Get the real and link names of the library.
@@ -6675,7 +6673,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3603,6 +3974,7 @@
+@@ -3603,6 +3974,7 @@ EOF
fi
lib="$output_objdir/$realname"
@@ -6683,7 +6681,7 @@
for link
do
linknames="$linknames $link"
-@@ -3617,10 +3989,11 @@
+@@ -3617,10 +3989,11 @@ EOF
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -6696,7 +6694,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +4003,9 @@
+@@ -3630,6 +4003,9 @@ EOF
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -6706,7 +6704,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +4026,12 @@
+@@ -3650,12 +4026,12 @@ EOF
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6721,7 +6719,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +4039,13 @@
+@@ -3663,67 +4039,13 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6792,7 +6790,7 @@
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linker_flags="$linker_flags $flag"
-@@ -3734,31 +4056,27 @@
+@@ -3734,31 +4056,27 @@ EOF
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6834,7 +6832,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +4095,7 @@
+@@ -3777,6 +4095,7 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
@@ -6842,7 +6840,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +4105,13 @@
+@@ -3786,13 +4105,13 @@ EOF
delfiles=
last_robj=
k=1
@@ -6858,7 +6856,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +4125,9 @@
+@@ -3806,9 +4125,9 @@ EOF
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6870,7 +6868,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +4147,13 @@
+@@ -3828,13 +4147,13 @@ EOF
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6886,7 +6884,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4178,54 @@
+@@ -3859,28 +4178,54 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6946,7 +6944,7 @@
fi
# Create links to the real library.
-@@ -3928,7 +4273,7 @@
+@@ -3928,7 +4273,7 @@ EOF
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6955,7 +6953,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3949,72 +4294,20 @@
+@@ -3949,72 +4294,20 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -7034,7 +7032,7 @@
fi
fi
-@@ -4022,10 +4315,11 @@
+@@ -4022,10 +4315,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"
@@ -7047,7 +7045,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4332,7 @@
+@@ -4038,7 +4332,7 @@ EOF
$run ${rm}r $gentop
fi
@@ -7056,7 +7054,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4345,18 @@
+@@ -4051,17 +4345,18 @@ EOF
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -7077,7 +7075,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4368,7 @@
+@@ -4073,7 +4368,7 @@ EOF
$run ${rm}r $gentop
fi
@@ -7086,7 +7084,7 @@
;;
prog)
-@@ -4098,24 +4393,50 @@
+@@ -4098,24 +4393,50 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -7143,7 +7141,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4160,10 +4481,15 @@
+@@ -4160,10 +4481,15 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -7159,7 +7157,7 @@
;;
esac
done
-@@ -4277,13 +4603,25 @@
+@@ -4277,13 +4603,25 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -7189,7 +7187,7 @@
fi
fi
-@@ -4334,7 +4672,26 @@
+@@ -4334,7 +4672,26 @@ extern \"C\" {
#endif
/* The mapping between symbol names and symbols. */
@@ -7216,7 +7214,7 @@
const char *name;
lt_ptr address;
}
-@@ -4381,20 +4738,33 @@
+@@ -4381,20 +4738,33 @@ static const void *lt_preloaded_setup()
esac
# Now compile the dynamic symbol file.
@@ -7255,7 +7253,7 @@
;;
esac
else
-@@ -4403,30 +4773,19 @@
+@@ -4403,30 +4773,19 @@ static const void *lt_preloaded_setup()
# really was required.
# Nullify the symbol file.
@@ -7290,7 +7288,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4434,7 +4793,7 @@
+@@ -4434,7 +4793,7 @@ static const void *lt_preloaded_setup()
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -7299,7 +7297,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4493,7 +4852,7 @@
+@@ -4493,7 +4852,7 @@ static const void *lt_preloaded_setup()
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -7308,7 +7306,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4507,7 +4866,7 @@
+@@ -4507,7 +4866,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
@@ -7317,7 +7315,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4544,14 +4903,14 @@
+@@ -4544,14 +4903,14 @@ static const void *lt_preloaded_setup()
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -7337,7 +7335,7 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4932,13 @@
+@@ -4573,11 +4932,13 @@ static const void *lt_preloaded_setup()
*) exeext= ;;
esac
case $host in
@@ -7356,7 +7354,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4947,7 @@
+@@ -4586,7 +4947,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.
@@ -7365,7 +7363,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4602,6 +4963,9 @@
+@@ -4602,6 +4963,9 @@ EOF
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -7375,7 +7373,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4976,19 @@
+@@ -4612,15 +4976,19 @@ EOF
#endif
#ifndef DIR_SEPARATOR
@@ -7400,7 +7398,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4998,32 @@
+@@ -4630,17 +4998,32 @@ EOF
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -7435,7 +7433,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4649,30 +5032,52 @@
+@@ -4649,30 +5032,52 @@ main (int argc, char *argv[])
{
char **newargz;
int i;
@@ -7497,7 +7495,7 @@
}
void *
-@@ -4685,59 +5090,159 @@
+@@ -4685,59 +5090,159 @@ xmalloc (size_t num)
return p;
}
@@ -7679,7 +7677,7 @@
{
size_t len, patlen;
-@@ -4757,7 +5262,7 @@
+@@ -4757,7 +5262,7 @@ strendzap(char *str, const char *pat)
}
static void
@@ -7688,7 +7686,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5282,16 @@
+@@ -4777,16 +5282,16 @@ lt_fatal (const char *message, ...)
va_end (ap);
}
EOF
@@ -7715,7 +7713,7 @@
$echo > $output "\
#! $SHELL
-@@ -4805,9 +5310,23 @@
+@@ -4805,9 +5310,23 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -7740,7 +7738,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5405,7 @@
+@@ -4886,7 +5405,7 @@ else
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -7749,7 +7747,7 @@
fi
fi
-@@ -4936,34 +5455,32 @@
+@@ -4936,34 +5455,32 @@ else
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -7791,7 +7789,7 @@
;;
esac
-@@ -4986,78 +5503,78 @@
+@@ -4986,78 +5503,78 @@ fi\
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7931,7 +7929,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5583,18 @@
+@@ -5066,31 +5583,18 @@ fi\
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7966,7 +7964,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5602,7 @@
+@@ -5098,7 +5602,7 @@ fi\
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7975,7 +7973,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5613,13 @@
+@@ -5109,12 +5613,13 @@ fi\
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7990,7 +7988,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5651,13 @@
+@@ -5146,11 +5651,13 @@ fi\
fi
done
# Quote the link command for shipping.
@@ -8008,7 +8006,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5675,7 @@
+@@ -5168,7 +5675,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
@@ -8017,7 +8015,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5689,7 @@
+@@ -5182,7 +5689,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
@@ -8026,7 +8024,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5700,30 @@
+@@ -5193,11 +5700,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
@@ -8058,7 +8056,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5767,7 @@
+@@ -5241,7 +5767,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -8067,7 +8065,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5780,7 @@
+@@ -5254,7 +5780,7 @@ relink_command=\"$relink_command\""
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -8076,7 +8074,7 @@
;;
# libtool install mode
-@@ -5265,11 +5791,11 @@
+@@ -5265,11 +5791,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.
@@ -8090,7 +8088,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5804,14 @@
+@@ -5278,14 +5804,14 @@ relink_command=\"$relink_command\""
shift
else
install_prog=
@@ -8107,7 +8105,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5829,31 @@
+@@ -5303,28 +5829,31 @@ relink_command=\"$relink_command\""
do
if test -n "$dest"; then
files="$files $dest"
@@ -8147,7 +8145,7 @@
continue
fi
;;
-@@ -5333,7 +5862,7 @@
+@@ -5333,7 +5862,7 @@ relink_command=\"$relink_command\""
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -8156,7 +8154,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5872,13 @@
+@@ -5343,13 +5872,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
@@ -8172,7 +8170,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5888,7 @@
+@@ -5359,7 +5888,7 @@ relink_command=\"$relink_command\""
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -8181,7 +8179,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5909,7 @@
+@@ -5380,7 +5909,7 @@ relink_command=\"$relink_command\""
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -8190,7 +8188,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5921,7 @@
+@@ -5392,7 +5921,7 @@ relink_command=\"$relink_command\""
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -8199,7 +8197,7 @@
;;
esac
done
-@@ -5421,7 +5950,7 @@
+@@ -5421,7 +5950,7 @@ relink_command=\"$relink_command\""
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8208,7 +8206,7 @@
fi
library_names=
-@@ -5463,14 +5992,14 @@
+@@ -5463,14 +5992,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
@@ -8226,7 +8224,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -5478,7 +6007,7 @@
+@@ -5478,7 +6007,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
@@ -8235,7 +8233,7 @@
fi
fi
-@@ -5502,23 +6031,36 @@
+@@ -5502,23 +6031,36 @@ relink_command=\"$relink_command\""
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -8276,7 +8274,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +6098,7 @@
+@@ -5556,7 +6098,7 @@ relink_command=\"$relink_command\""
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -8285,7 +8283,7 @@
;;
esac
-@@ -5574,7 +6116,7 @@
+@@ -5574,7 +6116,7 @@ relink_command=\"$relink_command\""
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -8294,7 +8292,7 @@
;;
*)
-@@ -5612,23 +6154,21 @@
+@@ -5612,23 +6154,21 @@ relink_command=\"$relink_command\""
notinst_deplibs=
relink_command=
@@ -8327,7 +8325,7 @@
fi
finalize=yes
-@@ -5650,34 +6190,25 @@
+@@ -5650,34 +6190,25 @@ relink_command=\"$relink_command\""
done
relink_command=
@@ -8372,7 +8370,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -5697,7 +6228,7 @@
+@@ -5697,7 +6228,7 @@ relink_command=\"$relink_command\""
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -8381,7 +8379,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +6260,17 @@
+@@ -5729,16 +6260,17 @@ relink_command=\"$relink_command\""
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -8401,7 +8399,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +6284,9 @@
+@@ -5752,9 +6284,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"
@@ -8413,7 +8411,7 @@
fi
;;
-@@ -5773,10 +6305,11 @@
+@@ -5773,10 +6305,11 @@ relink_command=\"$relink_command\""
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -8426,7 +8424,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,9 +6326,9 @@
+@@ -5793,9 +6326,9 @@ relink_command=\"$relink_command\""
fi
# Exit here if they wanted silent mode.
@@ -8438,7 +8436,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5828,8 +6361,8 @@
+@@ -5828,8 +6361,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."
@@ -8449,7 +8447,7 @@
;;
# libtool execute mode
-@@ -5841,7 +6374,7 @@
+@@ -5841,7 +6374,7 @@ relink_command=\"$relink_command\""
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -8458,7 +8456,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +6382,7 @@
+@@ -5849,7 +6382,7 @@ relink_command=\"$relink_command\""
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -8467,7 +8465,7 @@
fi
dir=
-@@ -5860,7 +6393,7 @@
+@@ -5860,7 +6393,7 @@ relink_command=\"$relink_command\""
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8476,7 +8474,7 @@
fi
# Read the libtool library.
-@@ -5886,8 +6419,10 @@
+@@ -5886,8 +6419,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -8489,7 +8487,7 @@
fi
;;
-@@ -5951,12 +6486,12 @@
+@@ -5951,12 +6486,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
@@ -8508,7 +8506,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -5967,7 +6502,7 @@
+@@ -5967,7 +6502,7 @@ relink_command=\"$relink_command\""
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -8517,7 +8515,7 @@
fi
;;
-@@ -5995,7 +6530,7 @@
+@@ -5995,7 +6530,7 @@ relink_command=\"$relink_command\""
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -8526,7 +8524,7 @@
fi
rmdirs=
-@@ -6045,15 +6580,24 @@
+@@ -6045,15 +6580,24 @@ relink_command=\"$relink_command\""
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -8554,7 +8552,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6609,11 @@
+@@ -6065,10 +6609,11 @@ relink_command=\"$relink_command\""
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -8567,7 +8565,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6623,8 @@
+@@ -6078,7 +6623,8 @@ relink_command=\"$relink_command\""
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -8577,7 +8575,7 @@
fi
;;
-@@ -6107,7 +6653,7 @@
+@@ -6107,7 +6653,7 @@ relink_command=\"$relink_command\""
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -8586,7 +8584,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6698,20 @@
+@@ -6152,20 +6698,20 @@ relink_command=\"$relink_command\""
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -8610,7 +8608,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6747,7 @@
+@@ -6201,7 +6747,7 @@ MODE-ARGS vary depending on the MODE. T
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -8619,7 +8617,7 @@
;;
clean)
-@@ -6302,9 +6848,9 @@
+@@ -6302,9 +6848,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
@@ -8631,7 +8629,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6313,12 +6859,16 @@
+@@ -6313,12 +6859,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
@@ -8650,7 +8648,7 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -6354,14 +6904,14 @@
+@@ -6354,14 +6904,14 @@ Otherwise, only FILE itself is deleted u
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -8667,7 +8665,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6375,12 +6925,11 @@
+@@ -6375,12 +6925,11 @@ exit 0
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Modified: kde-extras/soundkonverter/trunk/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/04_am_maintainer_mode.diff 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/04_am_maintainer_mode.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,6 +1,6 @@
--- a/admin/configure.in.min
+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
+@@ -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
Modified: kde-extras/soundkonverter/trunk/debian/patches/05_pedantic-errors.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/05_pedantic-errors.diff 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/05_pedantic-errors.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
+@@ -2144,9 +2144,6 @@ AC_LANG_CPLUSPLUS
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
Modified: kde-extras/soundkonverter/trunk/debian/patches/06_disable_no_undefined.diff
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/06_disable_no_undefined.diff 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/06_disable_no_undefined.diff 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
+@@ -1689,15 +1689,6 @@ AC_DEFUN([KDE_CHECK_CLOSURE],
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
Modified: kde-extras/soundkonverter/trunk/debian/patches/series
===================================================================
--- kde-extras/soundkonverter/trunk/debian/patches/series 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/patches/series 2009-05-12 14:33:51 UTC (rev 14608)
@@ -1,3 +1,4 @@
+01_gcc4.4_support_bug505724.diff
02_autotools_update.diff
03_libtool_update.diff
04_am_maintainer_mode.diff
@@ -3,3 +4,2 @@
05_pedantic-errors.diff
06_disable_no_undefined.diff
-07_amarok_script.diff
Modified: kde-extras/soundkonverter/trunk/debian/rules
===================================================================
--- kde-extras/soundkonverter/trunk/debian/rules 2009-05-12 13:59:03 UTC (rev 14607)
+++ kde-extras/soundkonverter/trunk/debian/rules 2009-05-12 14:33:51 UTC (rev 14608)
@@ -11,6 +11,3 @@
install -D -p -m0644 debian/soundkonverter.lintian-overrides \
debian/soundkonverter/usr/share/lintian/overrides/soundkonverter
-install/soundkonverter-amarok::
- chmod 0755 debian/tmp/usr/share/apps/soundkonverter/amarokscript/soundKonverter.rb
-
More information about the pkg-kde-commits
mailing list