rev 3083 - in trunk/packages/koffice/debian: . patches
Isaac Clerencia
isaac at costa.debian.org
Fri Feb 3 21:20:04 UTC 2006
Author: isaac
Date: 2006-02-03 21:19:58 +0000 (Fri, 03 Feb 2006)
New Revision: 3083
Modified:
trunk/packages/koffice/debian/changelog
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update changelog + buildprep
Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog 2006-02-03 21:16:07 UTC (rev 3082)
+++ trunk/packages/koffice/debian/changelog 2006-02-03 21:19:58 UTC (rev 3083)
@@ -1,5 +1,15 @@
-koffice (1:1.4.90.1-2) experimental; urgency=low
+koffice (1:1.4.90.2-2) experimental; urgency=low
+ * Ship libkeximigrate.{so,la} in koffice-dev (required to build keximdb
+ driver)
+
+ -- Isaac Clerencia <isaac at debian.org> Fri, 3 Feb 2006 22:15:14 +0100
+
+koffice (1:1.4.90.2-1) experimental; urgency=low
+
+ * New upstream SVN pull (r504797), fixes graphical artifact in kword and
+ kpresenter and a crash when closing a document in kpresenter
+
* Don't provide x-raw.desktop as it's already provided by digikam
-- Isaac Clerencia <isaac at debian.org> Wed, 1 Feb 2006 09:04:59 +0100
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-02-03 21:16:07 UTC (rev 3082)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-02-03 21:19:58 UTC (rev 3083)
@@ -82,7 +82,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5928,30 +5916,15 @@
+@@ -5935,30 +5923,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -118,7 +118,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6011,7 +5984,7 @@
+@@ -6018,7 +5991,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -127,7 +127,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6061,7 +6034,7 @@
+@@ -6068,7 +6041,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -136,7 +136,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6081,7 +6054,7 @@
+@@ -6088,7 +6061,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -145,7 +145,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6129,6 +6102,8 @@
+@@ -6136,6 +6109,8 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -154,7 +154,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6174,6 +6149,48 @@
+@@ -6181,6 +6156,48 @@
])# _LT_AC_SYS_COMPILER
@@ -203,7 +203,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6246,15 +6263,15 @@
+@@ -6253,15 +6270,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -222,7 +222,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6423,14 +6440,13 @@
+@@ -6430,14 +6447,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -239,7 +239,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6442,7 +6458,6 @@
+@@ -6449,7 +6465,6 @@
esac
;;
*64-bit*)
@@ -247,7 +247,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6507,7 +6522,7 @@
+@@ -6514,7 +6529,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 \
@@ -256,7 +256,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6517,8 +6532,10 @@
+@@ -6524,8 +6539,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
@@ -269,7 +269,7 @@
$2=yes
fi
fi
-@@ -6544,11 +6561,16 @@
+@@ -6551,11 +6568,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
@@ -287,7 +287,7 @@
else
$2=yes
fi
-@@ -6572,7 +6594,7 @@
+@@ -6579,7 +6601,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -296,7 +296,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6601,20 +6623,53 @@
+@@ -6608,20 +6630,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -356,7 +356,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.
-@@ -6710,7 +6765,7 @@
+@@ -6717,7 +6772,7 @@
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -365,7 +365,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6764,7 +6819,7 @@
+@@ -6771,7 +6826,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -374,7 +374,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6853,20 +6908,13 @@
+@@ -6860,20 +6915,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -396,7 +396,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6878,13 +6926,18 @@
+@@ -6885,13 +6933,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -419,7 +419,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6943,8 +6996,8 @@
+@@ -6950,8 +7003,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)" || \
@@ -430,7 +430,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7001,7 +7054,7 @@
+@@ -7008,7 +7061,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -439,7 +439,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7014,7 +7067,7 @@
+@@ -7021,7 +7074,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -448,7 +448,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7024,7 +7077,20 @@
+@@ -7031,7 +7084,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -470,7 +470,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7089,7 +7155,7 @@
+@@ -7096,7 +7162,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -479,7 +479,7 @@
;;
beos*)
-@@ -7098,7 +7164,7 @@
+@@ -7105,7 +7171,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -488,7 +488,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7114,7 +7180,7 @@
+@@ -7121,7 +7187,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -497,7 +497,7 @@
need_version=no
need_lib_prefix=no
-@@ -7126,7 +7192,8 @@
+@@ -7133,7 +7199,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -507,7 +507,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7156,7 +7223,7 @@
+@@ -7163,7 +7230,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -516,7 +516,7 @@
;;
esac
;;
-@@ -7179,7 +7246,7 @@
+@@ -7186,7 +7253,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -525,7 +525,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"`
-@@ -7202,7 +7269,7 @@
+@@ -7209,7 +7276,7 @@
dynamic_linker=no
;;
@@ -534,7 +534,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7214,8 +7281,17 @@
+@@ -7221,8 +7288,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -554,7 +554,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7233,7 +7309,7 @@
+@@ -7240,7 +7316,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -563,7 +563,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7260,9 +7336,9 @@
+@@ -7267,9 +7343,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -575,7 +575,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7277,7 +7353,7 @@
+@@ -7284,7 +7360,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -584,7 +584,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7288,7 +7364,7 @@
+@@ -7295,7 +7371,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -593,7 +593,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7350,22 +7426,19 @@
+@@ -7357,22 +7433,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -622,7 +622,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,
-@@ -7375,6 +7448,30 @@
+@@ -7382,6 +7455,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -653,7 +653,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7384,7 +7481,7 @@
+@@ -7391,7 +7488,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -662,7 +662,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7413,7 +7510,11 @@
+@@ -7420,7 +7517,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -675,7 +675,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
-@@ -7433,7 +7534,7 @@
+@@ -7440,7 +7541,7 @@
os2*)
libname_spec='$name'
@@ -684,7 +684,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7579,7 +7680,9 @@
+@@ -7586,7 +7687,9 @@
case $tagname in
CXX)
@@ -695,7 +695,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7641,7 +7744,7 @@
+@@ -7648,7 +7751,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -704,7 +704,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7815,7 +7918,7 @@
+@@ -7822,7 +7925,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -713,7 +713,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
-@@ -7925,7 +8028,7 @@
+@@ -7932,7 +8035,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,
@@ -722,7 +722,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'*)
-@@ -7957,7 +8060,7 @@
+@@ -7964,7 +8067,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,
@@ -731,7 +731,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7984,6 +8087,15 @@
+@@ -7991,6 +8094,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -747,7 +747,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8017,44 +8129,36 @@
+@@ -8024,44 +8136,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -803,7 +803,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8070,7 +8174,7 @@
+@@ -8077,7 +8181,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -812,7 +812,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
-@@ -8087,42 +8191,21 @@
+@@ -8094,42 +8198,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -862,7 +862,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
-@@ -8141,19 +8224,14 @@
+@@ -8148,19 +8231,14 @@
;;
openbsd*)
@@ -884,7 +884,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8163,7 +8241,6 @@
+@@ -8170,7 +8248,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -892,7 +892,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8271,13 +8348,13 @@
+@@ -8278,13 +8355,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -913,7 +913,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8296,13 +8373,13 @@
+@@ -8303,13 +8380,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -934,7 +934,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
-@@ -8340,10 +8417,21 @@
+@@ -8347,10 +8424,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -957,7 +957,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8416,6 +8504,10 @@
+@@ -8423,6 +8511,10 @@
_LT_AC_SYS_COMPILER
@@ -968,7 +968,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8429,7 +8521,7 @@
+@@ -8436,7 +8528,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -977,7 +977,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8470,7 +8562,7 @@
+@@ -8477,7 +8569,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -986,7 +986,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8479,48 +8571,11 @@
+@@ -8486,48 +8578,11 @@
fi
;;
@@ -1037,7 +1037,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8545,7 +8600,7 @@
+@@ -8552,7 +8607,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1046,7 +1046,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8574,7 +8629,7 @@
+@@ -8581,7 +8636,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1055,7 +1055,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8589,6 +8644,10 @@
+@@ -8596,6 +8651,10 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1066,7 +1066,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8610,7 +8669,7 @@
+@@ -8617,7 +8676,7 @@
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1075,7 +1075,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8628,8 +8687,8 @@
+@@ -8635,8 +8694,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
@@ -1086,7 +1086,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8655,7 +8714,7 @@
+@@ -8662,7 +8721,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.
@@ -1095,7 +1095,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8685,8 +8744,22 @@
+@@ -8692,8 +8751,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1120,7 +1120,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8703,7 +8776,7 @@
+@@ -8710,7 +8783,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1129,7 +1129,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`
-@@ -8724,6 +8797,9 @@
+@@ -8731,6 +8804,9 @@
fi
esac
shared_flag='-shared'
@@ -1139,7 +1139,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8732,15 +8808,16 @@
+@@ -8739,15 +8815,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1160,7 +1160,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.
-@@ -8749,13 +8826,12 @@
+@@ -8756,13 +8833,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1176,7 +1176,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8769,8 +8845,8 @@
+@@ -8776,8 +8852,8 @@
# Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -1187,7 +1187,7 @@
fi
fi
;;
-@@ -8783,16 +8859,17 @@
+@@ -8790,16 +8866,17 @@
esac
;;
@@ -1207,7 +1207,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
-@@ -8801,70 +8878,81 @@
+@@ -8808,70 +8885,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1341,7 +1341,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8875,14 +8963,14 @@
+@@ -8882,14 +8970,14 @@
;;
esac
;;
@@ -1358,7 +1358,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8899,12 +8987,12 @@
+@@ -8906,12 +8994,12 @@
# location of the library.
case $cc_basename in
@@ -1374,7 +1374,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8913,11 +9001,11 @@
+@@ -8920,11 +9008,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.
@@ -1388,7 +1388,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8927,7 +9015,7 @@
+@@ -8934,7 +9022,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1397,7 +1397,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8943,7 +9031,7 @@
+@@ -8950,7 +9038,7 @@
;;
esac
fi
@@ -1406,7 +1406,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8964,17 +9052,17 @@
+@@ -8971,17 +9059,17 @@
esac
case $cc_basename in
@@ -1428,7 +1428,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8990,12 +9078,12 @@
+@@ -8997,12 +9085,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1443,7 +1443,7 @@
;;
esac
fi
-@@ -9008,9 +9096,9 @@
+@@ -9015,9 +9103,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -1455,7 +1455,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9021,9 +9109,9 @@
+@@ -9028,9 +9116,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1467,7 +1467,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9034,14 +9122,14 @@
+@@ -9041,14 +9129,14 @@
;;
linux*)
case $cc_basename in
@@ -1485,7 +1485,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9059,20 +9147,44 @@
+@@ -9066,20 +9154,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1536,7 +1536,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9100,7 +9212,7 @@
+@@ -9107,7 +9219,7 @@
;;
mvs*)
case $cc_basename in
@@ -1545,7 +1545,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9110,7 +9222,7 @@
+@@ -9117,7 +9229,7 @@
;;
esac
;;
@@ -1554,7 +1554,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=
-@@ -9121,15 +9233,31 @@
+@@ -9128,15 +9240,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::"'
;;
@@ -1588,7 +1588,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9139,14 +9267,14 @@
+@@ -9146,14 +9274,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1606,7 +1606,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9164,7 +9292,7 @@
+@@ -9171,7 +9299,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1615,7 +1615,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9183,13 +9311,13 @@
+@@ -9190,13 +9318,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1631,7 +1631,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9198,17 +9326,17 @@
+@@ -9205,17 +9333,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1653,7 +1653,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9227,7 +9355,7 @@
+@@ -9234,7 +9362,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1662,7 +1662,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9251,7 +9379,7 @@
+@@ -9258,7 +9386,7 @@
sco*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case $cc_basename in
@@ -1671,7 +1671,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9263,12 +9391,12 @@
+@@ -9270,12 +9398,12 @@
;;
sunos4*)
case $cc_basename in
@@ -1686,7 +1686,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9281,36 +9409,33 @@
+@@ -9288,36 +9416,33 @@
;;
solaris*)
case $cc_basename in
@@ -1735,7 +1735,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9318,9 +9443,9 @@
+@@ -9325,9 +9450,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1747,7 +1747,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9330,9 +9455,9 @@
+@@ -9337,9 +9462,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
@@ -1759,7 +1759,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9341,9 +9466,9 @@
+@@ -9348,9 +9473,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1771,7 +1771,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9361,7 +9486,7 @@
+@@ -9368,7 +9493,7 @@
;;
tandem*)
case $cc_basename in
@@ -1780,7 +1780,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9471,7 +9596,7 @@
+@@ -9478,7 +9603,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.
@@ -1789,7 +1789,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9511,7 +9636,7 @@
+@@ -9518,7 +9643,7 @@
fi
;;
@@ -1798,7 +1798,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9547,6 +9672,21 @@
+@@ -9554,6 +9679,21 @@
$rm -f confest.$objext
@@ -1820,7 +1820,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9597,12 +9737,16 @@
+@@ -9604,12 +9744,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1838,7 +1838,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9612,7 +9756,7 @@
+@@ -9619,7 +9763,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1847,7 +1847,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9620,8 +9764,10 @@
+@@ -9627,8 +9771,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1860,7 +1860,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9672,20 +9818,27 @@
+@@ -9679,20 +9825,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1889,7 +1889,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
-@@ -9732,11 +9885,16 @@
+@@ -9739,11 +9892,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1906,7 +1906,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9762,11 +9920,12 @@
+@@ -9769,11 +9927,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1921,7 +1921,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 \
-@@ -9816,7 +9975,7 @@
+@@ -9823,7 +9982,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1930,7 +1930,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9882,11 +10041,11 @@
+@@ -9889,11 +10048,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1944,7 +1944,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9917,6 +10076,12 @@
+@@ -9924,6 +10083,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -1957,7 +1957,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9947,7 +10112,7 @@
+@@ -9954,7 +10119,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1966,7 +1966,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9978,7 +10143,7 @@
+@@ -9985,7 +10150,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1975,7 +1975,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9993,7 +10158,7 @@
+@@ -10000,7 +10165,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -1984,7 +1984,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10222,7 +10387,10 @@
+@@ -10229,7 +10394,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.
@@ -1996,7 +1996,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10264,9 +10432,6 @@
+@@ -10271,9 +10439,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2006,7 +2006,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'"
-@@ -10288,6 +10453,13 @@
+@@ -10295,6 +10460,13 @@
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'"
;;
@@ -2020,7 +2020,7 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10295,7 +10467,7 @@
+@@ -10302,7 +10474,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -2029,7 +2029,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10313,14 +10485,17 @@
+@@ -10320,14 +10492,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2049,7 +2049,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10484,7 +10659,7 @@
+@@ -10491,7 +10666,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2058,7 +2058,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10509,18 +10684,28 @@
+@@ -10516,18 +10691,28 @@
;;
chorus*)
case $cc_basename in
@@ -2090,7 +2090,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10528,22 +10713,22 @@
+@@ -10535,22 +10720,22 @@
;;
esac
;;
@@ -2117,7 +2117,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10558,7 +10743,7 @@
+@@ -10565,7 +10750,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -2126,7 +2126,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.
-@@ -10569,18 +10754,24 @@
+@@ -10576,18 +10761,24 @@
;;
linux*)
case $cc_basename in
@@ -2155,7 +2155,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10597,25 +10788,25 @@
+@@ -10604,25 +10795,25 @@
;;
mvs*)
case $cc_basename in
@@ -2186,7 +2186,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
-@@ -10631,7 +10822,7 @@
+@@ -10638,7 +10829,7 @@
;;
sco*)
case $cc_basename in
@@ -2195,7 +2195,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
*)
-@@ -10640,13 +10831,13 @@
+@@ -10647,13 +10838,13 @@
;;
solaris*)
case $cc_basename in
@@ -2211,7 +2211,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10656,12 +10847,12 @@
+@@ -10663,12 +10854,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2226,7 +2226,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10671,7 +10862,7 @@
+@@ -10678,7 +10869,7 @@
;;
tandem*)
case $cc_basename in
@@ -2235,7 +2235,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10742,7 +10933,7 @@
+@@ -10749,7 +10940,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2244,7 +2244,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10768,6 +10959,16 @@
+@@ -10775,6 +10966,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2261,7 +2261,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10779,7 +10980,7 @@
+@@ -10786,7 +10987,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.
@@ -2270,7 +2270,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10803,12 +11004,19 @@
+@@ -10810,12 +11011,19 @@
;;
linux*)
@@ -2291,7 +2291,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10829,9 +11037,14 @@
+@@ -10836,9 +11044,14 @@
;;
solaris*)
@@ -2307,7 +2307,7 @@
;;
sunos4*)
-@@ -10853,6 +11066,11 @@
+@@ -10860,6 +11073,11 @@
fi
;;
@@ -2319,7 +2319,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10880,7 +11098,7 @@
+@@ -10887,7 +11105,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2328,7 +2328,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10913,7 +11131,10 @@
+@@ -10920,7 +11138,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2340,7 +2340,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10939,7 +11160,7 @@
+@@ -10946,7 +11167,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2349,7 +2349,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*
-@@ -10956,7 +11177,8 @@
+@@ -10963,7 +11184,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2359,7 +2359,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10976,6 +11198,27 @@
+@@ -10983,6 +11205,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2387,7 +2387,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11013,7 +11256,7 @@
+@@ -11020,7 +11263,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
@@ -2396,7 +2396,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11023,13 +11266,13 @@
+@@ -11030,13 +11273,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'
@@ -2413,7 +2413,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
-@@ -11038,19 +11281,51 @@
+@@ -11045,19 +11288,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2470,7 +2470,7 @@
fi
;;
-@@ -11068,8 +11343,8 @@
+@@ -11075,8 +11350,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2481,7 +2481,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11084,24 +11359,19 @@
+@@ -11091,24 +11366,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2513,7 +2513,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11135,9 +11405,20 @@
+@@ -11142,9 +11412,20 @@
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
@@ -2536,7 +2536,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11154,7 +11435,7 @@
+@@ -11161,7 +11442,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2545,7 +2545,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`
-@@ -11175,6 +11456,9 @@
+@@ -11182,6 +11463,9 @@
fi
esac
shared_flag='-shared'
@@ -2555,7 +2555,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11183,29 +11467,29 @@
+@@ -11190,29 +11474,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2594,7 +2594,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11219,8 +11503,8 @@
+@@ -11226,8 +11510,8 @@
# Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -2605,7 +2605,7 @@
fi
fi
;;
-@@ -11233,7 +11517,7 @@
+@@ -11240,7 +11524,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2614,7 +2614,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11243,69 +11527,69 @@
+@@ -11250,69 +11534,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2730,7 +2730,7 @@
;;
dgux*)
-@@ -11338,8 +11622,8 @@
+@@ -11345,8 +11629,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2741,7 +2741,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
-@@ -11347,7 +11631,7 @@
+@@ -11354,7 +11638,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2750,7 +2750,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
-@@ -11363,16 +11647,16 @@
+@@ -11370,16 +11654,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2771,7 +2771,7 @@
hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -11382,7 +11666,7 @@
+@@ -11389,7 +11673,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -2780,7 +2780,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11415,7 +11699,7 @@
+@@ -11422,7 +11706,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2789,7 +2789,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'
-@@ -11425,7 +11709,7 @@
+@@ -11432,7 +11716,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -2798,7 +2798,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
-@@ -11448,7 +11732,8 @@
+@@ -11455,7 +11739,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
@@ -2808,7 +2808,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11458,7 +11743,7 @@
+@@ -11465,7 +11750,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2817,7 +2817,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11469,14 +11754,14 @@
+@@ -11476,14 +11761,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
@@ -2834,7 +2834,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'
-@@ -11488,13 +11773,13 @@
+@@ -11495,13 +11780,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}\*'
@@ -2850,7 +2850,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11513,10 +11798,12 @@
+@@ -11520,10 +11805,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2865,7 +2865,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'
-@@ -11525,8 +11812,18 @@
+@@ -11532,8 +11819,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2886,7 +2886,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11535,7 +11832,7 @@
+@@ -11542,7 +11839,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.
@@ -2895,7 +2895,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11595,9 +11892,9 @@
+@@ -11602,9 +11899,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2907,7 +2907,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11655,7 +11952,7 @@
+@@ -11662,7 +11959,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2916,7 +2916,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11789,7 +12086,7 @@
+@@ -11796,7 +12093,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
@@ -3095,7 +3095,7 @@
unset CDPATH
-@@ -6653,183 +6680,6 @@
+@@ -6746,183 +6773,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3279,7 +3279,7 @@
fi
-@@ -7004,7 +6854,7 @@
+@@ -7097,7 +6947,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
@@ -3288,7 +3288,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7109,7 +6959,7 @@
+@@ -7202,7 +7052,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,
@@ -3297,7 +3297,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'*)
-@@ -7143,7 +6993,7 @@
+@@ -7236,7 +7086,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3306,7 +3306,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7173,6 +7023,15 @@
+@@ -7266,6 +7116,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3322,7 +3322,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7259,44 +7118,36 @@
+@@ -7352,44 +7211,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3377,7 +3377,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7312,7 +7163,7 @@
+@@ -7405,7 +7256,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3386,7 +3386,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
-@@ -7329,42 +7180,21 @@
+@@ -7422,42 +7273,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3436,7 +3436,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
-@@ -7383,19 +7213,14 @@
+@@ -7476,19 +7306,14 @@
;;
openbsd*)
@@ -3458,7 +3458,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7405,7 +7230,6 @@
+@@ -7498,7 +7323,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3466,16 +3466,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7482,7 +7306,7 @@
+@@ -7575,7 +7399,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7485 "configure"' > conftest.$ac_ext
-+ echo '#line 7309 "configure"' > conftest.$ac_ext
+- echo '#line 7578 "configure"' > conftest.$ac_ext
++ echo '#line 7402 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7525,14 +7349,13 @@
+@@ -7618,14 +7442,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3492,7 +3492,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7544,7 +7367,6 @@
+@@ -7637,7 +7460,6 @@
esac
;;
*64-bit*)
@@ -3500,7 +3500,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -8031,6 +7853,243 @@
+@@ -8124,6 +7946,243 @@
done
@@ -3744,16 +3744,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'
-@@ -8123,7 +8182,7 @@
+@@ -8216,7 +8275,7 @@
# Provide some information about the compiler.
--echo "$as_me:8126:" \
-+echo "$as_me:8185:" \
+-echo "$as_me:8219:" \
++echo "$as_me:8278:" \
"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
-@@ -8276,7 +8335,7 @@
+@@ -8369,7 +8428,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -3762,7 +3762,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8305,20 +8364,53 @@
+@@ -8398,20 +8457,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3822,7 +3822,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.
-@@ -8355,9 +8447,6 @@
+@@ -8448,9 +8540,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -3832,7 +3832,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'"
-@@ -8379,6 +8468,13 @@
+@@ -8472,6 +8561,13 @@
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'"
;;
@@ -3846,7 +3846,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8386,7 +8482,7 @@
+@@ -8479,7 +8575,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -3855,7 +3855,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8404,14 +8500,17 @@
+@@ -8497,14 +8593,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3875,7 +3875,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8573,7 +8672,7 @@
+@@ -8666,7 +8765,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -3884,7 +3884,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8593,7 +8692,7 @@
+@@ -8686,7 +8785,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -3893,7 +3893,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8878,6 +8977,17 @@
+@@ -8971,6 +9070,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -3911,7 +3911,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8903,7 +9013,7 @@
+@@ -8996,7 +9106,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -3920,7 +3920,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
-@@ -8965,7 +9075,7 @@
+@@ -9058,7 +9168,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -3929,7 +3929,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
-@@ -9064,6 +9174,20 @@
+@@ -9157,6 +9267,20 @@
compiler=$CC
@@ -3950,7 +3950,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9100,11 +9224,16 @@
+@@ -9193,11 +9317,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -3968,7 +3968,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9150,18 +9279,20 @@
+@@ -9243,18 +9372,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 \
@@ -3976,13 +3976,13 @@
+ -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:9156: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9285: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9249: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9160: \$? = $ac_status" >&5
-+ echo "$as_me:9289: \$? = $ac_status" >&5
+- echo "$as_me:9253: \$? = $ac_status" >&5
++ echo "$as_me:9382: \$? = $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
@@ -3994,7 +3994,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9238,7 +9369,7 @@
+@@ -9331,7 +9462,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4003,7 +4003,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9264,6 +9395,16 @@
+@@ -9357,6 +9488,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4020,7 +4020,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9275,7 +9416,7 @@
+@@ -9368,7 +9509,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.
@@ -4029,7 +4029,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9299,12 +9440,19 @@
+@@ -9392,12 +9533,19 @@
;;
linux*)
@@ -4050,7 +4050,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9325,9 +9473,14 @@
+@@ -9418,9 +9566,14 @@
;;
solaris*)
@@ -4066,7 +4066,7 @@
;;
sunos4*)
-@@ -9349,6 +9502,11 @@
+@@ -9442,6 +9595,11 @@
fi
;;
@@ -4078,7 +4078,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9383,18 +9541,20 @@
+@@ -9476,18 +9634,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 \
@@ -4086,13 +4086,13 @@
+ -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:9389: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9640: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9393: \$? = $ac_status" >&5
-+ echo "$as_me:9551: \$? = $ac_status" >&5
+- echo "$as_me:9486: \$? = $ac_status" >&5
++ echo "$as_me:9644: \$? = $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
@@ -4104,7 +4104,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9415,7 +9575,7 @@
+@@ -9508,7 +9668,7 @@
fi
fi
@@ -4113,7 +4113,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9437,38 +9597,36 @@
+@@ -9530,38 +9690,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4134,13 +4134,13 @@
+ -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:9456: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9609: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9549: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9702: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9460: \$? = $ac_status" >&5
-+ echo "$as_me:9613: \$? = $ac_status" >&5
+- echo "$as_me:9553: \$? = $ac_status" >&5
++ echo "$as_me:9706: \$? = $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
@@ -4164,7 +4164,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9539,6 +9697,16 @@
+@@ -9632,6 +9790,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4181,7 +4181,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9559,6 +9727,27 @@
+@@ -9652,6 +9820,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4209,7 +4209,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9596,7 +9785,7 @@
+@@ -9689,7 +9878,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4218,7 +4218,7 @@
else
ld_shlibs=no
fi
-@@ -9606,13 +9795,13 @@
+@@ -9699,13 +9888,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'
@@ -4235,7 +4235,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
-@@ -9621,19 +9810,51 @@
+@@ -9714,19 +9903,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4291,7 +4291,7 @@
fi
;;
-@@ -9651,8 +9872,8 @@
+@@ -9744,8 +9965,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4302,7 +4302,7 @@
else
ld_shlibs=no
fi
-@@ -9667,24 +9888,19 @@
+@@ -9760,24 +9981,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4334,7 +4334,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9718,9 +9934,20 @@
+@@ -9811,9 +10027,20 @@
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
@@ -4357,7 +4357,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9737,7 +9964,7 @@
+@@ -9830,7 +10057,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4366,7 +4366,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`
-@@ -9758,6 +9985,9 @@
+@@ -9851,6 +10078,9 @@
fi
esac
shared_flag='-shared'
@@ -4376,7 +4376,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9766,21 +9996,22 @@
+@@ -9859,21 +10089,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4404,7 +4404,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9831,14 +10062,13 @@
+@@ -9924,14 +10155,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4422,7 +4422,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9902,8 +10132,8 @@
+@@ -9995,8 +10225,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4433,7 +4433,7 @@
fi
fi
;;
-@@ -9916,7 +10146,7 @@
+@@ -10009,7 +10239,7 @@
ld_shlibs=no
;;
@@ -4442,7 +4442,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9926,13 +10156,13 @@
+@@ -10019,13 +10249,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4459,7 +4459,7 @@
# 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.
-@@ -9942,52 +10172,52 @@
+@@ -10035,52 +10265,52 @@
;;
darwin* | rhapsody*)
@@ -4552,7 +4552,7 @@
fi
;;
-@@ -10021,8 +10251,8 @@
+@@ -10114,8 +10344,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4563,7 +4563,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10030,7 +10260,7 @@
+@@ -10123,7 +10353,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4572,7 +4572,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
-@@ -10046,16 +10276,16 @@
+@@ -10139,16 +10369,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4593,7 +4593,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10065,7 +10295,7 @@
+@@ -10158,7 +10388,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -4602,7 +4602,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10098,7 +10328,7 @@
+@@ -10191,7 +10421,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4611,7 +4611,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'
-@@ -10108,7 +10338,7 @@
+@@ -10201,7 +10431,7 @@
link_all_deplibs=yes
;;
@@ -4620,7 +4620,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10131,7 +10361,8 @@
+@@ -10224,7 +10454,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
@@ -4630,7 +4630,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10141,7 +10372,7 @@
+@@ -10234,7 +10465,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4639,7 +4639,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10152,14 +10383,14 @@
+@@ -10245,14 +10476,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4656,7 +4656,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'
-@@ -10171,13 +10402,13 @@
+@@ -10264,13 +10495,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4672,7 +4672,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10196,10 +10427,12 @@
+@@ -10289,10 +10520,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4687,7 +4687,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'
-@@ -10208,8 +10441,18 @@
+@@ -10301,8 +10534,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -4708,7 +4708,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10218,7 +10461,7 @@
+@@ -10311,7 +10554,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.
@@ -4717,7 +4717,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10278,9 +10521,9 @@
+@@ -10371,9 +10614,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4729,7 +4729,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10386,7 +10629,7 @@
+@@ -10479,7 +10722,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4738,7 +4738,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10396,7 +10639,20 @@
+@@ -10489,7 +10732,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4760,7 +4760,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10461,7 +10717,7 @@
+@@ -10554,7 +10810,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4769,7 +4769,7 @@
;;
beos*)
-@@ -10470,7 +10726,7 @@
+@@ -10563,7 +10819,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -4778,7 +4778,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10486,7 +10742,7 @@
+@@ -10579,7 +10835,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4787,7 +4787,7 @@
need_version=no
need_lib_prefix=no
-@@ -10498,7 +10754,8 @@
+@@ -10591,7 +10847,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -4797,7 +4797,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10528,7 +10785,7 @@
+@@ -10621,7 +10878,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -4806,7 +4806,7 @@
;;
esac
;;
-@@ -10551,7 +10808,7 @@
+@@ -10644,7 +10901,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4815,7 +4815,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"`
-@@ -10574,7 +10831,7 @@
+@@ -10667,7 +10924,7 @@
dynamic_linker=no
;;
@@ -4824,7 +4824,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10586,8 +10843,17 @@
+@@ -10679,8 +10936,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -4844,7 +4844,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10605,7 +10871,7 @@
+@@ -10698,7 +10964,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -4853,7 +4853,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10632,9 +10898,9 @@
+@@ -10725,9 +10991,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -4865,7 +4865,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10649,7 +10915,7 @@
+@@ -10742,7 +11008,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4874,7 +4874,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10660,7 +10926,7 @@
+@@ -10753,7 +11019,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4883,7 +4883,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10722,22 +10988,19 @@
+@@ -10815,22 +11081,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -4912,7 +4912,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,
-@@ -10747,6 +11010,30 @@
+@@ -10840,6 +11103,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4943,7 +4943,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10756,7 +11043,7 @@
+@@ -10849,7 +11136,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4952,7 +4952,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10785,7 +11072,11 @@
+@@ -10878,7 +11165,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4965,7 +4965,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
-@@ -10805,7 +11096,7 @@
+@@ -10898,7 +11189,7 @@
os2*)
libname_spec='$name'
@@ -4974,7 +4974,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10907,8 +11198,8 @@
+@@ -11000,8 +11291,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -4985,16 +4985,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11567,7 +11858,7 @@
+@@ -11660,7 +11951,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11570 "configure"
-+#line 11861 "configure"
+-#line 11663 "configure"
++#line 11954 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11633,7 +11924,7 @@
+@@ -11726,7 +12017,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5003,16 +5003,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11665,7 +11956,7 @@
+@@ -11758,7 +12049,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11668 "configure"
-+#line 11959 "configure"
+-#line 11761 "configure"
++#line 12052 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11731,7 +12022,7 @@
+@@ -11824,7 +12115,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5021,7 +5021,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11781,7 +12072,7 @@
+@@ -11874,7 +12165,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5030,7 +5030,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11790,47 +12081,10 @@
+@@ -11883,47 +12174,10 @@
fi
;;
@@ -5079,7 +5079,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11856,7 +12110,8 @@
+@@ -11949,7 +12203,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.
@@ -5089,7 +5089,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 \
-@@ -11970,11 +12225,11 @@
+@@ -12063,11 +12318,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5103,7 +5103,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12004,6 +12259,12 @@
+@@ -12097,6 +12352,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5116,7 +5116,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12034,7 +12295,7 @@
+@@ -12127,7 +12388,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5125,7 +5125,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12065,7 +12326,7 @@
+@@ -12158,7 +12419,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5134,7 +5134,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12080,7 +12341,7 @@
+@@ -12173,7 +12434,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5143,7 +5143,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12307,7 +12568,10 @@
+@@ -12400,7 +12661,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.
@@ -5155,7 +5155,7 @@
fi
-@@ -12372,7 +12636,9 @@
+@@ -12465,7 +12729,9 @@
case $tagname in
CXX)
@@ -5166,7 +5166,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12409,7 +12675,7 @@
+@@ -12502,7 +12768,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5175,7 +5175,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12430,6 +12696,20 @@
+@@ -12523,6 +12789,20 @@
compiler=$CC
@@ -5196,7 +5196,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12451,7 +12731,16 @@
+@@ -12544,7 +12824,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5214,7 +5214,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12522,7 +12811,7 @@
+@@ -12615,7 +12904,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,
@@ -5223,7 +5223,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'*)
-@@ -12556,7 +12845,7 @@
+@@ -12649,7 +12938,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5232,7 +5232,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12575,8 +12864,8 @@
+@@ -12668,8 +12957,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
@@ -5243,7 +5243,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12602,7 +12891,7 @@
+@@ -12695,7 +12984,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.
@@ -5252,7 +5252,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12633,8 +12922,22 @@
+@@ -12726,8 +13015,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5277,7 +5277,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12651,7 +12954,7 @@
+@@ -12744,7 +13047,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5286,7 +5286,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`
-@@ -12672,6 +12975,9 @@
+@@ -12765,6 +13068,9 @@
fi
esac
shared_flag='-shared'
@@ -5296,7 +5296,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12680,15 +12986,16 @@
+@@ -12773,15 +13079,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5317,7 +5317,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.
-@@ -12747,13 +13054,12 @@
+@@ -12840,13 +13147,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5333,7 +5333,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12817,8 +13123,8 @@
+@@ -12910,8 +13216,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -5344,7 +5344,7 @@
fi
fi
;;
-@@ -12831,16 +13137,17 @@
+@@ -12924,16 +13230,17 @@
esac
;;
@@ -5364,7 +5364,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
-@@ -12849,70 +13156,81 @@
+@@ -12942,70 +13249,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5498,7 +5498,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12923,14 +13241,14 @@
+@@ -13016,14 +13334,14 @@
;;
esac
;;
@@ -5515,7 +5515,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12947,12 +13265,12 @@
+@@ -13040,12 +13358,12 @@
# location of the library.
case $cc_basename in
@@ -5531,7 +5531,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12961,11 +13279,11 @@
+@@ -13054,11 +13372,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.
@@ -5545,7 +5545,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12975,7 +13293,7 @@
+@@ -13068,7 +13386,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -5554,7 +5554,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12991,7 +13309,7 @@
+@@ -13084,7 +13402,7 @@
;;
esac
fi
@@ -5563,7 +5563,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13012,17 +13330,17 @@
+@@ -13105,17 +13423,17 @@
esac
case $cc_basename in
@@ -5585,7 +5585,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13038,12 +13356,12 @@
+@@ -13131,12 +13449,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -5600,7 +5600,7 @@
;;
esac
fi
-@@ -13056,9 +13374,9 @@
+@@ -13149,9 +13467,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -5612,7 +5612,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13069,9 +13387,9 @@
+@@ -13162,9 +13480,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -5624,7 +5624,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13082,14 +13400,14 @@
+@@ -13175,14 +13493,14 @@
;;
linux*)
case $cc_basename in
@@ -5642,7 +5642,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13107,20 +13425,44 @@
+@@ -13200,20 +13518,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -5693,7 +5693,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13148,7 +13490,7 @@
+@@ -13241,7 +13583,7 @@
;;
mvs*)
case $cc_basename in
@@ -5702,7 +5702,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13158,7 +13500,7 @@
+@@ -13251,7 +13593,7 @@
;;
esac
;;
@@ -5711,7 +5711,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=
-@@ -13169,15 +13511,31 @@
+@@ -13262,15 +13604,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::"'
;;
@@ -5745,7 +5745,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13187,14 +13545,14 @@
+@@ -13280,14 +13638,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -5763,7 +5763,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13212,7 +13570,7 @@
+@@ -13305,7 +13663,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5772,7 +5772,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13231,13 +13589,13 @@
+@@ -13324,13 +13682,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -5788,7 +5788,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13246,17 +13604,17 @@
+@@ -13339,17 +13697,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -5810,7 +5810,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13275,7 +13633,7 @@
+@@ -13368,7 +13726,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5819,7 +5819,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13299,7 +13657,7 @@
+@@ -13392,7 +13750,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -5828,7 +5828,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13311,12 +13669,12 @@
+@@ -13404,12 +13762,12 @@
;;
sunos4*)
case $cc_basename in
@@ -5843,7 +5843,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13329,36 +13687,33 @@
+@@ -13422,36 +13780,33 @@
;;
solaris*)
case $cc_basename in
@@ -5892,7 +5892,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13366,9 +13721,9 @@
+@@ -13459,9 +13814,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -5904,7 +5904,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13378,9 +13733,9 @@
+@@ -13471,9 +13826,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
@@ -5916,7 +5916,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13389,9 +13744,9 @@
+@@ -13482,9 +13837,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -5928,7 +5928,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13409,7 +13764,7 @@
+@@ -13502,7 +13857,7 @@
;;
tandem*)
case $cc_basename in
@@ -5937,7 +5937,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13466,7 +13821,7 @@
+@@ -13559,7 +13914,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.
@@ -5946,7 +5946,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13506,7 +13861,7 @@
+@@ -13599,7 +13954,7 @@
fi
;;
@@ -5955,7 +5955,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13542,6 +13897,20 @@
+@@ -13635,6 +13990,20 @@
$rm -f confest.$objext
@@ -5976,7 +5976,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13597,7 +13966,7 @@
+@@ -13690,7 +14059,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5985,7 +5985,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13622,18 +13991,28 @@
+@@ -13715,18 +14084,28 @@
;;
chorus*)
case $cc_basename in
@@ -6017,7 +6017,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13641,22 +14020,22 @@
+@@ -13734,22 +14113,22 @@
;;
esac
;;
@@ -6044,7 +6044,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13671,7 +14050,7 @@
+@@ -13764,7 +14143,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6053,7 +6053,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13682,18 +14061,24 @@
+@@ -13775,18 +14154,24 @@
;;
linux*)
case $cc_basename in
@@ -6081,7 +6081,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13710,25 +14095,25 @@
+@@ -13803,25 +14188,25 @@
;;
mvs*)
case $cc_basename in
@@ -6112,7 +6112,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13744,7 +14129,7 @@
+@@ -13837,7 +14222,7 @@
;;
sco*)
case $cc_basename in
@@ -6121,7 +6121,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13753,13 +14138,13 @@
+@@ -13846,13 +14231,13 @@
;;
solaris*)
case $cc_basename in
@@ -6137,7 +6137,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13769,12 +14154,12 @@
+@@ -13862,12 +14247,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6152,7 +6152,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13784,7 +14169,7 @@
+@@ -13877,7 +14262,7 @@
;;
tandem*)
case $cc_basename in
@@ -6161,7 +6161,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13825,18 +14210,20 @@
+@@ -13918,18 +14303,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 \
@@ -6169,13 +6169,13 @@
+ -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:13831: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13924: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14309: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13835: \$? = $ac_status" >&5
-+ echo "$as_me:14220: \$? = $ac_status" >&5
+- echo "$as_me:13928: \$? = $ac_status" >&5
++ echo "$as_me:14313: \$? = $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
@@ -6187,7 +6187,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13857,7 +14244,7 @@
+@@ -13950,7 +14337,7 @@
fi
fi
@@ -6196,7 +6196,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13879,38 +14266,36 @@
+@@ -13972,38 +14359,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6217,13 +6217,13 @@
+ -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:13898: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14278: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13991: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14371: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13902: \$? = $ac_status" >&5
-+ echo "$as_me:14282: \$? = $ac_status" >&5
+- echo "$as_me:13995: \$? = $ac_status" >&5
++ echo "$as_me:14375: \$? = $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
@@ -6247,7 +6247,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13960,7 +14345,10 @@
+@@ -14053,7 +14438,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6259,7 +6259,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14043,7 +14431,7 @@
+@@ -14136,7 +14524,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6268,7 +6268,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14053,7 +14441,20 @@
+@@ -14146,7 +14534,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6290,7 +6290,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14118,7 +14519,7 @@
+@@ -14211,7 +14612,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6299,7 +6299,7 @@
;;
beos*)
-@@ -14127,7 +14528,7 @@
+@@ -14220,7 +14621,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6308,7 +6308,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14143,7 +14544,7 @@
+@@ -14236,7 +14637,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6317,7 +6317,7 @@
need_version=no
need_lib_prefix=no
-@@ -14155,7 +14556,8 @@
+@@ -14248,7 +14649,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6327,7 +6327,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14185,7 +14587,7 @@
+@@ -14278,7 +14680,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6336,7 +6336,7 @@
;;
esac
;;
-@@ -14208,7 +14610,7 @@
+@@ -14301,7 +14703,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6345,7 +6345,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"`
-@@ -14231,7 +14633,7 @@
+@@ -14324,7 +14726,7 @@
dynamic_linker=no
;;
@@ -6354,7 +6354,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14243,8 +14645,17 @@
+@@ -14336,8 +14738,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6374,7 +6374,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14262,7 +14673,7 @@
+@@ -14355,7 +14766,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6383,7 +6383,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14289,9 +14700,9 @@
+@@ -14382,9 +14793,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6395,7 +6395,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14306,7 +14717,7 @@
+@@ -14399,7 +14810,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6404,7 +6404,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14317,7 +14728,7 @@
+@@ -14410,7 +14821,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6413,7 +6413,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14379,22 +14790,19 @@
+@@ -14472,22 +14883,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6442,7 +6442,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,
-@@ -14404,6 +14812,30 @@
+@@ -14497,6 +14905,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6473,7 +6473,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14413,7 +14845,7 @@
+@@ -14506,7 +14938,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6482,7 +6482,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14442,7 +14874,11 @@
+@@ -14535,7 +14967,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6495,7 +6495,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
-@@ -14462,7 +14898,7 @@
+@@ -14555,7 +14991,7 @@
os2*)
libname_spec='$name'
@@ -6504,7 +6504,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14564,8 +15000,8 @@
+@@ -14657,8 +15093,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -6515,16 +6515,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -15224,7 +15660,7 @@
+@@ -15317,7 +15753,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15227 "configure"
-+#line 15663 "configure"
+-#line 15320 "configure"
++#line 15756 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15290,7 +15726,7 @@
+@@ -15383,7 +15819,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6533,16 +6533,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15322,7 +15758,7 @@
+@@ -15415,7 +15851,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15325 "configure"
-+#line 15761 "configure"
+-#line 15418 "configure"
++#line 15854 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15388,7 +15824,7 @@
+@@ -15481,7 +15917,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6551,7 +6551,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15439,7 +15875,8 @@
+@@ -15532,7 +15968,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.
@@ -6561,7 +6561,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 \
-@@ -15539,6 +15976,12 @@
+@@ -15632,6 +16069,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6574,7 +6574,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15569,7 +16012,7 @@
+@@ -15662,7 +16105,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6583,7 +6583,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15600,7 +16043,7 @@
+@@ -15693,7 +16136,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6592,7 +6592,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15615,7 +16058,7 @@
+@@ -15708,7 +16151,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -6601,7 +6601,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15817,7 +16260,10 @@
+@@ -15910,7 +16353,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.
@@ -6613,7 +6613,7 @@
fi
-@@ -15893,12 +16339,35 @@
+@@ -15986,12 +16432,35 @@
compiler=$CC
@@ -6650,7 +6650,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15911,7 +16380,7 @@
+@@ -16004,7 +16473,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -6659,7 +6659,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15919,8 +16388,10 @@
+@@ -16012,8 +16481,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -6672,7 +6672,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15997,7 +16468,7 @@
+@@ -16090,7 +16561,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6681,7 +6681,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16023,6 +16494,16 @@
+@@ -16116,6 +16587,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -6698,7 +6698,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16034,7 +16515,7 @@
+@@ -16127,7 +16608,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.
@@ -6707,7 +6707,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16058,12 +16539,19 @@
+@@ -16151,12 +16632,19 @@
;;
linux*)
@@ -6728,7 +6728,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16084,9 +16572,14 @@
+@@ -16177,9 +16665,14 @@
;;
solaris*)
@@ -6744,7 +6744,7 @@
;;
sunos4*)
-@@ -16108,6 +16601,11 @@
+@@ -16201,6 +16694,11 @@
fi
;;
@@ -6756,7 +6756,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16142,18 +16640,20 @@
+@@ -16235,18 +16733,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 \
@@ -6764,13 +6764,13 @@
+ -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:16148: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16646: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16241: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16152: \$? = $ac_status" >&5
-+ echo "$as_me:16650: \$? = $ac_status" >&5
+- echo "$as_me:16245: \$? = $ac_status" >&5
++ echo "$as_me:16743: \$? = $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
@@ -6782,7 +6782,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16174,7 +16674,7 @@
+@@ -16267,7 +16767,7 @@
fi
fi
@@ -6791,7 +6791,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16196,38 +16696,36 @@
+@@ -16289,38 +16789,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6812,13 +6812,13 @@
+ -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:16215: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16708: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16219: \$? = $ac_status" >&5
-+ echo "$as_me:16712: \$? = $ac_status" >&5
+- echo "$as_me:16312: \$? = $ac_status" >&5
++ echo "$as_me:16805: \$? = $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
@@ -6842,7 +6842,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16298,6 +16796,16 @@
+@@ -16391,6 +16889,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -6859,7 +6859,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16318,6 +16826,27 @@
+@@ -16411,6 +16919,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -6887,7 +6887,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16355,7 +16884,7 @@
+@@ -16448,7 +16977,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6896,7 +6896,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16365,13 +16894,13 @@
+@@ -16458,13 +16987,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'
@@ -6913,7 +6913,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
-@@ -16380,19 +16909,51 @@
+@@ -16473,19 +17002,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6970,7 +6970,7 @@
fi
;;
-@@ -16410,8 +16971,8 @@
+@@ -16503,8 +17064,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6981,7 +6981,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16426,24 +16987,19 @@
+@@ -16519,24 +17080,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7013,7 +7013,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16477,9 +17033,20 @@
+@@ -16570,9 +17126,20 @@
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
@@ -7036,7 +7036,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16496,7 +17063,7 @@
+@@ -16589,7 +17156,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7045,7 +7045,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`
-@@ -16517,6 +17084,9 @@
+@@ -16610,6 +17177,9 @@
fi
esac
shared_flag='-shared'
@@ -7055,7 +7055,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16525,21 +17095,22 @@
+@@ -16618,21 +17188,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7083,7 +7083,7 @@
program main
end
-@@ -16580,14 +17151,13 @@
+@@ -16673,14 +17244,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7101,7 +7101,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16641,8 +17211,8 @@
+@@ -16734,8 +17304,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7112,7 +7112,7 @@
fi
fi
;;
-@@ -16655,7 +17225,7 @@
+@@ -16748,7 +17318,7 @@
ld_shlibs_F77=no
;;
@@ -7121,7 +7121,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16665,68 +17235,68 @@
+@@ -16758,68 +17328,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7234,7 +7234,7 @@
fi
;;
-@@ -16760,8 +17330,8 @@
+@@ -16853,8 +17423,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7245,7 +7245,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16769,7 +17339,7 @@
+@@ -16862,7 +17432,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7254,7 +7254,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
-@@ -16785,16 +17355,16 @@
+@@ -16878,16 +17448,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7275,7 +7275,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16804,7 +17374,7 @@
+@@ -16897,7 +17467,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7284,7 +7284,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16837,7 +17407,7 @@
+@@ -16930,7 +17500,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7293,7 +7293,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'
-@@ -16847,7 +17417,7 @@
+@@ -16940,7 +17510,7 @@
link_all_deplibs_F77=yes
;;
@@ -7302,7 +7302,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
-@@ -16870,7 +17440,8 @@
+@@ -16963,7 +17533,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
@@ -7312,7 +7312,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16880,7 +17451,7 @@
+@@ -16973,7 +17544,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7321,7 +7321,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16891,14 +17462,14 @@
+@@ -16984,14 +17555,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7338,7 +7338,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'
-@@ -16910,13 +17481,13 @@
+@@ -17003,13 +17574,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7354,7 +7354,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16935,10 +17506,12 @@
+@@ -17028,10 +17599,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7369,7 +7369,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'
-@@ -16947,8 +17520,18 @@
+@@ -17040,8 +17613,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7390,7 +7390,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16957,7 +17540,7 @@
+@@ -17050,7 +17633,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.
@@ -7399,7 +7399,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17017,9 +17600,9 @@
+@@ -17110,9 +17693,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -7411,7 +7411,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17125,7 +17708,7 @@
+@@ -17218,7 +17801,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7420,7 +7420,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17135,7 +17718,20 @@
+@@ -17228,7 +17811,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7442,7 +7442,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17200,7 +17796,7 @@
+@@ -17293,7 +17889,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7451,7 +7451,7 @@
;;
beos*)
-@@ -17209,7 +17805,7 @@
+@@ -17302,7 +17898,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7460,7 +7460,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17225,7 +17821,7 @@
+@@ -17318,7 +17914,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7469,7 +7469,7 @@
need_version=no
need_lib_prefix=no
-@@ -17237,7 +17833,8 @@
+@@ -17330,7 +17926,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7479,7 +7479,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17267,7 +17864,7 @@
+@@ -17360,7 +17957,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7488,7 +7488,7 @@
;;
esac
;;
-@@ -17290,7 +17887,7 @@
+@@ -17383,7 +17980,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7497,7 +7497,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"`
-@@ -17313,7 +17910,7 @@
+@@ -17406,7 +18003,7 @@
dynamic_linker=no
;;
@@ -7506,7 +7506,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17325,8 +17922,17 @@
+@@ -17418,8 +18015,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7526,7 +7526,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17344,7 +17950,7 @@
+@@ -17437,7 +18043,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7535,7 +7535,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17371,9 +17977,9 @@
+@@ -17464,9 +18070,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7547,7 +7547,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17388,7 +17994,7 @@
+@@ -17481,7 +18087,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7556,7 +7556,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17399,7 +18005,7 @@
+@@ -17492,7 +18098,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7565,7 +7565,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17461,22 +18067,19 @@
+@@ -17554,22 +18160,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7594,7 +7594,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,
-@@ -17486,6 +18089,30 @@
+@@ -17579,6 +18182,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7625,7 +7625,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17495,7 +18122,7 @@
+@@ -17588,7 +18215,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7634,7 +7634,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17524,7 +18151,11 @@
+@@ -17617,7 +18244,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7647,7 +7647,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
-@@ -17544,7 +18175,7 @@
+@@ -17637,7 +18268,7 @@
os2*)
libname_spec='$name'
@@ -7656,7 +7656,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17646,8 +18277,8 @@
+@@ -17739,8 +18370,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -7667,7 +7667,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17723,7 +18354,8 @@
+@@ -17816,7 +18447,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.
@@ -7677,7 +7677,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 \
-@@ -17823,6 +18455,12 @@
+@@ -17916,6 +18548,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7690,7 +7690,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17853,7 +18491,7 @@
+@@ -17946,7 +18584,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7699,7 +7699,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17884,7 +18522,7 @@
+@@ -17977,7 +18615,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7708,7 +7708,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17899,7 +18537,7 @@
+@@ -17992,7 +18630,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -7717,7 +7717,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18101,7 +18739,10 @@
+@@ -18194,7 +18832,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.
@@ -7729,7 +7729,7 @@
fi
-@@ -18134,7 +18775,7 @@
+@@ -18227,7 +18868,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -7738,7 +7738,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18145,15 +18786,41 @@
+@@ -18238,15 +18879,41 @@
compiler=$CC
@@ -7780,7 +7780,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
-@@ -18180,18 +18847,20 @@
+@@ -18273,18 +18940,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 \
@@ -7788,13 +7788,13 @@
+ -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:18186: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18853: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18279: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18946: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18190: \$? = $ac_status" >&5
-+ echo "$as_me:18857: \$? = $ac_status" >&5
+- echo "$as_me:18283: \$? = $ac_status" >&5
++ echo "$as_me:18950: \$? = $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
@@ -7806,7 +7806,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18268,7 +18937,7 @@
+@@ -18361,7 +19030,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7815,7 +7815,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18294,6 +18963,16 @@
+@@ -18387,6 +19056,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7832,7 +7832,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18305,7 +18984,7 @@
+@@ -18398,7 +19077,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.
@@ -7841,7 +7841,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18329,12 +19008,19 @@
+@@ -18422,12 +19101,19 @@
;;
linux*)
@@ -7862,7 +7862,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18355,9 +19041,14 @@
+@@ -18448,9 +19134,14 @@
;;
solaris*)
@@ -7878,7 +7878,7 @@
;;
sunos4*)
-@@ -18379,6 +19070,11 @@
+@@ -18472,6 +19163,11 @@
fi
;;
@@ -7890,7 +7890,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18413,18 +19109,20 @@
+@@ -18506,18 +19202,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 \
@@ -7898,13 +7898,13 @@
+ -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:18419: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19115: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18512: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19208: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18423: \$? = $ac_status" >&5
-+ echo "$as_me:19119: \$? = $ac_status" >&5
+- echo "$as_me:18516: \$? = $ac_status" >&5
++ echo "$as_me:19212: \$? = $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
@@ -7916,7 +7916,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18445,7 +19143,7 @@
+@@ -18538,7 +19236,7 @@
fi
fi
@@ -7925,7 +7925,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18467,38 +19165,36 @@
+@@ -18560,38 +19258,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7946,13 +7946,13 @@
+ -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:18486: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19177: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18579: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18490: \$? = $ac_status" >&5
-+ echo "$as_me:19181: \$? = $ac_status" >&5
+- echo "$as_me:18583: \$? = $ac_status" >&5
++ echo "$as_me:19274: \$? = $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
@@ -7976,7 +7976,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18569,6 +19265,16 @@
+@@ -18662,6 +19358,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7993,7 +7993,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18589,6 +19295,27 @@
+@@ -18682,6 +19388,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8021,7 +8021,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18626,7 +19353,7 @@
+@@ -18719,7 +19446,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8030,7 +8030,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18636,13 +19363,13 @@
+@@ -18729,13 +19456,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'
@@ -8047,7 +8047,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
-@@ -18651,19 +19378,51 @@
+@@ -18744,19 +19471,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8104,7 +8104,7 @@
fi
;;
-@@ -18681,8 +19440,8 @@
+@@ -18774,8 +19533,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8115,7 +8115,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18697,24 +19456,19 @@
+@@ -18790,24 +19549,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8147,7 +8147,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18748,9 +19502,20 @@
+@@ -18841,9 +19595,20 @@
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
@@ -8170,7 +8170,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18767,7 +19532,7 @@
+@@ -18860,7 +19625,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8179,7 +8179,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`
-@@ -18788,6 +19553,9 @@
+@@ -18881,6 +19646,9 @@
fi
esac
shared_flag='-shared'
@@ -8189,7 +8189,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18796,21 +19564,22 @@
+@@ -18889,21 +19657,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8217,7 +8217,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18861,14 +19630,13 @@
+@@ -18954,14 +19723,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8235,7 +8235,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18932,8 +19700,8 @@
+@@ -19025,8 +19793,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -8246,7 +8246,7 @@
fi
fi
;;
-@@ -18946,7 +19714,7 @@
+@@ -19039,7 +19807,7 @@
ld_shlibs_GCJ=no
;;
@@ -8255,7 +8255,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18956,68 +19724,68 @@
+@@ -19049,68 +19817,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8368,7 +8368,7 @@
fi
;;
-@@ -19051,8 +19819,8 @@
+@@ -19144,8 +19912,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8379,7 +8379,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19060,7 +19828,7 @@
+@@ -19153,7 +19921,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8388,7 +8388,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
-@@ -19076,16 +19844,16 @@
+@@ -19169,16 +19937,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8409,7 +8409,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19095,7 +19863,7 @@
+@@ -19188,7 +19956,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8418,7 +8418,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19128,7 +19896,7 @@
+@@ -19221,7 +19989,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8427,7 +8427,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'
-@@ -19138,7 +19906,7 @@
+@@ -19231,7 +19999,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8436,7 +8436,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
-@@ -19161,7 +19929,8 @@
+@@ -19254,7 +20022,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
@@ -8446,7 +8446,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19171,7 +19940,7 @@
+@@ -19264,7 +20033,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8455,7 +8455,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19182,14 +19951,14 @@
+@@ -19275,14 +20044,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8472,7 +8472,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'
-@@ -19201,13 +19970,13 @@
+@@ -19294,13 +20063,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8488,7 +8488,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19226,10 +19995,12 @@
+@@ -19319,10 +20088,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8503,7 +8503,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'
-@@ -19238,8 +20009,18 @@
+@@ -19331,8 +20102,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8524,7 +8524,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19248,7 +20029,7 @@
+@@ -19341,7 +20122,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.
@@ -8533,7 +8533,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19308,9 +20089,9 @@
+@@ -19401,9 +20182,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8545,7 +8545,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19416,7 +20197,7 @@
+@@ -19509,7 +20290,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8554,7 +8554,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19426,7 +20207,20 @@
+@@ -19519,7 +20300,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8576,7 +8576,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19491,7 +20285,7 @@
+@@ -19584,7 +20378,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8585,7 +8585,7 @@
;;
beos*)
-@@ -19500,7 +20294,7 @@
+@@ -19593,7 +20387,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8594,7 +8594,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19516,7 +20310,7 @@
+@@ -19609,7 +20403,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8603,7 +8603,7 @@
need_version=no
need_lib_prefix=no
-@@ -19528,7 +20322,8 @@
+@@ -19621,7 +20415,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8613,7 +8613,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19558,7 +20353,7 @@
+@@ -19651,7 +20446,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8622,7 +8622,7 @@
;;
esac
;;
-@@ -19581,7 +20376,7 @@
+@@ -19674,7 +20469,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8631,7 +8631,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"`
-@@ -19604,7 +20399,7 @@
+@@ -19697,7 +20492,7 @@
dynamic_linker=no
;;
@@ -8640,7 +8640,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19616,8 +20411,17 @@
+@@ -19709,8 +20504,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8660,7 +8660,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19635,7 +20439,7 @@
+@@ -19728,7 +20532,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8669,7 +8669,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19662,9 +20466,9 @@
+@@ -19755,9 +20559,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8681,7 +8681,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19679,7 +20483,7 @@
+@@ -19772,7 +20576,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8690,7 +8690,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19690,7 +20494,7 @@
+@@ -19783,7 +20587,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8699,7 +8699,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19752,22 +20556,19 @@
+@@ -19845,22 +20649,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8728,7 +8728,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,
-@@ -19777,6 +20578,30 @@
+@@ -19870,6 +20671,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8759,7 +8759,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19786,7 +20611,7 @@
+@@ -19879,7 +20704,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8768,7 +8768,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19815,7 +20640,11 @@
+@@ -19908,7 +20733,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8781,7 +8781,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
-@@ -19835,7 +20664,7 @@
+@@ -19928,7 +20757,7 @@
os2*)
libname_spec='$name'
@@ -8790,7 +8790,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19937,8 +20766,8 @@
+@@ -20030,8 +20859,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -8801,16 +8801,16 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20597,7 +21426,7 @@
+@@ -20690,7 +21519,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20600 "configure"
-+#line 21429 "configure"
+-#line 20693 "configure"
++#line 21522 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20663,7 +21492,7 @@
+@@ -20756,7 +21585,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8819,16 +8819,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20695,7 +21524,7 @@
+@@ -20788,7 +21617,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20698 "configure"
-+#line 21527 "configure"
+-#line 20791 "configure"
++#line 21620 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20761,7 +21590,7 @@
+@@ -20854,7 +21683,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8837,7 +8837,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20812,7 +21641,8 @@
+@@ -20905,7 +21734,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.
@@ -8847,7 +8847,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 \
-@@ -20912,6 +21742,12 @@
+@@ -21005,6 +21835,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8860,7 +8860,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20942,7 +21778,7 @@
+@@ -21035,7 +21871,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8869,7 +8869,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20973,7 +21809,7 @@
+@@ -21066,7 +21902,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8878,7 +8878,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20988,7 +21824,7 @@
+@@ -21081,7 +21917,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -8887,7 +8887,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21190,7 +22026,10 @@
+@@ -21283,7 +22119,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.
@@ -8899,7 +8899,7 @@
fi
-@@ -21233,11 +22072,35 @@
+@@ -21326,11 +22165,35 @@
compiler=$CC
@@ -8935,7 +8935,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21253,7 +22116,8 @@
+@@ -21346,7 +22209,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.
@@ -8945,7 +8945,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 \
-@@ -21353,6 +22217,12 @@
+@@ -21446,6 +22310,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8958,7 +8958,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21383,7 +22253,7 @@
+@@ -21476,7 +22346,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8967,7 +8967,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21414,7 +22284,7 @@
+@@ -21507,7 +22377,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8976,7 +8976,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21429,7 +22299,7 @@
+@@ -21522,7 +22392,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -8985,7 +8985,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21631,7 +22501,10 @@
+@@ -21724,7 +22594,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.
@@ -8997,7 +8997,7 @@
fi
-@@ -21678,7 +22551,7 @@
+@@ -21771,7 +22644,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9006,7 +9006,7 @@
# Prevent multiple expansion
-@@ -22077,9 +22950,6 @@
+@@ -22170,9 +23043,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9016,7 +9016,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22296,9 +23166,6 @@
+@@ -22389,9 +23259,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9026,7 +9026,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24479,9 +25346,6 @@
+@@ -24572,9 +25439,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9036,79 +9036,79 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29371,7 +30235,7 @@
+@@ -29464,7 +30328,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29374: $i/$j" >&5
-+ echo "configure: 30238: $i/$j" >&5
+- echo "configure: 29467: $i/$j" >&5
++ echo "configure: 30331: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29669,7 +30533,7 @@
+@@ -29762,7 +30626,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29672: $i/$j" >&5
-+ echo "configure: 30536: $i/$j" >&5
+- echo "configure: 29765: $i/$j" >&5
++ echo "configure: 30629: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30505,7 +31369,7 @@
+@@ -30598,7 +31462,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30508: $i/$j" >&5
-+ echo "configure: 31372: $i/$j" >&5
+- echo "configure: 30601: $i/$j" >&5
++ echo "configure: 31465: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30535,7 +31399,7 @@
+@@ -30628,7 +31492,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30538: $i/$j" >&5
-+ echo "configure: 31402: $i/$j" >&5
+- echo "configure: 30631: $i/$j" >&5
++ echo "configure: 31495: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30553,7 +31417,7 @@
+@@ -30646,7 +31510,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30556: $i/$j" >&5
-+ echo "configure: 31420: $i/$j" >&5
+- echo "configure: 30649: $i/$j" >&5
++ echo "configure: 31513: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32076,7 +32940,7 @@
+@@ -32169,7 +33033,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32079: $i/$j" >&5
-+ echo "configure: 32943: $i/$j" >&5
+- echo "configure: 32172: $i/$j" >&5
++ echo "configure: 33036: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32678,7 +33542,7 @@
+@@ -32771,7 +33635,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32681: $i/$j" >&5
-+ echo "configure: 33545: $i/$j" >&5
+- echo "configure: 32774: $i/$j" >&5
++ echo "configure: 33638: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -33827,7 +34691,7 @@
+@@ -33920,7 +34784,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 33830: $i/$j" >&5
-+ echo "configure: 34694: $i/$j" >&5
+- echo "configure: 33923: $i/$j" >&5
++ echo "configure: 34787: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34279,7 +35143,8 @@
+@@ -34372,7 +35236,8 @@
vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1009
then
@@ -9118,718 +9118,718 @@
LIBWV2_RPATH=
for args in $LIBWV2_LIBS; do
case $args in
-@@ -37107,7 +37972,7 @@
+@@ -37200,7 +38065,7 @@
do
for j in pqxx/pqxx;
do
-- echo "configure: 37110: $i/$j" >&5
-+ echo "configure: 37975: $i/$j" >&5
+- echo "configure: 37203: $i/$j" >&5
++ echo "configure: 38068: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_incdir=$i
-@@ -37138,7 +38003,7 @@
+@@ -37231,7 +38096,7 @@
do
for j in libpqxx.so;
do
-- echo "configure: 37141: $i/$j" >&5
-+ echo "configure: 38006: $i/$j" >&5
+- echo "configure: 37234: $i/$j" >&5
++ echo "configure: 38099: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_libdir=$i
-@@ -37189,7 +38054,7 @@
+@@ -37282,7 +38147,7 @@
do
for j in knewstuff/downloaddialog.h;
do
-- echo "configure: 37192: $i/$j" >&5
-+ echo "configure: 38057: $i/$j" >&5
+- echo "configure: 37285: $i/$j" >&5
++ echo "configure: 38150: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_incdir=$i
-@@ -37206,7 +38071,7 @@
+@@ -37299,7 +38164,7 @@
do
for j in libknewstuff.so;
do
-- echo "configure: 37209: $i/$j" >&5
-+ echo "configure: 38074: $i/$j" >&5
+- echo "configure: 37302: $i/$j" >&5
++ echo "configure: 38167: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_libdir=$i
-@@ -37285,7 +38150,7 @@
+@@ -37378,7 +38243,7 @@
do
for j in kfeedbackwizard.h;
do
-- echo "configure: 37288: $i/$j" >&5
-+ echo "configure: 38153: $i/$j" >&5
+- echo "configure: 37381: $i/$j" >&5
++ echo "configure: 38246: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_incdir=$i
-@@ -37302,7 +38167,7 @@
+@@ -37395,7 +38260,7 @@
do
for j in libkfeedbackwizard.so;
do
-- echo "configure: 37305: $i/$j" >&5
-+ echo "configure: 38170: $i/$j" >&5
+- echo "configure: 37398: $i/$j" >&5
++ echo "configure: 38263: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_libdir=$i
-@@ -37450,7 +38315,7 @@
+@@ -37543,7 +38408,7 @@
do
for j in Python.h;
do
-- echo "configure: 37453: $i/$j" >&5
-+ echo "configure: 38318: $i/$j" >&5
+- echo "configure: 37546: $i/$j" >&5
++ echo "configure: 38411: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37466,7 +38331,7 @@
+@@ -37559,7 +38424,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37469: $i/$j" >&5
-+ echo "configure: 38334: $i/$j" >&5
+- echo "configure: 37562: $i/$j" >&5
++ echo "configure: 38427: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37490,7 +38355,7 @@
+@@ -37583,7 +38448,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37493: $i/$j" >&5
-+ echo "configure: 38358: $i/$j" >&5
+- echo "configure: 37586: $i/$j" >&5
++ echo "configure: 38451: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37506,7 +38371,7 @@
+@@ -37599,7 +38464,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37509: $i/$j" >&5
-+ echo "configure: 38374: $i/$j" >&5
+- echo "configure: 37602: $i/$j" >&5
++ echo "configure: 38467: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37522,7 +38387,7 @@
+@@ -37615,7 +38480,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37525: $i/$j" >&5
-+ echo "configure: 38390: $i/$j" >&5
+- echo "configure: 37618: $i/$j" >&5
++ echo "configure: 38483: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37550,7 +38415,7 @@
+@@ -37643,7 +38508,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37553: $i/$j" >&5
-+ echo "configure: 38418: $i/$j" >&5
+- echo "configure: 37646: $i/$j" >&5
++ echo "configure: 38511: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37594,7 +38459,7 @@
+@@ -37687,7 +38552,7 @@
do
for j in Python.h;
do
-- echo "configure: 37597: $i/$j" >&5
-+ echo "configure: 38462: $i/$j" >&5
+- echo "configure: 37690: $i/$j" >&5
++ echo "configure: 38555: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37610,7 +38475,7 @@
+@@ -37703,7 +38568,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37613: $i/$j" >&5
-+ echo "configure: 38478: $i/$j" >&5
+- echo "configure: 37706: $i/$j" >&5
++ echo "configure: 38571: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37634,7 +38499,7 @@
+@@ -37727,7 +38592,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37637: $i/$j" >&5
-+ echo "configure: 38502: $i/$j" >&5
+- echo "configure: 37730: $i/$j" >&5
++ echo "configure: 38595: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37650,7 +38515,7 @@
+@@ -37743,7 +38608,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37653: $i/$j" >&5
-+ echo "configure: 38518: $i/$j" >&5
+- echo "configure: 37746: $i/$j" >&5
++ echo "configure: 38611: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37666,7 +38531,7 @@
+@@ -37759,7 +38624,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37669: $i/$j" >&5
-+ echo "configure: 38534: $i/$j" >&5
+- echo "configure: 37762: $i/$j" >&5
++ echo "configure: 38627: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37694,7 +38559,7 @@
+@@ -37787,7 +38652,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37697: $i/$j" >&5
-+ echo "configure: 38562: $i/$j" >&5
+- echo "configure: 37790: $i/$j" >&5
++ echo "configure: 38655: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37738,7 +38603,7 @@
+@@ -37831,7 +38696,7 @@
do
for j in Python.h;
do
-- echo "configure: 37741: $i/$j" >&5
-+ echo "configure: 38606: $i/$j" >&5
+- echo "configure: 37834: $i/$j" >&5
++ echo "configure: 38699: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37754,7 +38619,7 @@
+@@ -37847,7 +38712,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37757: $i/$j" >&5
-+ echo "configure: 38622: $i/$j" >&5
+- echo "configure: 37850: $i/$j" >&5
++ echo "configure: 38715: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37778,7 +38643,7 @@
+@@ -37871,7 +38736,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37781: $i/$j" >&5
-+ echo "configure: 38646: $i/$j" >&5
+- echo "configure: 37874: $i/$j" >&5
++ echo "configure: 38739: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37794,7 +38659,7 @@
+@@ -37887,7 +38752,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37797: $i/$j" >&5
-+ echo "configure: 38662: $i/$j" >&5
+- echo "configure: 37890: $i/$j" >&5
++ echo "configure: 38755: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37810,7 +38675,7 @@
+@@ -37903,7 +38768,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37813: $i/$j" >&5
-+ echo "configure: 38678: $i/$j" >&5
+- echo "configure: 37906: $i/$j" >&5
++ echo "configure: 38771: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37838,7 +38703,7 @@
+@@ -37931,7 +38796,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37841: $i/$j" >&5
-+ echo "configure: 38706: $i/$j" >&5
+- echo "configure: 37934: $i/$j" >&5
++ echo "configure: 38799: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37882,7 +38747,7 @@
+@@ -37975,7 +38840,7 @@
do
for j in Python.h;
do
-- echo "configure: 37885: $i/$j" >&5
-+ echo "configure: 38750: $i/$j" >&5
+- echo "configure: 37978: $i/$j" >&5
++ echo "configure: 38843: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37898,7 +38763,7 @@
+@@ -37991,7 +38856,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37901: $i/$j" >&5
-+ echo "configure: 38766: $i/$j" >&5
+- echo "configure: 37994: $i/$j" >&5
++ echo "configure: 38859: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37922,7 +38787,7 @@
+@@ -38015,7 +38880,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37925: $i/$j" >&5
-+ echo "configure: 38790: $i/$j" >&5
+- echo "configure: 38018: $i/$j" >&5
++ echo "configure: 38883: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37938,7 +38803,7 @@
+@@ -38031,7 +38896,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37941: $i/$j" >&5
-+ echo "configure: 38806: $i/$j" >&5
+- echo "configure: 38034: $i/$j" >&5
++ echo "configure: 38899: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37954,7 +38819,7 @@
+@@ -38047,7 +38912,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37957: $i/$j" >&5
-+ echo "configure: 38822: $i/$j" >&5
+- echo "configure: 38050: $i/$j" >&5
++ echo "configure: 38915: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37982,7 +38847,7 @@
+@@ -38075,7 +38940,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37985: $i/$j" >&5
-+ echo "configure: 38850: $i/$j" >&5
+- echo "configure: 38078: $i/$j" >&5
++ echo "configure: 38943: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38026,7 +38891,7 @@
+@@ -38119,7 +38984,7 @@
do
for j in Python.h;
do
-- echo "configure: 38029: $i/$j" >&5
-+ echo "configure: 38894: $i/$j" >&5
+- echo "configure: 38122: $i/$j" >&5
++ echo "configure: 38987: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38042,7 +38907,7 @@
+@@ -38135,7 +39000,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38045: $i/$j" >&5
-+ echo "configure: 38910: $i/$j" >&5
+- echo "configure: 38138: $i/$j" >&5
++ echo "configure: 39003: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38066,7 +38931,7 @@
+@@ -38159,7 +39024,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38069: $i/$j" >&5
-+ echo "configure: 38934: $i/$j" >&5
+- echo "configure: 38162: $i/$j" >&5
++ echo "configure: 39027: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38082,7 +38947,7 @@
+@@ -38175,7 +39040,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38085: $i/$j" >&5
-+ echo "configure: 38950: $i/$j" >&5
+- echo "configure: 38178: $i/$j" >&5
++ echo "configure: 39043: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38098,7 +38963,7 @@
+@@ -38191,7 +39056,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38101: $i/$j" >&5
-+ echo "configure: 38966: $i/$j" >&5
+- echo "configure: 38194: $i/$j" >&5
++ echo "configure: 39059: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38126,7 +38991,7 @@
+@@ -38219,7 +39084,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38129: $i/$j" >&5
-+ echo "configure: 38994: $i/$j" >&5
+- echo "configure: 38222: $i/$j" >&5
++ echo "configure: 39087: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38170,7 +39035,7 @@
+@@ -38263,7 +39128,7 @@
do
for j in Python.h;
do
-- echo "configure: 38173: $i/$j" >&5
-+ echo "configure: 39038: $i/$j" >&5
+- echo "configure: 38266: $i/$j" >&5
++ echo "configure: 39131: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38186,7 +39051,7 @@
+@@ -38279,7 +39144,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38189: $i/$j" >&5
-+ echo "configure: 39054: $i/$j" >&5
+- echo "configure: 38282: $i/$j" >&5
++ echo "configure: 39147: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38210,7 +39075,7 @@
+@@ -38303,7 +39168,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38213: $i/$j" >&5
-+ echo "configure: 39078: $i/$j" >&5
+- echo "configure: 38306: $i/$j" >&5
++ echo "configure: 39171: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38226,7 +39091,7 @@
+@@ -38319,7 +39184,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38229: $i/$j" >&5
-+ echo "configure: 39094: $i/$j" >&5
+- echo "configure: 38322: $i/$j" >&5
++ echo "configure: 39187: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38242,7 +39107,7 @@
+@@ -38335,7 +39200,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38245: $i/$j" >&5
-+ echo "configure: 39110: $i/$j" >&5
+- echo "configure: 38338: $i/$j" >&5
++ echo "configure: 39203: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38270,7 +39135,7 @@
+@@ -38363,7 +39228,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38273: $i/$j" >&5
-+ echo "configure: 39138: $i/$j" >&5
+- echo "configure: 38366: $i/$j" >&5
++ echo "configure: 39231: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -47631,7 +48496,7 @@
+@@ -47724,7 +48589,7 @@
do
for j in kspell2/broker.h;
do
-- echo "configure: 47634: $i/$j" >&5
-+ echo "configure: 48499: $i/$j" >&5
+- echo "configure: 47727: $i/$j" >&5
++ echo "configure: 48592: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ac_kspell2_includes=$i
-@@ -47707,7 +48572,7 @@
+@@ -47800,7 +48665,7 @@
do
for j in Python.h;
do
-- echo "configure: 47710: $i/$j" >&5
-+ echo "configure: 48575: $i/$j" >&5
+- echo "configure: 47803: $i/$j" >&5
++ echo "configure: 48668: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47723,7 +48588,7 @@
+@@ -47816,7 +48681,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 47726: $i/$j" >&5
-+ echo "configure: 48591: $i/$j" >&5
+- echo "configure: 47819: $i/$j" >&5
++ echo "configure: 48684: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47747,7 +48612,7 @@
+@@ -47840,7 +48705,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 47750: $i/$j" >&5
-+ echo "configure: 48615: $i/$j" >&5
+- echo "configure: 47843: $i/$j" >&5
++ echo "configure: 48708: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47763,7 +48628,7 @@
+@@ -47856,7 +48721,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 47766: $i/$j" >&5
-+ echo "configure: 48631: $i/$j" >&5
+- echo "configure: 47859: $i/$j" >&5
++ echo "configure: 48724: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47779,7 +48644,7 @@
+@@ -47872,7 +48737,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 47782: $i/$j" >&5
-+ echo "configure: 48647: $i/$j" >&5
+- echo "configure: 47875: $i/$j" >&5
++ echo "configure: 48740: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47807,7 +48672,7 @@
+@@ -47900,7 +48765,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 47810: $i/$j" >&5
-+ echo "configure: 48675: $i/$j" >&5
+- echo "configure: 47903: $i/$j" >&5
++ echo "configure: 48768: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -47851,7 +48716,7 @@
+@@ -47944,7 +48809,7 @@
do
for j in Python.h;
do
-- echo "configure: 47854: $i/$j" >&5
-+ echo "configure: 48719: $i/$j" >&5
+- echo "configure: 47947: $i/$j" >&5
++ echo "configure: 48812: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47867,7 +48732,7 @@
+@@ -47960,7 +48825,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 47870: $i/$j" >&5
-+ echo "configure: 48735: $i/$j" >&5
+- echo "configure: 47963: $i/$j" >&5
++ echo "configure: 48828: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47891,7 +48756,7 @@
+@@ -47984,7 +48849,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 47894: $i/$j" >&5
-+ echo "configure: 48759: $i/$j" >&5
+- echo "configure: 47987: $i/$j" >&5
++ echo "configure: 48852: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47907,7 +48772,7 @@
+@@ -48000,7 +48865,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 47910: $i/$j" >&5
-+ echo "configure: 48775: $i/$j" >&5
+- echo "configure: 48003: $i/$j" >&5
++ echo "configure: 48868: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47923,7 +48788,7 @@
+@@ -48016,7 +48881,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 47926: $i/$j" >&5
-+ echo "configure: 48791: $i/$j" >&5
+- echo "configure: 48019: $i/$j" >&5
++ echo "configure: 48884: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47951,7 +48816,7 @@
+@@ -48044,7 +48909,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 47954: $i/$j" >&5
-+ echo "configure: 48819: $i/$j" >&5
+- echo "configure: 48047: $i/$j" >&5
++ echo "configure: 48912: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -47995,7 +48860,7 @@
+@@ -48088,7 +48953,7 @@
do
for j in Python.h;
do
-- echo "configure: 47998: $i/$j" >&5
-+ echo "configure: 48863: $i/$j" >&5
+- echo "configure: 48091: $i/$j" >&5
++ echo "configure: 48956: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48011,7 +48876,7 @@
+@@ -48104,7 +48969,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48014: $i/$j" >&5
-+ echo "configure: 48879: $i/$j" >&5
+- echo "configure: 48107: $i/$j" >&5
++ echo "configure: 48972: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48035,7 +48900,7 @@
+@@ -48128,7 +48993,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48038: $i/$j" >&5
-+ echo "configure: 48903: $i/$j" >&5
+- echo "configure: 48131: $i/$j" >&5
++ echo "configure: 48996: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48051,7 +48916,7 @@
+@@ -48144,7 +49009,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48054: $i/$j" >&5
-+ echo "configure: 48919: $i/$j" >&5
+- echo "configure: 48147: $i/$j" >&5
++ echo "configure: 49012: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48067,7 +48932,7 @@
+@@ -48160,7 +49025,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48070: $i/$j" >&5
-+ echo "configure: 48935: $i/$j" >&5
+- echo "configure: 48163: $i/$j" >&5
++ echo "configure: 49028: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48095,7 +48960,7 @@
+@@ -48188,7 +49053,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48098: $i/$j" >&5
-+ echo "configure: 48963: $i/$j" >&5
+- echo "configure: 48191: $i/$j" >&5
++ echo "configure: 49056: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48139,7 +49004,7 @@
+@@ -48232,7 +49097,7 @@
do
for j in Python.h;
do
-- echo "configure: 48142: $i/$j" >&5
-+ echo "configure: 49007: $i/$j" >&5
+- echo "configure: 48235: $i/$j" >&5
++ echo "configure: 49100: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48155,7 +49020,7 @@
+@@ -48248,7 +49113,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48158: $i/$j" >&5
-+ echo "configure: 49023: $i/$j" >&5
+- echo "configure: 48251: $i/$j" >&5
++ echo "configure: 49116: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48179,7 +49044,7 @@
+@@ -48272,7 +49137,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48182: $i/$j" >&5
-+ echo "configure: 49047: $i/$j" >&5
+- echo "configure: 48275: $i/$j" >&5
++ echo "configure: 49140: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48195,7 +49060,7 @@
+@@ -48288,7 +49153,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48198: $i/$j" >&5
-+ echo "configure: 49063: $i/$j" >&5
+- echo "configure: 48291: $i/$j" >&5
++ echo "configure: 49156: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48211,7 +49076,7 @@
+@@ -48304,7 +49169,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48214: $i/$j" >&5
-+ echo "configure: 49079: $i/$j" >&5
+- echo "configure: 48307: $i/$j" >&5
++ echo "configure: 49172: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48239,7 +49104,7 @@
+@@ -48332,7 +49197,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48242: $i/$j" >&5
-+ echo "configure: 49107: $i/$j" >&5
+- echo "configure: 48335: $i/$j" >&5
++ echo "configure: 49200: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48283,7 +49148,7 @@
+@@ -48376,7 +49241,7 @@
do
for j in Python.h;
do
-- echo "configure: 48286: $i/$j" >&5
-+ echo "configure: 49151: $i/$j" >&5
+- echo "configure: 48379: $i/$j" >&5
++ echo "configure: 49244: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48299,7 +49164,7 @@
+@@ -48392,7 +49257,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48302: $i/$j" >&5
-+ echo "configure: 49167: $i/$j" >&5
+- echo "configure: 48395: $i/$j" >&5
++ echo "configure: 49260: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48323,7 +49188,7 @@
+@@ -48416,7 +49281,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48326: $i/$j" >&5
-+ echo "configure: 49191: $i/$j" >&5
+- echo "configure: 48419: $i/$j" >&5
++ echo "configure: 49284: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48339,7 +49204,7 @@
+@@ -48432,7 +49297,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48342: $i/$j" >&5
-+ echo "configure: 49207: $i/$j" >&5
+- echo "configure: 48435: $i/$j" >&5
++ echo "configure: 49300: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48355,7 +49220,7 @@
+@@ -48448,7 +49313,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48358: $i/$j" >&5
-+ echo "configure: 49223: $i/$j" >&5
+- echo "configure: 48451: $i/$j" >&5
++ echo "configure: 49316: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48383,7 +49248,7 @@
+@@ -48476,7 +49341,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48386: $i/$j" >&5
-+ echo "configure: 49251: $i/$j" >&5
+- echo "configure: 48479: $i/$j" >&5
++ echo "configure: 49344: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48427,7 +49292,7 @@
+@@ -48520,7 +49385,7 @@
do
for j in Python.h;
do
-- echo "configure: 48430: $i/$j" >&5
-+ echo "configure: 49295: $i/$j" >&5
+- echo "configure: 48523: $i/$j" >&5
++ echo "configure: 49388: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48443,7 +49308,7 @@
+@@ -48536,7 +49401,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48446: $i/$j" >&5
-+ echo "configure: 49311: $i/$j" >&5
+- echo "configure: 48539: $i/$j" >&5
++ echo "configure: 49404: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48467,7 +49332,7 @@
+@@ -48560,7 +49425,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48470: $i/$j" >&5
-+ echo "configure: 49335: $i/$j" >&5
+- echo "configure: 48563: $i/$j" >&5
++ echo "configure: 49428: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48483,7 +49348,7 @@
+@@ -48576,7 +49441,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48486: $i/$j" >&5
-+ echo "configure: 49351: $i/$j" >&5
+- echo "configure: 48579: $i/$j" >&5
++ echo "configure: 49444: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48499,7 +49364,7 @@
+@@ -48592,7 +49457,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48502: $i/$j" >&5
-+ echo "configure: 49367: $i/$j" >&5
+- echo "configure: 48595: $i/$j" >&5
++ echo "configure: 49460: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48527,7 +49392,7 @@
+@@ -48620,7 +49485,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48530: $i/$j" >&5
-+ echo "configure: 49395: $i/$j" >&5
+- echo "configure: 48623: $i/$j" >&5
++ echo "configure: 49488: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -58021,6 +58886,13 @@
+@@ -58114,6 +58979,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9843,7 +9843,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
-@@ -59582,6 +60454,9 @@
+@@ -59675,6 +60547,9 @@
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at am__leading_dot@,$am__leading_dot,;t t
@@ -15871,7 +15871,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15880,7 +15880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15904,7 +15904,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15913,7 +15913,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20910,7 +20910,7 @@
clean-checkLTLIBRARIES:
--- krita/core/tiles/Makefile.in
+++ krita/core/tiles/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -318,6 +318,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20920,7 +20920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -612,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20929,7 +20929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -650,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21240,7 +21240,7 @@
mostlyclean-libtool:
--- krita/kritacolor/Makefile.in
+++ krita/kritacolor/Makefile.in
-@@ -337,6 +337,9 @@
+@@ -341,6 +341,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21250,7 +21250,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -657,7 +660,7 @@
+@@ -661,7 +664,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21259,7 +21259,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -695,9 +698,9 @@
+@@ -699,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23088,7 +23088,7 @@
clean-noinstLTLIBRARIES:
--- krita/ui/Makefile.in
+++ krita/ui/Makefile.in
-@@ -500,6 +500,9 @@
+@@ -504,6 +504,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23098,7 +23098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -875,7 +878,7 @@
+@@ -886,7 +889,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -23107,7 +23107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -913,9 +916,9 @@
+@@ -924,9 +927,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list