rev 3785 - kde-extras/libkipi/trunk/debian/patches
Achim Bohnet
ach-guest at costa.debian.org
Tue May 16 19:42:34 UTC 2006
Author: ach-guest
Date: 2006-05-16 19:42:33 +0000 (Tue, 16 May 2006)
New Revision: 3785
Modified:
kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff
Log:
libkipi: heh, this time I managed to seperately commit buildprep diff ;)
Modified: kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff
===================================================================
--- kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff 2006-05-16 19:41:54 UTC (rev 3784)
+++ kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff 2006-05-16 19:42:33 UTC (rev 3785)
@@ -105,34 +105,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -905,7 +920,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in libkipi.lsm configure.files RELEASE.rev config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in libkipi.lsm configure.files RELEASE.rev config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
--- acinclude.m4
+++ acinclude.m4
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2144,9 +2135,6 @@
+@@ -2144,9 +2144,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -142,7 +117,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5973,30 +5961,15 @@
+@@ -5973,30 +5970,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -178,7 +153,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6056,7 +6038,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -187,7 +162,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6106,7 +6088,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -196,7 +171,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6126,7 +6108,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -205,7 +180,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6146,6 +6128,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -213,7 +188,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6165,15 +6148,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -233,7 +208,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6214,11 +6199,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -290,7 +265,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6291,15 +6321,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -309,7 +284,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6468,14 +6489,13 @@
+@@ -6468,14 +6498,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -326,7 +301,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6487,7 +6516,6 @@
esac
;;
*64-bit*)
@@ -334,7 +309,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6521,6 +6549,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -357,7 +332,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6552,7 +6596,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -366,7 +341,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6562,8 +6606,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -379,7 +354,7 @@
$2=yes
fi
fi
-@@ -6589,11 +6626,16 @@
+@@ -6589,11 +6635,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -397,7 +372,7 @@
else
$2=yes
fi
-@@ -6617,7 +6659,7 @@
+@@ -6617,7 +6668,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -406,7 +381,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6646,20 +6697,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -483,7 +458,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6676,7 +6768,7 @@
+@@ -6676,7 +6777,7 @@
# _LT_AC_CHECK_DLFCN
@@ -492,7 +467,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6684,7 +6785,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -501,7 +476,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6750,17 +6851,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -523,7 +498,7 @@
esac
else :
# compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6772,7 +6875,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -532,7 +507,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6809,7 +6912,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -541,7 +516,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6843,7 +6946,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -550,7 +525,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6856,7 +6959,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -559,7 +534,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6898,20 +7001,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -581,7 +556,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6923,13 +7019,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -604,7 +579,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6988,8 +7089,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -615,7 +590,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7046,7 +7147,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -624,7 +599,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7059,7 +7151,7 @@
+@@ -7059,7 +7160,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -633,7 +608,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7069,7 +7170,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -655,7 +630,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7134,7 +7239,7 @@
+@@ -7134,7 +7248,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -664,7 +639,7 @@
;;
beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7143,7 +7257,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -673,7 +648,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7159,7 +7273,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -682,7 +657,7 @@
need_version=no
need_lib_prefix=no
-@@ -7171,7 +7276,8 @@
+@@ -7171,7 +7285,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -692,7 +667,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7201,7 +7316,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -701,7 +676,7 @@
;;
esac
;;
-@@ -7224,7 +7330,7 @@
+@@ -7224,7 +7339,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -710,7 +685,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7247,20 +7353,17 @@
+@@ -7247,20 +7362,17 @@
dynamic_linker=no
;;
@@ -742,7 +717,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7278,14 +7390,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -764,7 +739,7 @@
esac
;;
-@@ -7305,9 +7413,9 @@
+@@ -7305,9 +7422,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -776,7 +751,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7430,7 @@
+@@ -7322,7 +7439,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -785,7 +760,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7441,7 @@
+@@ -7333,7 +7450,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -794,7 +769,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7453,18 @@
+@@ -7345,6 +7462,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -813,7 +788,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7388,29 +7517,26 @@
;;
# This must be Linux ELF.
@@ -850,7 +825,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,
-@@ -7420,6 +7537,18 @@
+@@ -7420,6 +7546,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -869,7 +844,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7429,7 +7567,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -878,7 +853,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7457,8 +7586,13 @@
+@@ -7457,8 +7595,13 @@
openbsd*)
version_type=sunos
@@ -893,7 +868,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
-@@ -7478,7 +7612,7 @@
+@@ -7478,7 +7621,7 @@
os2*)
libname_spec='$name'
@@ -902,7 +877,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7630,6 @@
+@@ -7496,13 +7639,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -916,7 +891,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7528,7 +7664,7 @@
need_version=yes
;;
@@ -925,7 +900,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'
-@@ -7561,6 +7688,29 @@
+@@ -7561,6 +7697,29 @@
fi
;;
@@ -955,7 +930,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7724,11 @@
+@@ -7574,6 +7733,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -967,7 +942,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7598,6 +7753,9 @@
+@@ -7598,6 +7762,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -977,7 +952,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7624,7 +7791,9 @@
case $tagname in
CXX)
@@ -988,7 +963,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7686,7 +7855,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -997,7 +972,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7884,7 @@
+@@ -7724,7 +7893,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -1006,7 +981,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7860,7 +8029,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -1015,7 +990,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
-@@ -7970,7 +8130,7 @@
+@@ -7970,7 +8139,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -1024,7 +999,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'*)
-@@ -8002,7 +8162,7 @@
+@@ -8002,7 +8171,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -1033,7 +1008,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8029,6 +8198,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -1049,7 +1024,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8062,44 +8231,36 @@
+@@ -8062,44 +8240,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1105,7 +1080,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8115,7 +8276,7 @@
+@@ -8115,7 +8285,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1114,7 +1089,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
-@@ -8131,43 +8292,27 @@
+@@ -8131,43 +8301,27 @@
esac
;;
@@ -1171,7 +1146,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
-@@ -8186,32 +8331,22 @@
+@@ -8186,32 +8340,22 @@
;;
openbsd*)
@@ -1207,7 +1182,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]]'
-@@ -8232,10 +8367,13 @@
+@@ -8232,10 +8376,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1222,7 +1197,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8255,36 +8393,43 @@
+@@ -8255,36 +8402,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1290,7 +1265,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8316,13 +8470,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1311,7 +1286,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8341,13 +8495,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1332,7 +1307,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
-@@ -8385,10 +8530,21 @@
+@@ -8385,10 +8539,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1355,7 +1330,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8428,7 +8584,7 @@
+@@ -8428,7 +8593,7 @@
# AC_LIBTOOL_RC
@@ -1364,7 +1339,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8617,9 @@
+@@ -8461,36 +8626,9 @@
_LT_AC_SYS_COMPILER
@@ -1404,7 +1379,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8504,9 +8642,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1416,7 +1391,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8515,7 +8644,7 @@
+@@ -8515,7 +8653,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1425,7 +1400,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8524,48 +8662,11 @@
fi
;;
@@ -1476,7 +1451,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8590,7 +8682,7 @@
+@@ -8590,7 +8691,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1485,7 +1460,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8602,6 +8703,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1493,7 +1468,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8619,7 +8721,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1502,7 +1477,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8629,11 +8731,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1519,7 +1494,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8644,18 +8750,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1541,7 +1516,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8673,8 +8779,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -1552,7 +1527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8797,7 @@
+@@ -8700,7 +8806,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1561,7 +1536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8730,8 +8836,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1587,7 +1562,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8748,7 +8860,7 @@
+@@ -8748,7 +8869,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1596,7 +1571,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`
-@@ -8767,8 +8879,12 @@
+@@ -8767,8 +8888,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1609,7 +1584,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8777,15 +8902,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1630,7 +1605,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.
-@@ -8794,13 +8911,12 @@
+@@ -8794,13 +8920,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1646,7 +1621,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8809,16 +8934,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1663,12 +1638,6 @@
fi
fi
;;
-- chorus*)
-- case $cc_basename in
-- *)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1681,16 +1650,10 @@
+ fi
+ ;;
+
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
- esac
- ;;
-
-@@ -8832,12 +8958,12 @@
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -8832,12 +8967,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1705,7 +1668,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
-@@ -8846,70 +8972,81 @@
+@@ -8846,70 +8981,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1839,7 +1802,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9057,14 @@
+@@ -8920,14 +9066,14 @@
;;
esac
;;
@@ -1856,7 +1819,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9081,12 @@
+@@ -8944,12 +9090,12 @@
# location of the library.
case $cc_basename in
@@ -1872,7 +1835,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8958,11 +9095,11 @@
+@@ -8958,11 +9104,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1886,7 +1849,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8972,34 +9118,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1928,7 +1891,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9009,17 +9144,20 @@
esac
case $cc_basename in
@@ -1955,7 +1918,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9035,12 +9173,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1975,7 +1938,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9051,11 +9192,25 @@
;;
esac
;;
@@ -2003,7 +1966,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9066,9 +9212,9 @@
+@@ -9066,9 +9221,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -2015,7 +1978,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9223,16 @@
+@@ -9077,16 +9232,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -2036,7 +1999,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9104,20 +9250,44 @@
+@@ -9104,20 +9259,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2087,7 +2050,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9145,7 +9324,7 @@
;;
mvs*)
case $cc_basename in
@@ -2096,7 +2059,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9155,7 +9334,7 @@
;;
esac
;;
@@ -2105,7 +2068,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=
-@@ -9166,15 +9336,31 @@
+@@ -9166,15 +9345,31 @@
# 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::"'
;;
@@ -2139,7 +2102,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9184,14 +9379,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2157,7 +2120,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9209,7 +9404,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2166,7 +2129,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9228,13 +9423,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2182,7 +2145,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9243,17 +9438,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2204,7 +2167,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9272,7 +9467,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2213,7 +2176,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9293,27 +9488,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2243,7 +2206,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9326,36 +9508,33 @@
;;
solaris*)
case $cc_basename in
@@ -2292,7 +2255,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9363,9 +9533,9 @@
+@@ -9363,9 +9542,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2304,7 +2267,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9545,9 @@
+@@ -9375,9 +9554,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2316,7 +2279,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9386,9 +9565,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2328,7 +2291,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9401,12 +9580,63 @@
;;
esac
;;
@@ -2394,7 +2357,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9443,8 +9673,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2403,7 +2366,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9462,7 +9681,7 @@
+@@ -9462,7 +9690,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2412,7 +2375,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9516,7 +9744,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2421,7 +2384,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9556,7 +9784,7 @@
fi
;;
@@ -2430,7 +2393,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9811,37 @@
+@@ -9592,13 +9820,37 @@
$rm -f confest.$objext
@@ -2469,7 +2432,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'.
-@@ -9642,12 +9885,16 @@
+@@ -9642,12 +9894,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2487,7 +2450,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9657,7 +9913,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2496,7 +2459,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9665,8 +9921,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2509,7 +2472,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9676,8 +9934,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2518,7 +2481,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9687,8 +9934,6 @@
+@@ -9687,8 +9943,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2527,7 +2490,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9717,20 +9962,27 @@
+@@ -9717,20 +9971,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2556,7 +2519,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
-@@ -9742,8 +9994,6 @@
+@@ -9742,8 +10003,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2565,7 +2528,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9753,7 +10003,7 @@
+@@ -9753,7 +10012,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2574,7 +2537,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'.
-@@ -9777,11 +10027,16 @@
+@@ -9777,11 +10036,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2591,7 +2554,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9807,11 +10071,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2606,7 +2569,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 \
-@@ -9861,7 +10117,7 @@
+@@ -9861,7 +10126,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2615,7 +2578,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10183,11 @@
+@@ -9927,11 +10192,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2629,7 +2592,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9962,6 +10227,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2642,7 +2605,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9973,6 +10244,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2652,7 +2615,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9992,7 +10257,7 @@
+@@ -9992,7 +10266,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2661,7 +2624,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10023,7 +10297,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2670,7 +2633,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10038,7 +10312,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2679,7 +2642,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10267,7 +10541,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -2691,7 +2654,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10309,9 +10577,6 @@
+@@ -10309,9 +10586,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2701,7 +2664,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'"
-@@ -10333,14 +10598,30 @@
+@@ -10333,14 +10607,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2734,7 +2697,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10358,14 +10648,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2754,7 +2717,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10521,6 +10814,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2765,7 +2728,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10529,7 +10826,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2774,7 +2737,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10554,18 +10851,28 @@
;;
chorus*)
case $cc_basename in
@@ -2806,7 +2769,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10573,22 +10880,22 @@
;;
esac
;;
@@ -2835,7 +2798,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10601,9 +10908,13 @@
;;
esac
;;
@@ -2850,7 +2813,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.
-@@ -10612,20 +10914,26 @@
+@@ -10612,20 +10923,26 @@
;;
esac
;;
@@ -2882,7 +2845,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10950,25 @@
+@@ -10642,25 +10959,25 @@
;;
mvs*)
case $cc_basename in
@@ -2913,7 +2876,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
-@@ -10674,24 +10982,15 @@
+@@ -10674,24 +10991,15 @@
;;
psos*)
;;
@@ -2940,7 +2903,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10701,12 +11000,12 @@
+@@ -10701,12 +11009,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2955,7 +2918,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10716,7 +11024,7 @@
;;
tandem*)
case $cc_basename in
@@ -2964,7 +2927,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10724,7 +11032,14 @@
;;
esac
;;
@@ -2980,7 +2943,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10771,6 +11086,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2992,7 +2955,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10787,7 +11098,7 @@
+@@ -10787,7 +11107,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3001,7 +2964,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10813,6 +11124,16 @@
+@@ -10813,6 +11133,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -3018,7 +2981,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10824,7 +11154,7 @@
_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.
@@ -3027,7 +2990,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10847,13 +11177,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3050,7 +3013,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10868,15 +11205,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3072,7 +3035,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10885,7 +11222,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3081,7 +3044,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'
-@@ -10898,6 +11226,17 @@
+@@ -10898,6 +11235,17 @@
fi
;;
@@ -3099,7 +3062,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11264,7 @@
+@@ -10925,7 +11273,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3108,7 +3071,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10934,6 +11282,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3125,7 +3088,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10958,7 +11316,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3137,7 +3100,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11336,7 @@
+@@ -10984,7 +11345,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3146,7 +3109,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*
-@@ -11001,7 +11353,8 @@
+@@ -11001,7 +11362,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3156,7 +3119,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11011,6 +11373,10 @@
with_gnu_ld=no
fi
;;
@@ -3167,7 +3130,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11021,6 +11378,27 @@
+@@ -11021,6 +11387,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3195,7 +3158,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11058,7 +11445,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3204,7 +3167,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11068,13 +11446,13 @@
+@@ -11068,13 +11455,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3221,7 +3184,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
-@@ -11083,23 +11461,70 @@
+@@ -11083,23 +11470,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3298,7 +3261,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11113,13 +11538,40 @@
+@@ -11113,13 +11547,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3341,7 +3304,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11129,24 +11581,19 @@
+@@ -11129,24 +11590,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3373,7 +3336,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11605,7 @@
+@@ -11158,7 +11614,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3382,7 +3345,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11180,9 +11636,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3406,7 +3369,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11199,7 +11658,7 @@
+@@ -11199,7 +11667,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3415,7 +3378,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`
-@@ -11218,8 +11677,12 @@
+@@ -11218,8 +11686,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3428,7 +3391,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11227,30 +11699,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3470,7 +3433,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11259,13 +11731,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3487,7 +3450,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11278,7 +11748,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3496,7 +3459,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11288,69 +11749,69 @@
+@@ -11288,69 +11758,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3612,7 +3575,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11383,8 +11853,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3623,7 +3586,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
-@@ -11392,7 +11853,7 @@
+@@ -11392,7 +11862,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3632,7 +3595,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
-@@ -11406,47 +11867,62 @@
+@@ -11406,47 +11876,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3719,7 +3682,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11460,7 +11936,7 @@
+@@ -11460,7 +11945,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3728,7 +3691,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'
-@@ -11470,7 +11946,7 @@
+@@ -11470,7 +11955,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3737,7 +3700,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
-@@ -11493,7 +11969,8 @@
+@@ -11493,7 +11978,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3747,7 +3710,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11503,7 +11980,7 @@
+@@ -11503,7 +11989,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3756,7 +3719,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11514,14 +11991,14 @@
+@@ -11514,14 +12000,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3773,7 +3736,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'
-@@ -11533,13 +12010,13 @@
+@@ -11533,13 +12019,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3789,7 +3752,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11547,21 +12033,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3815,7 +3778,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'
-@@ -11570,8 +12041,18 @@
+@@ -11570,8 +12050,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3836,7 +3799,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11580,7 +12061,7 @@
+@@ -11580,7 +12070,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -3845,7 +3808,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11628,36 +12109,45 @@
+@@ -11628,36 +12118,45 @@
fi
;;
@@ -3912,7 +3875,7 @@
;;
uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11675,11 +12174,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3924,7 +3887,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11700,13 +12185,14 @@
+@@ -11700,13 +12194,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3940,7 +3903,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11834,7 +12329,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4369,193 +4332,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6848,185 +6841,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
--
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
--kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
+@@ -6895,8 +6888,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--fi
--
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
--
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
--kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6975,8 +6967,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--fi
--
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
-- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
-- KDE_NO_UNDEFINED=""
--fi
--
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
-- KDE_NO_UNDEFINED=""
--fi
--
-- ;;
-- esac
- fi
-
-
-@@ -7204,7 +7018,7 @@
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7204,7 +7195,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -4564,7 +4361,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7309,7 +7123,7 @@
+@@ -7309,7 +7300,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -4573,7 +4370,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'*)
-@@ -7343,7 +7157,7 @@
+@@ -7343,7 +7334,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4582,7 +4379,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7373,6 +7187,15 @@
+@@ -7373,6 +7364,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4598,7 +4395,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7383,36 +7206,43 @@
+@@ -7383,36 +7383,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -4666,7 +4463,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7459,44 +7289,36 @@
+@@ -7459,44 +7466,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4721,7 +4518,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7512,7 +7334,7 @@
+@@ -7512,7 +7511,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4730,7 +4527,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
-@@ -7528,43 +7350,27 @@
+@@ -7528,43 +7527,27 @@
esac
;;
@@ -4787,7 +4584,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
-@@ -7583,32 +7389,22 @@
+@@ -7583,32 +7566,22 @@
;;
openbsd*)
@@ -4823,7 +4620,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]'
-@@ -7629,10 +7425,13 @@
+@@ -7629,10 +7602,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4838,7 +4635,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7648,6 +7447,9 @@
+@@ -7648,6 +7624,9 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -4848,16 +4645,16 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7682,7 +7484,7 @@
+@@ -7682,7 +7661,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7685 "configure"' > conftest.$ac_ext
-+ echo '#line 7487 "configure"' > conftest.$ac_ext
++ echo '#line 7664 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7725,14 +7527,13 @@
+@@ -7725,14 +7704,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4874,7 +4671,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7744,7 +7545,6 @@
+@@ -7744,7 +7722,6 @@
esac
;;
*64-bit*)
@@ -4882,7 +4679,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7804,8 +7604,7 @@
+@@ -7804,8 +7781,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4892,7 +4689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7840,6 +7639,26 @@
+@@ -7840,6 +7816,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -4919,7 +4716,7 @@
esac
-@@ -7880,8 +7699,7 @@
+@@ -7880,8 +7876,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4929,7 +4726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8051,8 +7869,7 @@
+@@ -8051,8 +8046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4939,7 +4736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8119,8 +7936,7 @@
+@@ -8119,8 +8113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4949,7 +4746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8235,6 +8051,243 @@
+@@ -8235,6 +8228,243 @@
done
@@ -5193,16 +4990,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8327,7 +8380,7 @@
+@@ -8327,7 +8557,7 @@
# Provide some information about the compiler.
-echo "$as_me:8330:" \
-+echo "$as_me:8383:" \
++echo "$as_me:8560:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8373,8 +8426,7 @@
+@@ -8373,8 +8603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5212,7 +5009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8423,8 +8475,7 @@
+@@ -8423,8 +8652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5222,7 +5019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8482,7 +8533,7 @@
+@@ -8482,7 +8710,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -5231,7 +5028,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8511,20 +8562,70 @@
+@@ -8511,20 +8739,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5308,7 +5105,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8561,9 +8662,6 @@
+@@ -8561,9 +8839,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -5318,7 +5115,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'"
-@@ -8585,14 +8683,30 @@
+@@ -8585,14 +8860,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -5351,7 +5148,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8610,14 +8724,17 @@
+@@ -8610,14 +8901,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -5371,7 +5168,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8779,7 +8896,7 @@
+@@ -8779,7 +9073,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -5380,7 +5177,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8799,7 +8916,7 @@
+@@ -8799,7 +9093,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -5389,7 +5186,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9056,6 +9173,7 @@
+@@ -9056,6 +9350,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -5397,7 +5194,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9075,15 +9193,26 @@
+@@ -9075,15 +9370,26 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -5426,7 +5223,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9109,7 +9238,7 @@
+@@ -9109,7 +9415,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5435,7 +5232,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
-@@ -9171,7 +9300,7 @@
+@@ -9171,7 +9477,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -5444,7 +5241,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
-@@ -9266,68 +9395,25 @@
+@@ -9266,68 +9572,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5528,7 +5325,7 @@
## CAVEAT EMPTOR:
-@@ -9356,18 +9442,20 @@
+@@ -9356,18 +9619,20 @@
# 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 \
@@ -5537,12 +5334,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9362: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9448: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9625: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9366: \$? = $ac_status" >&5
-+ echo "$as_me:9452: \$? = $ac_status" >&5
++ echo "$as_me:9629: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -5554,7 +5351,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9428,6 +9516,11 @@
+@@ -9428,6 +9693,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5566,7 +5363,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9444,7 +9537,7 @@
+@@ -9444,7 +9714,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5575,7 +5372,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9470,6 +9563,16 @@
+@@ -9470,6 +9740,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5592,7 +5389,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9481,7 +9584,7 @@
+@@ -9481,7 +9761,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5601,7 +5398,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9504,13 +9607,20 @@
+@@ -9504,13 +9784,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5624,7 +5421,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9525,15 +9635,15 @@
+@@ -9525,15 +9812,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5646,7 +5443,7 @@
;;
sunos4*)
-@@ -9542,7 +9652,7 @@
+@@ -9542,7 +9829,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -5655,7 +5452,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9555,6 +9665,17 @@
+@@ -9555,6 +9842,17 @@
fi
;;
@@ -5673,7 +5470,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9589,18 +9710,20 @@
+@@ -9589,18 +9887,20 @@
# 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 \
@@ -5682,12 +5479,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9595: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9716: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9893: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9599: \$? = $ac_status" >&5
-+ echo "$as_me:9720: \$? = $ac_status" >&5
++ echo "$as_me:9897: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -5699,7 +5496,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9621,7 +9744,7 @@
+@@ -9621,7 +9921,7 @@
fi
fi
@@ -5708,7 +5505,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9631,6 +9754,48 @@
+@@ -9631,6 +9931,48 @@
;;
esac
@@ -5757,7 +5554,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9643,38 +9808,36 @@
+@@ -9643,38 +9985,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5779,12 +5576,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9820: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9997: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9666: \$? = $ac_status" >&5
-+ echo "$as_me:9824: \$? = $ac_status" >&5
++ echo "$as_me:10001: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -5808,7 +5605,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9745,6 +9908,16 @@
+@@ -9745,6 +10085,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5825,7 +5622,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9755,6 +9928,10 @@
+@@ -9755,6 +10105,10 @@
with_gnu_ld=no
fi
;;
@@ -5836,7 +5633,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9765,6 +9942,27 @@
+@@ -9765,6 +10119,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5864,7 +5661,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9802,7 +10000,7 @@
+@@ -9802,7 +10177,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5873,7 +5670,7 @@
else
ld_shlibs=no
fi
-@@ -9812,13 +10010,13 @@
+@@ -9812,13 +10187,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -5890,7 +5687,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9827,23 +10025,70 @@
+@@ -9827,23 +10202,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5966,7 +5763,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9857,13 +10102,40 @@
+@@ -9857,13 +10279,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6009,7 +5806,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9873,24 +10145,19 @@
+@@ -9873,24 +10322,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6041,7 +5838,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9902,7 +10169,7 @@
+@@ -9902,7 +10346,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -6050,7 +5847,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9924,9 +10191,21 @@
+@@ -9924,9 +10368,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -6074,7 +5871,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9943,7 +10222,7 @@
+@@ -9943,7 +10399,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -6083,7 +5880,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`
-@@ -9962,8 +10241,12 @@
+@@ -9962,8 +10418,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -6096,7 +5893,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9971,22 +10254,23 @@
+@@ -9971,22 +10431,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -6127,7 +5924,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10010,8 +10294,7 @@
+@@ -10010,8 +10471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6137,7 +5934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10038,14 +10321,13 @@
+@@ -10038,14 +10498,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6155,7 +5952,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10072,8 +10354,7 @@
+@@ -10072,8 +10531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6165,7 +5962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10105,13 +10386,11 @@
+@@ -10105,13 +10563,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -6182,7 +5979,7 @@
fi
fi
;;
-@@ -10124,7 +10403,7 @@
+@@ -10124,7 +10580,7 @@
ld_shlibs=no
;;
@@ -6191,7 +5988,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10134,13 +10413,13 @@
+@@ -10134,13 +10590,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6208,30 +6005,11 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10150,52 +10429,52 @@
+@@ -10150,52 +10606,52 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
-- archive_cmds_need_lc=no
-- case "$host_os" in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.012)
-- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
@@ -6250,7 +6028,27 @@
+ esac
+ fi
+ ;;
- esac
++ esac
+ archive_cmds_need_lc=no
+- case "$host_os" in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.012)
+- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -6269,7 +6067,6 @@
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_need_lc=no
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -6301,7 +6098,7 @@
fi
;;
-@@ -10229,8 +10508,8 @@
+@@ -10229,8 +10685,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6312,7 +6109,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10238,7 +10517,7 @@
+@@ -10238,7 +10694,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6321,7 +6118,7 @@
else
archive_cmds='$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
-@@ -10252,47 +10531,62 @@
+@@ -10252,47 +10708,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -6408,7 +6205,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10306,7 +10600,7 @@
+@@ -10306,7 +10777,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6417,7 +6214,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10316,7 +10610,7 @@
+@@ -10316,7 +10787,7 @@
link_all_deplibs=yes
;;
@@ -6426,7 +6223,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10339,7 +10633,8 @@
+@@ -10339,7 +10810,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -6436,7 +6233,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10349,7 +10644,7 @@
+@@ -10349,7 +10821,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6445,7 +6242,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10360,14 +10655,14 @@
+@@ -10360,14 +10832,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6462,7 +6259,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$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'
-@@ -10379,13 +10674,13 @@
+@@ -10379,13 +10851,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6478,7 +6275,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10393,21 +10688,15 @@
+@@ -10393,21 +10865,15 @@
hardcode_libdir_separator=:
;;
@@ -6504,7 +6301,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$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'
-@@ -10416,8 +10705,18 @@
+@@ -10416,8 +10882,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6525,7 +6322,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10426,7 +10725,7 @@
+@@ -10426,7 +10902,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -6534,7 +6331,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10474,36 +10773,45 @@
+@@ -10474,36 +10950,45 @@
fi
;;
@@ -6601,7 +6398,7 @@
;;
uts4*)
-@@ -10522,11 +10830,6 @@
+@@ -10522,11 +11007,6 @@
echo "${ECHO_T}$ld_shlibs" >&6
test "$ld_shlibs" = no && can_build_shared=no
@@ -6613,7 +6410,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10559,6 +10862,7 @@
+@@ -10559,6 +11039,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -6621,7 +6418,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10594,7 +10898,7 @@
+@@ -10594,7 +11075,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6630,7 +6427,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10604,7 +10908,20 @@
+@@ -10604,7 +11085,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6652,7 +6449,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10669,7 +10986,7 @@
+@@ -10669,7 +11163,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6661,7 +6458,7 @@
;;
beos*)
-@@ -10678,7 +10995,7 @@
+@@ -10678,7 +11172,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6670,7 +6467,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10694,7 +11011,7 @@
+@@ -10694,7 +11188,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6679,7 +6476,7 @@
need_version=no
need_lib_prefix=no
-@@ -10706,7 +11023,8 @@
+@@ -10706,7 +11200,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6689,7 +6486,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10736,7 +11054,7 @@
+@@ -10736,7 +11231,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6698,7 +6495,7 @@
;;
esac
;;
-@@ -10759,7 +11077,7 @@
+@@ -10759,7 +11254,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6707,7 +6504,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10782,20 +11100,17 @@
+@@ -10782,20 +11277,17 @@
dynamic_linker=no
;;
@@ -6739,7 +6536,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10813,14 +11128,19 @@
+@@ -10813,14 +11305,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6761,7 +6558,7 @@
esac
;;
-@@ -10840,9 +11160,9 @@
+@@ -10840,9 +11337,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6773,7 +6570,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10857,7 +11177,7 @@
+@@ -10857,7 +11354,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6782,7 +6579,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10868,7 +11188,7 @@
+@@ -10868,7 +11365,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6791,7 +6588,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10880,6 +11200,18 @@
+@@ -10880,6 +11377,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6810,7 +6607,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10923,29 +11255,26 @@
+@@ -10923,29 +11432,26 @@
;;
# This must be Linux ELF.
@@ -6847,7 +6644,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,
-@@ -10955,6 +11284,18 @@
+@@ -10955,6 +11461,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6866,7 +6663,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10964,7 +11305,7 @@
+@@ -10964,7 +11482,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6875,7 +6672,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10992,8 +11333,13 @@
+@@ -10992,8 +11510,13 @@
openbsd*)
version_type=sunos
@@ -6890,7 +6687,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
-@@ -11013,7 +11359,7 @@
+@@ -11013,7 +11536,7 @@
os2*)
libname_spec='$name'
@@ -6899,7 +6696,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11031,13 +11377,6 @@
+@@ -11031,13 +11554,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6913,7 +6710,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11063,7 +11402,7 @@
+@@ -11063,7 +11579,7 @@
need_version=yes
;;
@@ -6922,7 +6719,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'
-@@ -11096,6 +11435,29 @@
+@@ -11096,6 +11612,29 @@
fi
;;
@@ -6952,7 +6749,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11111,12 +11473,17 @@
+@@ -11111,12 +11650,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -6972,7 +6769,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11242,8 +11609,7 @@
+@@ -11242,8 +11786,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6982,7 +6779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11346,8 +11712,7 @@
+@@ -11346,8 +11889,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6992,7 +6789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11412,8 +11777,7 @@
+@@ -11412,8 +11954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7002,7 +6799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11506,8 +11870,7 @@
+@@ -11506,8 +12047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7012,7 +6809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11572,8 +11935,7 @@
+@@ -11572,8 +12112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7022,7 +6819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11639,8 +12001,7 @@
+@@ -11639,8 +12178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7032,7 +6829,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11706,8 +12067,7 @@
+@@ -11706,8 +12244,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7042,7 +6839,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11766,7 +12126,7 @@
+@@ -11766,7 +12303,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -7051,16 +6848,16 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11782,7 +12142,7 @@
+@@ -11782,7 +12319,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11785 "configure"
-+#line 12145 "configure"
++#line 12322 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11839,6 +12199,8 @@
+@@ -11839,6 +12376,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7069,7 +6866,7 @@
exit (status);
}
-@@ -11848,12 +12210,12 @@
+@@ -11848,12 +12387,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7084,7 +6881,7 @@
esac
else :
# compilation failed
-@@ -11868,7 +12230,7 @@
+@@ -11868,7 +12407,7 @@
echo "${ECHO_T}$lt_cv_dlopen_self" >&6
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -7093,16 +6890,16 @@
echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11880,7 +12242,7 @@
+@@ -11880,7 +12419,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11883 "configure"
-+#line 12245 "configure"
++#line 12422 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11937,6 +12299,8 @@
+@@ -11937,6 +12476,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7111,7 +6908,7 @@
exit (status);
}
-@@ -11946,12 +12310,12 @@
+@@ -11946,12 +12487,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7126,7 +6923,7 @@
esac
else :
# compilation failed
-@@ -11984,7 +12348,7 @@
+@@ -11984,7 +12525,7 @@
fi
@@ -7135,7 +6932,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -11996,7 +12360,7 @@
+@@ -11996,7 +12537,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7144,7 +6941,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12005,47 +12369,10 @@
+@@ -12005,47 +12546,10 @@
fi
;;
@@ -7193,7 +6990,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12071,7 +12398,8 @@
+@@ -12071,7 +12575,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7203,7 +7000,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 \
-@@ -12185,11 +12513,11 @@
+@@ -12185,11 +12690,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7217,7 +7014,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12219,6 +12547,12 @@
+@@ -12219,6 +12724,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7230,7 +7027,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12230,6 +12564,9 @@
+@@ -12230,6 +12741,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -7240,7 +7037,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12249,7 +12586,7 @@
+@@ -12249,7 +12763,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7249,7 +7046,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12280,7 +12617,7 @@
+@@ -12280,7 +12794,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7258,7 +7055,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12295,7 +12632,7 @@
+@@ -12295,7 +12809,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -7267,7 +7064,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12522,7 +12859,10 @@
+@@ -12522,7 +13036,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7279,7 +7076,7 @@
fi
-@@ -12557,6 +12897,9 @@
+@@ -12557,6 +13074,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -7289,7 +7086,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12587,7 +12930,9 @@
+@@ -12587,7 +13107,9 @@
case $tagname in
CXX)
@@ -7300,7 +7097,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12607,6 +12952,7 @@
+@@ -12607,6 +13129,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -7308,7 +7105,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12624,7 +12970,7 @@
+@@ -12624,7 +13147,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -7317,7 +7114,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12634,17 +12980,34 @@
+@@ -12634,17 +13157,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -7353,7 +7150,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12655,18 +13018,27 @@
+@@ -12655,18 +13195,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -7384,7 +7181,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12737,7 +13109,7 @@
+@@ -12737,7 +13286,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -7393,7 +7190,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'*)
-@@ -12771,7 +13143,7 @@
+@@ -12771,7 +13320,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7402,7 +7199,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12790,8 +13162,8 @@
+@@ -12790,8 +13339,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -7413,7 +7210,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12817,7 +13189,7 @@
+@@ -12817,7 +13366,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -7422,7 +7219,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12848,8 +13220,23 @@
+@@ -12848,8 +13397,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -7448,7 +7245,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12866,7 +13253,7 @@
+@@ -12866,7 +13430,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -7457,7 +7254,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`
-@@ -12885,8 +13272,12 @@
+@@ -12885,8 +13449,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -7470,7 +7267,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12895,15 +13286,16 @@
+@@ -12895,15 +13463,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7491,7 +7288,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.
-@@ -12933,8 +13325,7 @@
+@@ -12933,8 +13502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7501,7 +7298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12963,13 +13354,12 @@
+@@ -12963,13 +13531,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7517,7 +7314,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12996,8 +13386,7 @@
+@@ -12996,8 +13563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7527,7 +7324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -13029,16 +13418,26 @@
+@@ -13029,16 +13595,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7559,7 +7356,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13052,12 +13451,12 @@
+@@ -13052,12 +13628,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -7574,7 +7371,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13066,70 +13465,81 @@
+@@ -13066,70 +13642,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7708,7 +7505,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13140,14 +13550,14 @@
+@@ -13140,14 +13727,14 @@
;;
esac
;;
@@ -7725,7 +7522,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13164,12 +13574,12 @@
+@@ -13164,12 +13751,12 @@
# location of the library.
case $cc_basename in
@@ -7741,7 +7538,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13178,11 +13588,11 @@
+@@ -13178,11 +13765,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -7755,7 +7552,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13192,33 +13602,22 @@
+@@ -13192,33 +13779,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -7796,7 +7593,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13229,17 +13628,20 @@
+@@ -13229,17 +13805,20 @@
esac
case $cc_basename in
@@ -7823,7 +7620,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13255,12 +13657,15 @@
+@@ -13255,12 +13834,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -7843,7 +7640,7 @@
;;
esac
fi
-@@ -13271,11 +13676,25 @@
+@@ -13271,11 +13853,25 @@
;;
esac
;;
@@ -7871,7 +7668,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13286,9 +13705,9 @@
+@@ -13286,9 +13882,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7883,7 +7680,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13297,16 +13716,16 @@
+@@ -13297,16 +13893,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -7904,7 +7701,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13324,20 +13743,44 @@
+@@ -13324,20 +13920,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -7955,7 +7752,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13365,7 +13808,7 @@
+@@ -13365,7 +13985,7 @@
;;
mvs*)
case $cc_basename in
@@ -7964,7 +7761,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13375,7 +13818,7 @@
+@@ -13375,7 +13995,7 @@
;;
esac
;;
@@ -7973,7 +7770,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13386,15 +13829,31 @@
+@@ -13386,15 +14006,31 @@
# 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::"'
;;
@@ -8007,7 +7804,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13404,14 +13863,14 @@
+@@ -13404,14 +14040,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -8025,7 +7822,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13429,7 +13888,7 @@
+@@ -13429,7 +14065,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8034,7 +7831,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13448,13 +13907,13 @@
+@@ -13448,13 +14084,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -8050,7 +7847,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13463,17 +13922,17 @@
+@@ -13463,17 +14099,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -8072,7 +7869,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13492,7 +13951,7 @@
+@@ -13492,7 +14128,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8081,7 +7878,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13513,27 +13972,14 @@
+@@ -13513,27 +14149,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -8111,7 +7908,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13546,36 +13992,33 @@
+@@ -13546,36 +14169,33 @@
;;
solaris*)
case $cc_basename in
@@ -8160,7 +7957,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13583,9 +14026,9 @@
+@@ -13583,9 +14203,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -8172,7 +7969,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13595,9 +14038,9 @@
+@@ -13595,9 +14215,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -8184,7 +7981,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13606,9 +14049,9 @@
+@@ -13606,9 +14226,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -8196,7 +7993,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13621,12 +14064,63 @@
+@@ -13621,12 +14241,63 @@
;;
esac
;;
@@ -8262,7 +8059,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13683,7 +14177,7 @@
+@@ -13683,7 +14354,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -8271,7 +8068,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13723,7 +14217,7 @@
+@@ -13723,7 +14394,7 @@
fi
;;
@@ -8280,7 +8077,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13759,6 +14253,29 @@
+@@ -13759,6 +14430,29 @@
$rm -f confest.$objext
@@ -8310,7 +8107,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13806,6 +14323,10 @@
+@@ -13806,6 +14500,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -8321,7 +8118,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13814,7 +14335,7 @@
+@@ -13814,7 +14512,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8330,7 +8127,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13839,18 +14360,28 @@
+@@ -13839,18 +14537,28 @@
;;
chorus*)
case $cc_basename in
@@ -8362,7 +8159,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13858,22 +14389,22 @@
+@@ -13858,22 +14566,22 @@
;;
esac
;;
@@ -8391,7 +8188,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13886,9 +14417,13 @@
+@@ -13886,9 +14594,13 @@
;;
esac
;;
@@ -8406,7 +8203,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13897,20 +14432,26 @@
+@@ -13897,20 +14609,26 @@
;;
esac
;;
@@ -8437,7 +8234,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13927,25 +14468,25 @@
+@@ -13927,25 +14645,25 @@
;;
mvs*)
case $cc_basename in
@@ -8468,7 +8265,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13959,24 +14500,15 @@
+@@ -13959,24 +14677,15 @@
;;
psos*)
;;
@@ -8495,7 +8292,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13986,12 +14518,12 @@
+@@ -13986,12 +14695,12 @@
;;
sunos4*)
case $cc_basename in
@@ -8510,7 +8307,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14001,7 +14533,7 @@
+@@ -14001,7 +14710,7 @@
;;
tandem*)
case $cc_basename in
@@ -8519,7 +8316,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14009,7 +14541,14 @@
+@@ -14009,7 +14718,14 @@
;;
esac
;;
@@ -8535,7 +8332,7 @@
;;
vxworks*)
;;
-@@ -14042,18 +14581,20 @@
+@@ -14042,18 +14758,20 @@
# 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 \
@@ -8544,12 +8341,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14587: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14764: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14052: \$? = $ac_status" >&5
-+ echo "$as_me:14591: \$? = $ac_status" >&5
++ echo "$as_me:14768: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8561,7 +8358,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14074,7 +14615,7 @@
+@@ -14074,7 +14792,7 @@
fi
fi
@@ -8570,13 +8367,10 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14084,50 +14625,90 @@
+@@ -14084,6 +14802,48 @@
;;
esac
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -8584,27 +8378,8 @@
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_cv_prog_compiler_c_o_CXX=no
-- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8638,35 +8413,37 @@
+fi
+
+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+@@ -14096,38 +14856,36 @@
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14115: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14691: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14868: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14119: \$? = $ac_status" >&5
-+ echo "$as_me:14695: \$? = $ac_status" >&5
++ echo "$as_me:14872: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8690,7 +8467,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14177,7 +14758,10 @@
+@@ -14177,7 +14935,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8702,7 +8479,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14188,11 +14772,6 @@
+@@ -14188,11 +14949,6 @@
echo "${ECHO_T}$ld_shlibs_CXX" >&6
test "$ld_shlibs_CXX" = no && can_build_shared=no
@@ -8714,7 +8491,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14225,6 +14804,7 @@
+@@ -14225,6 +14981,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -8722,7 +8499,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14260,7 +14840,7 @@
+@@ -14260,7 +15017,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8731,7 +8508,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14270,7 +14850,20 @@
+@@ -14270,7 +15027,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8753,7 +8530,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14335,7 +14928,7 @@
+@@ -14335,7 +15105,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8762,7 +8539,7 @@
;;
beos*)
-@@ -14344,7 +14937,7 @@
+@@ -14344,7 +15114,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8771,7 +8548,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14360,7 +14953,7 @@
+@@ -14360,7 +15130,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8780,7 +8557,7 @@
need_version=no
need_lib_prefix=no
-@@ -14372,7 +14965,8 @@
+@@ -14372,7 +15142,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8790,7 +8567,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14402,7 +14996,7 @@
+@@ -14402,7 +15173,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8799,7 +8576,7 @@
;;
esac
;;
-@@ -14425,7 +15019,7 @@
+@@ -14425,7 +15196,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8808,7 +8585,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14448,20 +15042,17 @@
+@@ -14448,20 +15219,17 @@
dynamic_linker=no
;;
@@ -8840,7 +8617,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14479,14 +15070,19 @@
+@@ -14479,14 +15247,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8862,7 +8639,7 @@
esac
;;
-@@ -14506,9 +15102,9 @@
+@@ -14506,9 +15279,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8874,7 +8651,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14523,7 +15119,7 @@
+@@ -14523,7 +15296,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8883,7 +8660,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14534,7 +15130,7 @@
+@@ -14534,7 +15307,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8892,7 +8669,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14546,6 +15142,18 @@
+@@ -14546,6 +15319,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8911,7 +8688,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14589,29 +15197,26 @@
+@@ -14589,29 +15374,26 @@
;;
# This must be Linux ELF.
@@ -8948,7 +8725,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,
-@@ -14621,6 +15226,18 @@
+@@ -14621,6 +15403,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8967,7 +8744,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14630,7 +15247,7 @@
+@@ -14630,7 +15424,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8976,7 +8753,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14658,8 +15275,13 @@
+@@ -14658,8 +15452,13 @@
openbsd*)
version_type=sunos
@@ -8991,7 +8768,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
-@@ -14679,7 +15301,7 @@
+@@ -14679,7 +15478,7 @@
os2*)
libname_spec='$name'
@@ -9000,7 +8777,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14697,13 +15319,6 @@
+@@ -14697,13 +15496,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -9014,7 +8791,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14729,7 +15344,7 @@
+@@ -14729,7 +15521,7 @@
need_version=yes
;;
@@ -9023,7 +8800,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'
-@@ -14762,6 +15377,29 @@
+@@ -14762,6 +15554,29 @@
fi
;;
@@ -9053,7 +8830,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14777,12 +15415,17 @@
+@@ -14777,12 +15592,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -9073,7 +8850,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14814,1118 +15457,293 @@
+@@ -14814,977 +15634,152 @@
enable_fast_install=needless
fi
@@ -9102,94 +8879,10 @@
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_CXX \
-+ CC_CXX \
-+ LD_CXX \
-+ lt_prog_compiler_wl_CXX \
-+ lt_prog_compiler_pic_CXX \
-+ lt_prog_compiler_static_CXX \
-+ lt_prog_compiler_no_builtin_flag_CXX \
-+ export_dynamic_flag_spec_CXX \
-+ thread_safe_flag_spec_CXX \
-+ whole_archive_flag_spec_CXX \
-+ enable_shared_with_static_runtimes_CXX \
-+ old_archive_cmds_CXX \
-+ old_archive_from_new_cmds_CXX \
-+ predep_objects_CXX \
-+ postdep_objects_CXX \
-+ predeps_CXX \
-+ postdeps_CXX \
-+ compiler_lib_search_path_CXX \
-+ archive_cmds_CXX \
-+ archive_expsym_cmds_CXX \
-+ postinstall_cmds_CXX \
-+ postuninstall_cmds_CXX \
-+ old_archive_from_expsyms_cmds_CXX \
-+ allow_undefined_flag_CXX \
-+ no_undefined_flag_CXX \
-+ export_symbols_cmds_CXX \
-+ hardcode_libdir_flag_spec_CXX \
-+ hardcode_libdir_flag_spec_ld_CXX \
-+ hardcode_libdir_separator_CXX \
-+ hardcode_automatic_CXX \
-+ module_cmds_CXX \
-+ module_expsym_cmds_CXX \
-+ lt_cv_prog_compiler_c_o_CXX \
-+ exclude_expsyms_CXX \
-+ include_expsyms_CXX; do
-+
-+ case $var in
-+ old_archive_cmds_CXX | \
-+ old_archive_from_new_cmds_CXX | \
-+ archive_cmds_CXX | \
-+ archive_expsym_cmds_CXX | \
-+ module_cmds_CXX | \
-+ module_expsym_cmds_CXX | \
-+ old_archive_from_expsyms_cmds_CXX | \
-+ export_symbols_cmds_CXX | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
+- ;;
+- esac
-fi
-
+-
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
@@ -9197,30 +8890,24 @@
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-+cfgfile="$ofile"
-
+-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
+-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
+-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-
+-
- darwin*)
- # if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -9236,8 +8923,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9280,8 +8965,63 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++ # See if we are running on zsh, and set the options which allow our commands through
++ # without removal of \ escapes.
++ if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++ fi
++ # Now quote all the things that may contain metacharacters while being
++ # careful not to overquote the AC_SUBSTed values. We take copies of the
++ # variables and quote the copies for generation of the libtool script.
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++ deplibs_check_method reload_flag reload_cmds need_locks \
++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++ lt_cv_sys_global_symbol_to_c_name_address \
++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++ old_postinstall_cmds old_postuninstall_cmds \
++ compiler_CXX \
++ CC_CXX \
++ LD_CXX \
++ lt_prog_compiler_wl_CXX \
++ lt_prog_compiler_pic_CXX \
++ lt_prog_compiler_static_CXX \
++ lt_prog_compiler_no_builtin_flag_CXX \
++ export_dynamic_flag_spec_CXX \
++ thread_safe_flag_spec_CXX \
++ whole_archive_flag_spec_CXX \
++ enable_shared_with_static_runtimes_CXX \
++ old_archive_cmds_CXX \
++ old_archive_from_new_cmds_CXX \
++ predep_objects_CXX \
++ postdep_objects_CXX \
++ predeps_CXX \
++ postdeps_CXX \
++ compiler_lib_search_path_CXX \
++ archive_cmds_CXX \
++ archive_expsym_cmds_CXX \
++ postinstall_cmds_CXX \
++ postuninstall_cmds_CXX \
++ old_archive_from_expsyms_cmds_CXX \
++ allow_undefined_flag_CXX \
++ no_undefined_flag_CXX \
++ export_symbols_cmds_CXX \
++ hardcode_libdir_flag_spec_CXX \
++ hardcode_libdir_flag_spec_ld_CXX \
++ hardcode_libdir_separator_CXX \
++ hardcode_automatic_CXX \
++ module_cmds_CXX \
++ module_expsym_cmds_CXX \
++ lt_cv_prog_compiler_c_o_CXX \
++ exclude_expsyms_CXX \
++ include_expsyms_CXX; do
-ac_cv_lib_dl_dlopen=no
-fi
@@ -9294,24 +9034,43 @@
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++ case $var in
++ old_archive_cmds_CXX | \
++ old_archive_from_new_cmds_CXX | \
++ archive_cmds_CXX | \
++ archive_expsym_cmds_CXX | \
++ module_cmds_CXX | \
++ module_expsym_cmds_CXX | \
++ old_archive_from_expsyms_cmds_CXX | \
++ export_symbols_cmds_CXX | \
++ extract_expsyms_cmds | reload_cmds | finish_cmds | \
++ postinstall_cmds | postuninstall_cmds | \
++ old_postinstall_cmds | old_postuninstall_cmds | \
++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++ # Double-quote double-evaled strings.
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++ ;;
++ *)
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++ ;;
++ esac
++ done
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++ case $lt_echo in
++ *'\$0 --fallback-echo"')
++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++ ;;
++ esac
-fi
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++cfgfile="$ofile"
- ;;
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -9328,30 +9087,26 @@
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
-#undef shl_load
-+# A C compiler.
-+LTCC=$lt_LTCC
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9372,8 +9127,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
-int
-main ()
@@ -9409,8 +9164,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-ac_cv_func_shl_load=no
-fi
@@ -9435,8 +9190,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9479,8 +9234,10 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
-ac_cv_lib_dld_shl_load=no
-fi
@@ -9507,25 +9264,30 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
-#undef dlopen
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# A C compiler.
++LTCC=$lt_LTCC
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9546,8 +9308,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -9583,8 +9345,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_dlopen=no
-fi
@@ -9609,8 +9371,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9653,8 +9415,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dl_dlopen=no
-fi
@@ -9680,9 +9442,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used on cygwin: assembler.
-+AS="$AS"
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -9724,9 +9484,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
+-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -9751,10 +9509,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -9796,9 +9551,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
+-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -9810,75 +9563,42 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
+-
+-
-fi
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
+-
+-
-fi
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-
+-
+-
-fi
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-
+-
+-
-fi
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-
-+# Do we need a version for libraries?
-+need_version=$need_version
-
+-
+-
-fi
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-
+-
- ;;
- esac
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
+-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-
+-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
+-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
+-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -9892,19 +9612,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15451 "configure"
-#include "confdefs.h"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
+-
-#include <stdio.h>
-+# Library versioning type.
-+version_type=$version_type
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -9914,9 +9628,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -9938,36 +9650,24 @@
-# endif
-# endif
-#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
+-
- exit (status);
-}
-EOF
@@ -9989,22 +9689,12 @@
- fi
-fi
-rm -fr conftest*
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-
+-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
+-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -10020,22 +9710,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15549 "configure"
-#include "confdefs.h"
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
+-
-#include <stdio.h>
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -10045,10 +9726,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -10269,154 +9947,39 @@
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+@@ -15793,7 +15788,7 @@
+ NM=$lt_NM
+
+ # A symbol stripping program
-STRIP=$STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS="$AS"
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -15824,7 +15819,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
-shrext='$shrext'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
--
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -15839,7 +15834,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
-# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_CXX
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -16041,7 +15859,10 @@
+ # Do we need the lib prefix for modules?
+@@ -16041,7 +16036,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -10428,7 +9991,7 @@
fi
-@@ -16113,16 +15934,42 @@
+@@ -16113,16 +16111,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -10472,7 +10035,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16135,7 +15982,7 @@
+@@ -16135,7 +16159,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -10481,7 +10044,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16143,8 +15990,10 @@
+@@ -16143,8 +16167,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -10494,7 +10057,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16157,8 +16006,6 @@
+@@ -16157,8 +16183,6 @@
echo "$as_me:$LINENO: result: $enable_static" >&5
echo "${ECHO_T}$enable_static" >&6
@@ -10503,7 +10066,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16205,6 +16052,11 @@
+@@ -16205,6 +16229,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -10515,7 +10078,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16221,7 +16073,7 @@
+@@ -16221,7 +16250,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10524,7 +10087,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16247,6 +16099,16 @@
+@@ -16247,6 +16276,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -10541,7 +10104,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16258,7 +16120,7 @@
+@@ -16258,7 +16297,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -10550,7 +10113,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16281,13 +16143,20 @@
+@@ -16281,13 +16320,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10573,7 +10136,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16302,15 +16171,15 @@
+@@ -16302,15 +16348,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -10595,7 +10158,7 @@
;;
sunos4*)
-@@ -16319,7 +16188,7 @@
+@@ -16319,7 +16365,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10604,7 +10167,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16332,6 +16201,17 @@
+@@ -16332,6 +16378,17 @@
fi
;;
@@ -10622,7 +10185,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16366,18 +16246,20 @@
+@@ -16366,18 +16423,20 @@
# 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 \
@@ -10631,12 +10194,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16429: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16376: \$? = $ac_status" >&5
-+ echo "$as_me:16256: \$? = $ac_status" >&5
++ echo "$as_me:16433: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -10648,7 +10211,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16398,7 +16280,7 @@
+@@ -16398,7 +16457,7 @@
fi
fi
@@ -10657,10 +10220,13 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16408,6 +16290,48 @@
+@@ -16408,50 +16467,90 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -10668,8 +10234,23 @@
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_cv_prog_compiler_c_o_F77=no
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+- cd conftest
+- mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
+- lt_compiler_flag="-o out/conftest2.$ac_objext"
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -10703,21 +10284,19 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16420,38 +16344,36 @@
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
- lt_compiler_flag="-o out/conftest2.$ac_objext"
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_prog_compiler_c_o_F77=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -10728,12 +10307,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16439: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16356: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16533: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16443: \$? = $ac_status" >&5
-+ echo "$as_me:16360: \$? = $ac_status" >&5
++ echo "$as_me:16537: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10757,7 +10336,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16522,6 +16444,16 @@
+@@ -16522,6 +16621,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -10774,7 +10353,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16532,6 +16464,10 @@
+@@ -16532,6 +16641,10 @@
with_gnu_ld=no
fi
;;
@@ -10785,7 +10364,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16542,6 +16478,27 @@
+@@ -16542,6 +16655,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -10813,7 +10392,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16579,7 +16536,7 @@
+@@ -16579,7 +16713,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -10822,7 +10401,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16589,13 +16546,13 @@
+@@ -16589,13 +16723,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -10839,7 +10418,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16604,23 +16561,70 @@
+@@ -16604,23 +16738,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -10916,7 +10495,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16634,13 +16638,40 @@
+@@ -16634,13 +16815,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10959,7 +10538,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16650,24 +16681,19 @@
+@@ -16650,24 +16858,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10991,7 +10570,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16679,7 +16705,7 @@
+@@ -16679,7 +16882,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -11000,7 +10579,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16701,9 +16727,21 @@
+@@ -16701,9 +16904,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -11024,7 +10603,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16720,7 +16758,7 @@
+@@ -16720,7 +16935,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -11033,7 +10612,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`
-@@ -16739,8 +16777,12 @@
+@@ -16739,8 +16954,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -11046,7 +10625,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16748,22 +16790,23 @@
+@@ -16748,22 +16967,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -11077,7 +10656,7 @@
program main
end
-@@ -16777,8 +16820,7 @@
+@@ -16777,8 +16997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11087,7 +10666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16805,14 +16847,13 @@
+@@ -16805,14 +17024,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11105,7 +10684,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16829,8 +16870,7 @@
+@@ -16829,8 +17047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11115,7 +10694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16862,13 +16902,11 @@
+@@ -16862,13 +17079,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -11132,7 +10711,7 @@
fi
fi
;;
-@@ -16881,7 +16919,7 @@
+@@ -16881,7 +17096,7 @@
ld_shlibs_F77=no
;;
@@ -11141,7 +10720,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16891,68 +16929,68 @@
+@@ -16891,68 +17106,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -11254,7 +10833,7 @@
fi
;;
-@@ -16986,8 +17024,8 @@
+@@ -16986,8 +17201,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11265,7 +10844,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16995,7 +17033,7 @@
+@@ -16995,7 +17210,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -11274,7 +10853,7 @@
else
archive_cmds_F77='$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
-@@ -17009,47 +17047,62 @@
+@@ -17009,47 +17224,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -11361,7 +10940,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17063,7 +17116,7 @@
+@@ -17063,7 +17293,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -11370,7 +10949,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17073,7 +17126,7 @@
+@@ -17073,7 +17303,7 @@
link_all_deplibs_F77=yes
;;
@@ -11379,7 +10958,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17096,7 +17149,8 @@
+@@ -17096,7 +17326,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -11389,7 +10968,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17106,7 +17160,7 @@
+@@ -17106,7 +17337,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -11398,7 +10977,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17117,14 +17171,14 @@
+@@ -17117,14 +17348,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -11415,7 +10994,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$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'
-@@ -17136,13 +17190,13 @@
+@@ -17136,13 +17367,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -11431,7 +11010,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17150,21 +17204,15 @@
+@@ -17150,21 +17381,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -11457,7 +11036,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$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'
-@@ -17173,8 +17221,18 @@
+@@ -17173,8 +17398,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11478,7 +11057,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17183,7 +17241,7 @@
+@@ -17183,7 +17418,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -11487,7 +11066,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17231,36 +17289,45 @@
+@@ -17231,36 +17466,45 @@
fi
;;
@@ -11554,7 +11133,7 @@
;;
uts4*)
-@@ -17279,11 +17346,6 @@
+@@ -17279,11 +17523,6 @@
echo "${ECHO_T}$ld_shlibs_F77" >&6
test "$ld_shlibs_F77" = no && can_build_shared=no
@@ -11566,7 +11145,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17316,6 +17378,7 @@
+@@ -17316,6 +17555,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -11574,7 +11153,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17351,7 +17414,7 @@
+@@ -17351,7 +17591,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -11583,7 +11162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17361,7 +17424,20 @@
+@@ -17361,7 +17601,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11605,7 +11184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17426,7 +17502,7 @@
+@@ -17426,7 +17679,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11614,7 +11193,7 @@
;;
beos*)
-@@ -17435,7 +17511,7 @@
+@@ -17435,7 +17688,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -11623,7 +11202,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17451,7 +17527,7 @@
+@@ -17451,7 +17704,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -11632,7 +11211,7 @@
need_version=no
need_lib_prefix=no
-@@ -17463,7 +17539,8 @@
+@@ -17463,7 +17716,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -11642,7 +11221,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17493,7 +17570,7 @@
+@@ -17493,7 +17747,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11651,7 +11230,7 @@
;;
esac
;;
-@@ -17516,7 +17593,7 @@
+@@ -17516,7 +17770,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -11660,7 +11239,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17539,20 +17616,17 @@
+@@ -17539,20 +17793,17 @@
dynamic_linker=no
;;
@@ -11692,7 +11271,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17570,14 +17644,19 @@
+@@ -17570,14 +17821,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -11714,7 +11293,7 @@
esac
;;
-@@ -17597,9 +17676,9 @@
+@@ -17597,9 +17853,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -11726,7 +11305,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17614,7 +17693,7 @@
+@@ -17614,7 +17870,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -11735,7 +11314,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17625,7 +17704,7 @@
+@@ -17625,7 +17881,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -11744,7 +11323,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17637,6 +17716,18 @@
+@@ -17637,6 +17893,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -11763,7 +11342,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17680,29 +17771,26 @@
+@@ -17680,29 +17948,26 @@
;;
# This must be Linux ELF.
@@ -11800,7 +11379,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,
-@@ -17712,6 +17800,18 @@
+@@ -17712,6 +17977,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11819,7 +11398,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17721,7 +17821,7 @@
+@@ -17721,7 +17998,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -11828,7 +11407,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17749,8 +17849,13 @@
+@@ -17749,8 +18026,13 @@
openbsd*)
version_type=sunos
@@ -11843,7 +11422,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
-@@ -17770,7 +17875,7 @@
+@@ -17770,7 +18052,7 @@
os2*)
libname_spec='$name'
@@ -11852,7 +11431,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17788,13 +17893,6 @@
+@@ -17788,13 +18070,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -11866,7 +11445,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17820,7 +17918,7 @@
+@@ -17820,7 +18095,7 @@
need_version=yes
;;
@@ -11875,7 +11454,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'
-@@ -17853,6 +17951,29 @@
+@@ -17853,6 +18128,29 @@
fi
;;
@@ -11905,7 +11484,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17868,12 +17989,17 @@
+@@ -17868,12 +18166,17 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
@@ -11925,7 +11504,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17905,36 +18031,6 @@
+@@ -17905,36 +18208,6 @@
enable_fast_install=needless
fi
@@ -11962,7 +11541,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17949,7 +18045,8 @@
+@@ -17949,7 +18222,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -11972,7 +11551,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 \
-@@ -18049,6 +18146,12 @@
+@@ -18049,6 +18323,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -11985,7 +11564,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18060,6 +18163,9 @@
+@@ -18060,6 +18340,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -11995,7 +11574,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18079,7 +18185,7 @@
+@@ -18079,7 +18362,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -12004,7 +11583,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18110,7 +18216,7 @@
+@@ -18110,7 +18393,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -12013,7 +11592,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18125,7 +18231,7 @@
+@@ -18125,7 +18408,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -12022,7 +11601,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18327,7 +18433,10 @@
+@@ -18327,7 +18610,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -12034,7 +11613,7 @@
fi
-@@ -18360,26 +18469,55 @@
+@@ -18360,26 +18646,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -12091,7 +11670,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
-@@ -18406,18 +18544,20 @@
+@@ -18406,18 +18721,20 @@
# 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 \
@@ -12100,12 +11679,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18550: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18727: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18416: \$? = $ac_status" >&5
-+ echo "$as_me:18554: \$? = $ac_status" >&5
++ echo "$as_me:18731: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -12117,7 +11696,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18478,6 +18618,11 @@
+@@ -18478,6 +18795,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -12129,7 +11708,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18494,7 +18639,7 @@
+@@ -18494,7 +18816,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -12138,7 +11717,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18520,6 +18665,16 @@
+@@ -18520,6 +18842,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -12155,7 +11734,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18531,7 +18686,7 @@
+@@ -18531,7 +18863,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -12164,7 +11743,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18554,13 +18709,20 @@
+@@ -18554,13 +18886,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12187,7 +11766,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18575,15 +18737,15 @@
+@@ -18575,15 +18914,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -12209,7 +11788,7 @@
;;
sunos4*)
-@@ -18592,7 +18754,7 @@
+@@ -18592,7 +18931,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12218,7 +11797,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18605,6 +18767,17 @@
+@@ -18605,6 +18944,17 @@
fi
;;
@@ -12236,7 +11815,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18639,18 +18812,20 @@
+@@ -18639,18 +18989,20 @@
# 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 \
@@ -12245,12 +11824,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18645: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18818: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18995: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18649: \$? = $ac_status" >&5
-+ echo "$as_me:18822: \$? = $ac_status" >&5
++ echo "$as_me:18999: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -12262,7 +11841,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18671,7 +18846,7 @@
+@@ -18671,7 +19023,7 @@
fi
fi
@@ -12271,7 +11850,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18681,6 +18856,48 @@
+@@ -18681,6 +19033,48 @@
;;
esac
@@ -12320,7 +11899,7 @@
echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18693,38 +18910,36 @@
+@@ -18693,38 +19087,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -12342,12 +11921,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18712: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18922: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19099: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18716: \$? = $ac_status" >&5
-+ echo "$as_me:18926: \$? = $ac_status" >&5
++ echo "$as_me:19103: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12371,7 +11950,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18795,6 +19010,16 @@
+@@ -18795,6 +19187,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -12388,7 +11967,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18805,6 +19030,10 @@
+@@ -18805,6 +19207,10 @@
with_gnu_ld=no
fi
;;
@@ -12399,7 +11978,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18815,6 +19044,27 @@
+@@ -18815,6 +19221,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -12427,7 +12006,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18852,7 +19102,7 @@
+@@ -18852,7 +19279,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -12436,7 +12015,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18862,13 +19112,13 @@
+@@ -18862,13 +19289,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -12453,7 +12032,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18877,23 +19127,70 @@
+@@ -18877,23 +19304,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -12530,7 +12109,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18907,13 +19204,40 @@
+@@ -18907,13 +19381,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12573,7 +12152,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18923,24 +19247,19 @@
+@@ -18923,24 +19424,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12605,7 +12184,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18952,7 +19271,7 @@
+@@ -18952,7 +19448,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -12614,7 +12193,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18974,9 +19293,21 @@
+@@ -18974,9 +19470,21 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -12638,7 +12217,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18993,7 +19324,7 @@
+@@ -18993,7 +19501,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -12647,7 +12226,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`
-@@ -19012,8 +19343,12 @@
+@@ -19012,8 +19520,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -12660,7 +12239,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19021,22 +19356,23 @@
+@@ -19021,22 +19533,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -12691,7 +12270,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19060,8 +19396,7 @@
+@@ -19060,8 +19573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12701,7 +12280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19088,14 +19423,13 @@
+@@ -19088,14 +19600,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -12719,7 +12298,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19122,8 +19456,7 @@
+@@ -19122,8 +19633,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12729,7 +12308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19155,13 +19488,11 @@
+@@ -19155,13 +19665,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12746,7 +12325,7 @@
fi
fi
;;
-@@ -19174,7 +19505,7 @@
+@@ -19174,7 +19682,7 @@
ld_shlibs_GCJ=no
;;
@@ -12755,7 +12334,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19184,68 +19515,68 @@
+@@ -19184,68 +19692,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -12868,7 +12447,7 @@
fi
;;
-@@ -19279,8 +19610,8 @@
+@@ -19279,8 +19787,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12879,7 +12458,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19288,7 +19619,7 @@
+@@ -19288,7 +19796,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -12888,7 +12467,7 @@
else
archive_cmds_GCJ='$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
-@@ -19302,47 +19633,62 @@
+@@ -19302,47 +19810,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -12975,7 +12554,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19356,7 +19702,7 @@
+@@ -19356,7 +19879,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12984,7 +12563,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19366,7 +19712,7 @@
+@@ -19366,7 +19889,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -12993,7 +12572,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19389,7 +19735,8 @@
+@@ -19389,7 +19912,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -13003,7 +12582,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19399,7 +19746,7 @@
+@@ -19399,7 +19923,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -13012,7 +12591,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19410,14 +19757,14 @@
+@@ -19410,14 +19934,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -13029,7 +12608,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$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'
-@@ -19429,13 +19776,13 @@
+@@ -19429,13 +19953,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -13045,7 +12624,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19443,21 +19790,15 @@
+@@ -19443,21 +19967,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -13071,7 +12650,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$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'
-@@ -19466,8 +19807,18 @@
+@@ -19466,8 +19984,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13092,7 +12671,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19476,7 +19827,7 @@
+@@ -19476,7 +20004,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -13101,7 +12680,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19524,36 +19875,45 @@
+@@ -19524,36 +20052,45 @@
fi
;;
@@ -13168,7 +12747,7 @@
;;
uts4*)
-@@ -19572,11 +19932,6 @@
+@@ -19572,11 +20109,6 @@
echo "${ECHO_T}$ld_shlibs_GCJ" >&6
test "$ld_shlibs_GCJ" = no && can_build_shared=no
@@ -13180,7 +12759,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19609,6 +19964,7 @@
+@@ -19609,6 +20141,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -13188,7 +12767,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19644,7 +20000,7 @@
+@@ -19644,7 +20177,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -13197,7 +12776,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19654,7 +20010,20 @@
+@@ -19654,7 +20187,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13219,7 +12798,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19719,7 +20088,7 @@
+@@ -19719,7 +20265,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13228,7 +12807,7 @@
;;
beos*)
-@@ -19728,7 +20097,7 @@
+@@ -19728,7 +20274,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13237,7 +12816,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19744,7 +20113,7 @@
+@@ -19744,7 +20290,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13246,7 +12825,7 @@
need_version=no
need_lib_prefix=no
-@@ -19756,7 +20125,8 @@
+@@ -19756,7 +20302,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13256,7 +12835,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19786,7 +20156,7 @@
+@@ -19786,7 +20333,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13265,7 +12844,7 @@
;;
esac
;;
-@@ -19809,7 +20179,7 @@
+@@ -19809,7 +20356,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13274,7 +12853,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19832,20 +20202,17 @@
+@@ -19832,20 +20379,17 @@
dynamic_linker=no
;;
@@ -13306,7 +12885,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19863,14 +20230,19 @@
+@@ -19863,14 +20407,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13328,7 +12907,7 @@
esac
;;
-@@ -19890,9 +20262,9 @@
+@@ -19890,9 +20439,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13340,7 +12919,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19907,7 +20279,7 @@
+@@ -19907,7 +20456,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13349,7 +12928,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19918,7 +20290,7 @@
+@@ -19918,7 +20467,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13358,7 +12937,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19930,1107 +20302,319 @@
+@@ -19930,1107 +20479,319 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13372,9 +12951,12 @@
- version_type=irix
- fi ;;
- esac
-- need_lib_prefix=no
-- need_version=no
-- soname_spec='${libname}${release}${shared_ext}$major'
++interix3*)
++ version_type=linux
+ need_lib_prefix=no
+ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
@@ -13406,13 +12988,11 @@
-
-# This must be Linux ELF.
-linux*)
-+interix3*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
@@ -13534,8 +13114,8 @@
hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
+- ;;
+-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -13570,8 +13150,8 @@
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
-- ;;
--
+ ;;
+
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
@@ -14741,7 +14321,7 @@
fi
-@@ -21047,7 +20631,8 @@
+@@ -21047,7 +20808,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14751,7 +14331,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 \
-@@ -21147,6 +20732,12 @@
+@@ -21147,6 +20909,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14764,7 +14344,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21158,6 +20749,9 @@
+@@ -21158,6 +20926,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14774,7 +14354,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21177,7 +20771,7 @@
+@@ -21177,7 +20948,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14783,7 +14363,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21208,7 +20802,7 @@
+@@ -21208,7 +20979,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14792,7 +14372,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21223,7 +20817,7 @@
+@@ -21223,7 +20994,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -14801,7 +14381,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21425,7 +21019,10 @@
+@@ -21425,7 +21196,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -14813,7 +14393,7 @@
fi
-@@ -21464,15 +21061,42 @@
+@@ -21464,15 +21238,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14856,7 +14436,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21488,7 +21112,8 @@
+@@ -21488,7 +21289,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -14866,7 +14446,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 \
-@@ -21588,6 +21213,12 @@
+@@ -21588,6 +21390,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14879,7 +14459,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21599,6 +21230,9 @@
+@@ -21599,6 +21407,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14889,7 +14469,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21618,7 +21252,7 @@
+@@ -21618,7 +21429,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14898,7 +14478,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21649,7 +21283,7 @@
+@@ -21649,7 +21460,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14907,7 +14487,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21664,7 +21298,7 @@
+@@ -21664,7 +21475,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -14916,7 +14496,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21866,7 +21500,10 @@
+@@ -21866,7 +21677,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -14928,7 +14508,7 @@
fi
-@@ -21913,7 +21550,7 @@
+@@ -21913,7 +21727,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -14937,7 +14517,7 @@
# Prevent multiple expansion
-@@ -22238,8 +21875,7 @@
+@@ -22238,8 +22052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14947,7 +14527,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22313,9 +21949,6 @@
+@@ -22313,9 +22126,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14957,7 +14537,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22349,8 +21982,7 @@
+@@ -22349,8 +22159,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14967,7 +14547,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22454,8 +22086,7 @@
+@@ -22454,8 +22263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14977,7 +14557,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22534,9 +22165,6 @@
+@@ -22534,9 +22342,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14987,7 +14567,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22569,8 +22197,7 @@
+@@ -22569,8 +22374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14997,7 +14577,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22673,8 +22300,7 @@
+@@ -22673,8 +22477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15007,7 +14587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22764,8 +22390,7 @@
+@@ -22764,8 +22567,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15017,7 +14597,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22826,8 +22451,7 @@
+@@ -22826,8 +22628,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15027,7 +14607,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22895,8 +22519,7 @@
+@@ -22895,8 +22696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15037,7 +14617,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22962,8 +22585,7 @@
+@@ -22962,8 +22762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15047,7 +14627,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23056,8 +22678,7 @@
+@@ -23056,8 +22855,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15057,7 +14637,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23135,8 +22756,7 @@
+@@ -23135,8 +22933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15067,7 +14647,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23220,8 +22840,7 @@
+@@ -23220,8 +23017,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15077,7 +14657,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23289,8 +22908,7 @@
+@@ -23289,8 +23085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15087,7 +14667,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23385,8 +23003,7 @@
+@@ -23385,8 +23180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15097,7 +14677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23450,8 +23067,7 @@
+@@ -23450,8 +23244,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15107,7 +14687,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23546,8 +23162,7 @@
+@@ -23546,8 +23339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15117,7 +14697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23611,8 +23226,7 @@
+@@ -23611,8 +23403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15127,7 +14707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23708,8 +23322,7 @@
+@@ -23708,8 +23499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15137,7 +14717,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23773,8 +23386,7 @@
+@@ -23773,8 +23563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15147,7 +14727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23871,8 +23483,7 @@
+@@ -23871,8 +23660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15157,7 +14737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23937,8 +23548,7 @@
+@@ -23937,8 +23725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15167,7 +14747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24006,8 +23616,7 @@
+@@ -24006,8 +23793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15177,7 +14757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24158,8 +23767,7 @@
+@@ -24158,8 +23944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15187,7 +14767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24314,8 +23922,7 @@
+@@ -24314,8 +24099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15197,7 +14777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24380,8 +23987,7 @@
+@@ -24380,8 +24164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15207,7 +14787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24528,8 +24134,7 @@
+@@ -24528,8 +24311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15217,7 +14797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24684,8 +24289,7 @@
+@@ -24684,8 +24466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15227,7 +14807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24741,9 +24345,6 @@
+@@ -24741,9 +24522,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15237,7 +14817,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24777,8 +24378,7 @@
+@@ -24777,8 +24555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15247,7 +14827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24882,8 +24482,7 @@
+@@ -24882,8 +24659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15257,7 +14837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24983,8 +24582,7 @@
+@@ -24983,8 +24759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15267,7 +14847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25058,8 +24656,7 @@
+@@ -25058,8 +24833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15277,7 +14857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25122,8 +24719,7 @@
+@@ -25122,8 +24896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15287,7 +14867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25185,8 +24781,7 @@
+@@ -25185,8 +24958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15297,7 +14877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25226,8 +24821,7 @@
+@@ -25226,8 +24998,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15307,7 +14887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25283,8 +24877,7 @@
+@@ -25283,8 +25054,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15317,7 +14897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25324,8 +24917,7 @@
+@@ -25324,8 +25094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15327,7 +14907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25389,8 +24981,7 @@
+@@ -25389,8 +25158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15337,7 +14917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25421,10 +25012,8 @@
+@@ -25421,10 +25189,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15350,7 +14930,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25535,8 +25124,7 @@
+@@ -25535,8 +25301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15360,7 +14940,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25598,8 +25186,7 @@
+@@ -25598,8 +25363,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15370,7 +14950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25639,8 +25226,7 @@
+@@ -25639,8 +25403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15380,7 +14960,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25696,8 +25282,7 @@
+@@ -25696,8 +25459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15390,7 +14970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25737,8 +25322,7 @@
+@@ -25737,8 +25499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15400,7 +14980,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25802,8 +25386,7 @@
+@@ -25802,8 +25563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15410,7 +14990,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25834,10 +25417,8 @@
+@@ -25834,10 +25594,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15423,7 +15003,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25948,8 +25529,7 @@
+@@ -25948,8 +25706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15433,7 +15013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26011,8 +25591,7 @@
+@@ -26011,8 +25768,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15443,7 +15023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26052,8 +25631,7 @@
+@@ -26052,8 +25808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15453,7 +15033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26109,8 +25687,7 @@
+@@ -26109,8 +25864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15463,7 +15043,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26150,8 +25727,7 @@
+@@ -26150,8 +25904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15473,7 +15053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26215,8 +25791,7 @@
+@@ -26215,8 +25968,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15483,7 +15063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26247,10 +25822,8 @@
+@@ -26247,10 +25999,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15496,7 +15076,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26361,8 +25934,7 @@
+@@ -26361,8 +26111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15506,7 +15086,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26424,8 +25996,7 @@
+@@ -26424,8 +26173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15516,7 +15096,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26465,8 +26036,7 @@
+@@ -26465,8 +26213,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15526,7 +15106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26522,8 +26092,7 @@
+@@ -26522,8 +26269,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15536,7 +15116,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26563,8 +26132,7 @@
+@@ -26563,8 +26309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15546,7 +15126,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26628,8 +26196,7 @@
+@@ -26628,8 +26373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15556,7 +15136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26660,10 +26227,8 @@
+@@ -26660,10 +26404,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15569,7 +15149,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26782,8 +26347,7 @@
+@@ -26782,8 +26524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15579,7 +15159,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26854,8 +26418,7 @@
+@@ -26854,8 +26595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15589,7 +15169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26925,8 +26488,7 @@
+@@ -26925,8 +26665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15599,7 +15179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26988,8 +26550,7 @@
+@@ -26988,8 +26727,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15609,7 +15189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27029,8 +26590,7 @@
+@@ -27029,8 +26767,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15619,7 +15199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27086,8 +26646,7 @@
+@@ -27086,8 +26823,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15629,7 +15209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27127,8 +26686,7 @@
+@@ -27127,8 +26863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15639,7 +15219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27192,8 +26750,7 @@
+@@ -27192,8 +26927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15649,7 +15229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27224,10 +26781,8 @@
+@@ -27224,10 +26958,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15662,7 +15242,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27339,8 +26894,7 @@
+@@ -27339,8 +27071,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15672,7 +15252,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27402,8 +26956,7 @@
+@@ -27402,8 +27133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15682,7 +15262,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27443,8 +26996,7 @@
+@@ -27443,8 +27173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15692,7 +15272,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27500,8 +27052,7 @@
+@@ -27500,8 +27229,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15702,7 +15282,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27541,8 +27092,7 @@
+@@ -27541,8 +27269,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15712,7 +15292,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27606,8 +27156,7 @@
+@@ -27606,8 +27333,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15722,7 +15302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27638,10 +27187,8 @@
+@@ -27638,10 +27364,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -15735,7 +15315,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27752,8 +27299,7 @@
+@@ -27752,8 +27476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15745,7 +15325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27834,8 +27380,7 @@
+@@ -27834,8 +27557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15755,7 +15335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27935,8 +27480,7 @@
+@@ -27935,8 +27657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15765,7 +15345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28116,8 +27660,7 @@
+@@ -28116,8 +27837,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15775,7 +15355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28226,8 +27769,7 @@
+@@ -28226,8 +27946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15785,7 +15365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28451,8 +27993,7 @@
+@@ -28451,8 +28170,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15795,7 +15375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28675,8 +28216,7 @@
+@@ -28675,8 +28393,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15805,7 +15385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28752,8 +28292,7 @@
+@@ -28752,8 +28469,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15815,7 +15395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28895,8 +28434,7 @@
+@@ -28895,8 +28611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15825,7 +15405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28971,8 +28509,7 @@
+@@ -28971,8 +28686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15835,7 +15415,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29032,8 +28569,7 @@
+@@ -29032,8 +28746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15845,7 +15425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29116,8 +28652,7 @@
+@@ -29116,8 +28829,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15855,7 +15435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29210,8 +28745,7 @@
+@@ -29210,8 +28922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15865,7 +15445,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29385,8 +28919,7 @@
+@@ -29385,8 +29096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15875,7 +15455,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29484,8 +29017,7 @@
+@@ -29484,8 +29194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15885,7 +15465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29572,8 +29104,7 @@
+@@ -29572,8 +29281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15895,7 +15475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29650,8 +29181,7 @@
+@@ -29650,8 +29358,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15905,25 +15485,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29704,7 +29234,7 @@
+@@ -29704,7 +29411,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29707: $i/$j" >&5
-+ echo "configure: 29237: $i/$j" >&5
++ echo "configure: 29414: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -30002,7 +29532,7 @@
+@@ -30002,7 +29709,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30005: $i/$j" >&5
-+ echo "configure: 29535: $i/$j" >&5
++ echo "configure: 29712: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30679,8 +30209,7 @@
+@@ -30679,8 +30386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15933,43 +15513,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30839,7 +30368,7 @@
+@@ -30839,7 +30545,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30842: $i/$j" >&5
-+ echo "configure: 30371: $i/$j" >&5
++ echo "configure: 30548: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30869,7 +30398,7 @@
+@@ -30869,7 +30575,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30872: $i/$j" >&5
-+ echo "configure: 30401: $i/$j" >&5
++ echo "configure: 30578: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30887,7 +30416,7 @@
+@@ -30887,7 +30593,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30890: $i/$j" >&5
-+ echo "configure: 30419: $i/$j" >&5
++ echo "configure: 30596: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32410,7 +31939,7 @@
+@@ -32410,7 +32116,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32413: $i/$j" >&5
-+ echo "configure: 31942: $i/$j" >&5
++ echo "configure: 32119: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32670,8 +32199,7 @@
+@@ -32670,8 +32376,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15979,7 +15559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32766,8 +32294,7 @@
+@@ -32766,8 +32471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15989,7 +15569,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32860,8 +32387,7 @@
+@@ -32860,8 +32564,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15999,16 +15579,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32934,7 +32460,7 @@
+@@ -32934,7 +32637,7 @@
do
for j in qsql.html;
do
- echo "configure: 32937: $i/$j" >&5
-+ echo "configure: 32463: $i/$j" >&5
++ echo "configure: 32640: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -33184,6 +32710,13 @@
+@@ -33184,6 +32887,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -16022,7 +15602,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -33792,6 +33325,9 @@
+@@ -33792,6 +33502,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -16032,7 +15612,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -34138,11 +33674,6 @@
+@@ -34138,11 +33851,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -16044,7 +15624,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -34181,6 +33712,12 @@
+@@ -34181,6 +33889,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -16057,7 +15637,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-@@ -34792,8 +34329,7 @@
+@@ -34792,8 +34506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16067,7 +15647,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34888,8 +34424,7 @@
+@@ -34888,8 +34601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16077,7 +15657,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34982,8 +34517,7 @@
+@@ -34982,8 +34694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16087,7 +15667,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35074,8 +34608,7 @@
+@@ -35074,8 +34785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16097,7 +15677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35365,6 +34898,13 @@
+@@ -35365,6 +35075,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -16111,7 +15691,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36040,6 +35580,9 @@
+@@ -36040,6 +35757,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -16121,7 +15701,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -36395,11 +35938,6 @@
+@@ -36395,11 +36115,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -16133,7 +15713,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -36438,6 +35976,12 @@
+@@ -36438,6 +36153,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -16150,7 +15730,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(libkipi-0.1.3, "3.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(libkipi-0.1.4, "3.5.2") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -16448,15 +16028,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +368,7 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- #>- METASOURCES = AUTO
--INCLUDES = $(LIBKIPI_CFLAGS) $(all_includes)
-+INCLUDES = -I.. -I$(srcdir)/.. $(LIBKIPI_CFLAGS) $(all_includes)
- KDE_ICON = kipi
- lib_LTLIBRARIES = libkipi.la
- libkipi_la_SOURCES = interface.cpp plugin.cpp pluginloader.cpp KDStream.cpp imageinfo.cpp imagecollection.cpp \
@@ -398,7 +399,7 @@
.SUFFIXES:
More information about the pkg-kde-commits
mailing list