[Pkg-kde-commits] rev 2415 - in trunk/packages/arts/debian: .
patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Nov 29 19:44:49 UTC 2005
Author: chrsmrtn
Date: 2005-11-29 19:44:47 +0000 (Tue, 29 Nov 2005)
New Revision: 2415
Modified:
trunk/packages/arts/debian/changelog
trunk/packages/arts/debian/patches/98_buildprep.diff
Log:
arts ready to go...
Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog 2005-11-29 19:27:17 UTC (rev 2414)
+++ trunk/packages/arts/debian/changelog 2005-11-29 19:44:47 UTC (rev 2415)
@@ -1,6 +1,6 @@
-arts (1.5-rc1-1) alioth; urgency=low
+arts (1.5.0-1) alioth; urgency=low
- * New upstream pre-release.
+ * New upstream release.
+++ Changes by Christopher Martin:
@@ -8,7 +8,7 @@
* Add arts-dbg, to help trace problems.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 10 Nov 2005 12:01:18 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 29 Nov 2005 14:09:04 -0500
arts (1.4.3-1) experimental; urgency=low
Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/arts/debian/patches/98_buildprep.diff 2005-11-29 19:27:17 UTC (rev 2414)
+++ trunk/packages/arts/debian/patches/98_buildprep.diff 2005-11-29 19:44:47 UTC (rev 2415)
@@ -28,128 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -3351,63 +3339,63 @@
-
- AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
- [
-- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
--
-- AC_MSG_CHECKING([grepping for visibility push/pop in headers])
--
-- if test "x$GXX" = "xyes"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-- AC_EGREP_CPP(
-- [GCC visibility push],
-- [ #include <exception>
-- ],
-- [
-- AC_MSG_RESULT(yes)
-- kde_stdc_visibility_patched=yes ],
-- [
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-- visibility support. Disabling -fvisibility=hidden])
--
-- kde_stdc_visibility_patched=no ])
-- AC_LANG_RESTORE
--
-- kde_have_gcc_visibility=no
-- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
-- [
-- kde_have_gcc_visibility=yes
-- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-- [
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
--
-- safe_CXXFLAGS=$CXXFLAGS
-- CXXFLAGS="$CXXFLAGS $all_includes"
--
-- AC_TRY_COMPILE(
-- [
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
-- ], [/* elvis is alive */],
-- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
--
-- CXXFLAGS=$safe_CXXFLAGS
-- AC_LANG_RESTORE
-- ]
-- )
--
-- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-- KDE_CHECK_VISIBILITY_GCC_BUG
-- HAVE_GCC_VISIBILITY=1
-- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-- fi
-- ])
-- fi
-+dnl AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-+dnl
-+dnl AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+dnl
-+dnl if test "x$GXX" = "xyes"; then
-+dnl AC_LANG_SAVE
-+dnl AC_LANG_CPLUSPLUS
-+dnl AC_EGREP_CPP(
-+dnl [GCC visibility push],
-+dnl [ #include <exception>
-+dnl ],
-+dnl [
-+dnl AC_MSG_RESULT(yes)
-+dnl kde_stdc_visibility_patched=yes ],
-+dnl [
-+dnl AC_MSG_RESULT(no)
-+dnl AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for
-+dnl visibility support. Disabling -fvisibility=hidden])
-+dnl
-+dnl kde_stdc_visibility_patched=no ])
-+dnl AC_LANG_RESTORE
-+dnl
-+dnl kde_have_gcc_visibility=no
-+dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
-+dnl [
-+dnl kde_have_gcc_visibility=yes
-+dnl AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-+dnl [
-+dnl AC_LANG_SAVE
-+dnl AC_LANG_CPLUSPLUS
-+dnl
-+dnl safe_CXXFLAGS=$CXXFLAGS
-+dnl CXXFLAGS="$CXXFLAGS $all_includes"
-+dnl
-+dnl AC_TRY_COMPILE(
-+dnl [
-+dnl#include <qglobal.h>
-+dnl#if Q_EXPORT - 0 != 0
-+dnl/* if this compiles, then Q_EXPORT is undefined */
-+dnl/* if Q_EXPORT is nonempty, this will break compilation */
-+dnl#endif
-+dnl ], [/* elvis is alive */],
-+dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-+dnl
-+dnl CXXFLAGS=$safe_CXXFLAGS
-+dnl AC_LANG_RESTORE
-+dnl ]
-+dnl )
-+dnl
-+dnl if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+dnl KDE_CHECK_VISIBILITY_GCC_BUG
-+dnl HAVE_GCC_VISIBILITY=1
-+dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-+dnl fi
-+dnl ])
-+dnl fi
- ])
-
- AC_DEFUN([KDE_ADD_DEPENDENCIES],
-@@ -5907,30 +5895,15 @@
+@@ -5917,30 +5905,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -185,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5990,7 +5963,7 @@
+@@ -6000,7 +5973,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -194,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6040,7 +6013,7 @@
+@@ -6050,7 +6023,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -203,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6060,7 +6033,7 @@
+@@ -6070,7 +6043,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -212,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6108,6 +6081,8 @@
+@@ -6118,6 +6091,8 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -221,7 +100,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6153,6 +6128,48 @@
+@@ -6163,6 +6138,48 @@
])# _LT_AC_SYS_COMPILER
@@ -270,7 +149,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6225,15 +6242,15 @@
+@@ -6235,15 +6252,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -289,7 +168,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6402,14 +6419,13 @@
+@@ -6412,14 +6429,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -306,7 +185,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6421,7 +6437,6 @@
+@@ -6431,7 +6447,6 @@
esac
;;
*64-bit*)
@@ -314,7 +193,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6486,7 +6501,7 @@
+@@ -6496,7 +6511,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 \
@@ -323,7 +202,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6496,8 +6511,10 @@
+@@ -6506,8 +6521,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
@@ -336,7 +215,7 @@
$2=yes
fi
fi
-@@ -6523,11 +6540,16 @@
+@@ -6533,11 +6550,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
@@ -354,7 +233,7 @@
else
$2=yes
fi
-@@ -6551,7 +6573,7 @@
+@@ -6561,7 +6583,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -363,7 +242,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6580,20 +6602,53 @@
+@@ -6590,20 +6612,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -423,7 +302,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.
-@@ -6689,7 +6744,7 @@
+@@ -6699,7 +6754,7 @@
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -432,7 +311,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6743,7 +6798,7 @@
+@@ -6753,7 +6808,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -441,7 +320,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6832,20 +6887,13 @@
+@@ -6842,20 +6897,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -463,7 +342,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6857,13 +6905,18 @@
+@@ -6867,13 +6915,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -486,7 +365,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6922,8 +6975,8 @@
+@@ -6932,8 +6985,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)" || \
@@ -497,7 +376,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6980,7 +7033,7 @@
+@@ -6990,7 +7043,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -506,7 +385,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6993,7 +7046,7 @@
+@@ -7003,7 +7056,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -515,7 +394,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7003,7 +7056,20 @@
+@@ -7013,7 +7066,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -537,7 +416,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7068,7 +7134,7 @@
+@@ -7078,7 +7144,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -546,7 +425,7 @@
;;
beos*)
-@@ -7077,7 +7143,7 @@
+@@ -7087,7 +7153,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -555,7 +434,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7093,7 +7159,7 @@
+@@ -7103,7 +7169,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -564,7 +443,7 @@
need_version=no
need_lib_prefix=no
-@@ -7105,7 +7171,8 @@
+@@ -7115,7 +7181,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -574,7 +453,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7135,7 +7202,7 @@
+@@ -7145,7 +7212,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -583,7 +462,7 @@
;;
esac
;;
-@@ -7158,7 +7225,7 @@
+@@ -7168,7 +7235,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -592,7 +471,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"`
-@@ -7181,7 +7248,7 @@
+@@ -7191,7 +7258,7 @@
dynamic_linker=no
;;
@@ -601,7 +480,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7193,8 +7260,17 @@
+@@ -7203,8 +7270,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -621,7 +500,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7212,7 +7288,7 @@
+@@ -7222,7 +7298,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -630,7 +509,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7239,9 +7315,9 @@
+@@ -7249,9 +7325,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -642,7 +521,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7256,7 +7332,7 @@
+@@ -7266,7 +7342,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -651,7 +530,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7267,7 +7343,7 @@
+@@ -7277,7 +7353,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -660,7 +539,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7329,22 +7405,19 @@
+@@ -7339,22 +7415,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'
@@ -689,7 +568,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,
-@@ -7354,6 +7427,30 @@
+@@ -7364,6 +7437,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -720,7 +599,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7363,7 +7460,7 @@
+@@ -7373,7 +7470,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -729,7 +608,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7392,7 +7489,11 @@
+@@ -7402,7 +7499,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -742,7 +621,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
-@@ -7412,7 +7513,7 @@
+@@ -7422,7 +7523,7 @@
os2*)
libname_spec='$name'
@@ -751,7 +630,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7558,7 +7659,9 @@
+@@ -7568,7 +7669,9 @@
case $tagname in
CXX)
@@ -762,7 +641,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7620,7 +7723,7 @@
+@@ -7630,7 +7733,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -771,7 +650,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7794,7 +7897,7 @@
+@@ -7804,7 +7907,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -780,7 +659,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
-@@ -7904,7 +8007,7 @@
+@@ -7914,7 +8017,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,
@@ -789,7 +668,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'*)
-@@ -7936,7 +8039,7 @@
+@@ -7946,7 +8049,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,
@@ -798,7 +677,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7963,6 +8066,15 @@
+@@ -7973,6 +8076,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -814,7 +693,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -7996,44 +8108,36 @@
+@@ -8006,44 +8118,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -870,7 +749,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8049,7 +8153,7 @@
+@@ -8059,7 +8163,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -879,7 +758,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
-@@ -8066,42 +8170,21 @@
+@@ -8076,42 +8180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -929,7 +808,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
-@@ -8120,19 +8203,14 @@
+@@ -8130,19 +8213,14 @@
;;
openbsd*)
@@ -951,7 +830,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8142,7 +8220,6 @@
+@@ -8152,7 +8230,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -959,7 +838,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8250,13 +8327,13 @@
+@@ -8260,13 +8337,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -980,7 +859,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8275,13 +8352,13 @@
+@@ -8285,13 +8362,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1001,7 +880,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
-@@ -8319,10 +8396,21 @@
+@@ -8329,10 +8406,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1024,7 +903,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8395,6 +8483,10 @@
+@@ -8405,6 +8493,10 @@
_LT_AC_SYS_COMPILER
@@ -1035,7 +914,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -8408,7 +8500,7 @@
+@@ -8418,7 +8510,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])
@@ -1044,7 +923,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
-@@ -8449,7 +8541,7 @@
+@@ -8459,7 +8551,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1053,7 +932,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8458,48 +8550,11 @@
+@@ -8468,48 +8560,11 @@
fi
;;
@@ -1104,7 +983,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8524,7 +8579,7 @@
+@@ -8534,7 +8589,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1113,7 +992,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8553,7 +8608,7 @@
+@@ -8563,7 +8618,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1122,7 +1001,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8568,6 +8623,10 @@
+@@ -8578,6 +8633,10 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1133,7 +1012,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8589,7 +8648,7 @@
+@@ -8599,7 +8658,7 @@
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1142,7 +1021,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8607,8 +8666,8 @@
+@@ -8617,8 +8676,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
@@ -1153,7 +1032,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8634,7 +8693,7 @@
+@@ -8644,7 +8703,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.
@@ -1162,7 +1041,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8664,8 +8723,22 @@
+@@ -8674,8 +8733,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1187,7 +1066,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8682,7 +8755,7 @@
+@@ -8692,7 +8765,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1196,7 +1075,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`
-@@ -8703,6 +8776,9 @@
+@@ -8713,6 +8786,9 @@
fi
esac
shared_flag='-shared'
@@ -1206,7 +1085,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8711,15 +8787,16 @@
+@@ -8721,15 +8797,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1227,7 +1106,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.
-@@ -8728,13 +8805,12 @@
+@@ -8738,13 +8815,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1243,7 +1122,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8748,8 +8824,8 @@
+@@ -8758,8 +8834,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
@@ -1254,7 +1133,7 @@
fi
fi
;;
-@@ -8762,16 +8838,17 @@
+@@ -8772,16 +8848,17 @@
esac
;;
@@ -1274,7 +1153,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
-@@ -8780,70 +8857,81 @@
+@@ -8790,70 +8867,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1408,7 +1287,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8854,14 +8942,14 @@
+@@ -8864,14 +8952,14 @@
;;
esac
;;
@@ -1425,7 +1304,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8878,12 +8966,12 @@
+@@ -8888,12 +8976,12 @@
# location of the library.
case $cc_basename in
@@ -1441,7 +1320,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8892,11 +8980,11 @@
+@@ -8902,11 +8990,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.
@@ -1455,7 +1334,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8906,7 +8994,7 @@
+@@ -8916,7 +9004,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1464,7 +1343,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'
-@@ -8922,7 +9010,7 @@
+@@ -8932,7 +9020,7 @@
;;
esac
fi
@@ -1473,7 +1352,7 @@
hppa*64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8943,17 +9031,17 @@
+@@ -8953,17 +9041,17 @@
esac
case $cc_basename in
@@ -1495,7 +1374,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8969,12 +9057,12 @@
+@@ -8979,12 +9067,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1510,7 +1389,7 @@
;;
esac
fi
-@@ -8987,9 +9075,9 @@
+@@ -8997,9 +9085,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -1522,7 +1401,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9000,9 +9088,9 @@
+@@ -9010,9 +9098,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1534,7 +1413,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9013,14 +9101,14 @@
+@@ -9023,14 +9111,14 @@
;;
linux*)
case $cc_basename in
@@ -1552,7 +1431,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9038,20 +9126,44 @@
+@@ -9048,20 +9136,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1603,7 +1482,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9079,7 +9191,7 @@
+@@ -9089,7 +9201,7 @@
;;
mvs*)
case $cc_basename in
@@ -1612,7 +1491,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9089,7 +9201,7 @@
+@@ -9099,7 +9211,7 @@
;;
esac
;;
@@ -1621,7 +1500,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=
-@@ -9100,15 +9212,31 @@
+@@ -9110,15 +9222,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::"'
;;
@@ -1655,7 +1534,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9118,14 +9246,14 @@
+@@ -9128,14 +9256,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1673,7 +1552,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9143,7 +9271,7 @@
+@@ -9153,7 +9281,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1682,7 +1561,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9162,13 +9290,13 @@
+@@ -9172,13 +9300,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1698,7 +1577,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9177,17 +9305,17 @@
+@@ -9187,17 +9315,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1720,7 +1599,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9206,7 +9334,7 @@
+@@ -9216,7 +9344,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1729,7 +1608,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9230,7 +9358,7 @@
+@@ -9240,7 +9368,7 @@
sco*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case $cc_basename in
@@ -1738,7 +1617,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9242,12 +9370,12 @@
+@@ -9252,12 +9380,12 @@
;;
sunos4*)
case $cc_basename in
@@ -1753,7 +1632,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9260,36 +9388,33 @@
+@@ -9270,36 +9398,33 @@
;;
solaris*)
case $cc_basename in
@@ -1802,7 +1681,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9297,9 +9422,9 @@
+@@ -9307,9 +9432,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1814,7 +1693,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9309,9 +9434,9 @@
+@@ -9319,9 +9444,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
@@ -1826,7 +1705,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9320,9 +9445,9 @@
+@@ -9330,9 +9455,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1838,7 +1717,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9340,7 +9465,7 @@
+@@ -9350,7 +9475,7 @@
;;
tandem*)
case $cc_basename in
@@ -1847,7 +1726,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9450,7 +9575,7 @@
+@@ -9460,7 +9585,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.
@@ -1856,7 +1735,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9490,7 +9615,7 @@
+@@ -9500,7 +9625,7 @@
fi
;;
@@ -1865,7 +1744,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9526,6 +9651,21 @@
+@@ -9536,6 +9661,21 @@
$rm -f confest.$objext
@@ -1887,7 +1766,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9576,12 +9716,16 @@
+@@ -9586,12 +9726,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1905,7 +1784,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9591,7 +9735,7 @@
+@@ -9601,7 +9745,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1914,7 +1793,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9599,8 +9743,10 @@
+@@ -9609,8 +9753,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1927,7 +1806,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9651,20 +9797,27 @@
+@@ -9661,20 +9807,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1956,7 +1835,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
-@@ -9711,11 +9864,16 @@
+@@ -9721,11 +9874,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1973,7 +1852,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9741,11 +9899,12 @@
+@@ -9751,11 +9909,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1988,7 +1867,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 \
-@@ -9795,7 +9954,7 @@
+@@ -9805,7 +9964,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1997,7 +1876,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9861,11 +10020,11 @@
+@@ -9871,11 +10030,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2011,7 +1890,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9896,6 +10055,12 @@
+@@ -9906,6 +10065,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2024,7 +1903,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9926,7 +10091,7 @@
+@@ -9936,7 +10101,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2033,7 +1912,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9957,7 +10122,7 @@
+@@ -9967,7 +10132,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2042,7 +1921,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9972,7 +10137,7 @@
+@@ -9982,7 +10147,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2051,7 +1930,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10201,7 +10366,10 @@
+@@ -10211,7 +10376,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.
@@ -2063,7 +1942,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10243,9 +10411,6 @@
+@@ -10253,9 +10421,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2073,7 +1952,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'"
-@@ -10267,6 +10432,13 @@
+@@ -10277,6 +10442,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'"
;;
@@ -2087,7 +1966,7 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10274,7 +10446,7 @@
+@@ -10284,7 +10456,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -2096,7 +1975,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10292,14 +10464,17 @@
+@@ -10302,14 +10474,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2116,7 +1995,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10463,7 +10638,7 @@
+@@ -10473,7 +10648,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2125,7 +2004,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10488,18 +10663,28 @@
+@@ -10498,18 +10673,28 @@
;;
chorus*)
case $cc_basename in
@@ -2157,7 +2036,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10507,22 +10692,22 @@
+@@ -10517,22 +10702,22 @@
;;
esac
;;
@@ -2184,7 +2063,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10537,7 +10722,7 @@
+@@ -10547,7 +10732,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -2193,7 +2072,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.
-@@ -10548,18 +10733,24 @@
+@@ -10558,18 +10743,24 @@
;;
linux*)
case $cc_basename in
@@ -2222,7 +2101,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10576,25 +10767,25 @@
+@@ -10586,25 +10777,25 @@
;;
mvs*)
case $cc_basename in
@@ -2253,7 +2132,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
-@@ -10610,7 +10801,7 @@
+@@ -10620,7 +10811,7 @@
;;
sco*)
case $cc_basename in
@@ -2262,7 +2141,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
*)
-@@ -10619,13 +10810,13 @@
+@@ -10629,13 +10820,13 @@
;;
solaris*)
case $cc_basename in
@@ -2278,7 +2157,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10635,12 +10826,12 @@
+@@ -10645,12 +10836,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2293,7 +2172,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10650,7 +10841,7 @@
+@@ -10660,7 +10851,7 @@
;;
tandem*)
case $cc_basename in
@@ -2302,7 +2181,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10721,7 +10912,7 @@
+@@ -10731,7 +10922,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2311,7 +2190,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10747,6 +10938,16 @@
+@@ -10757,6 +10948,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2328,7 +2207,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10758,7 +10959,7 @@
+@@ -10768,7 +10969,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.
@@ -2337,7 +2216,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10782,12 +10983,19 @@
+@@ -10792,12 +10993,19 @@
;;
linux*)
@@ -2358,7 +2237,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10808,9 +11016,14 @@
+@@ -10818,9 +11026,14 @@
;;
solaris*)
@@ -2374,7 +2253,7 @@
;;
sunos4*)
-@@ -10832,6 +11045,11 @@
+@@ -10842,6 +11055,11 @@
fi
;;
@@ -2386,7 +2265,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10859,7 +11077,7 @@
+@@ -10869,7 +11087,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2395,7 +2274,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10892,7 +11110,10 @@
+@@ -10902,7 +11120,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2407,7 +2286,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10918,7 +11139,7 @@
+@@ -10928,7 +11149,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2416,7 +2295,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*
-@@ -10935,7 +11156,8 @@
+@@ -10945,7 +11166,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2426,7 +2305,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10955,6 +11177,27 @@
+@@ -10965,6 +11187,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2454,7 +2333,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -10992,7 +11235,7 @@
+@@ -11002,7 +11245,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
@@ -2463,7 +2342,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11002,13 +11245,13 @@
+@@ -11012,13 +11255,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'
@@ -2480,7 +2359,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
-@@ -11017,19 +11260,51 @@
+@@ -11027,19 +11270,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -2537,7 +2416,7 @@
fi
;;
-@@ -11047,8 +11322,8 @@
+@@ -11057,8 +11332,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2548,7 +2427,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11063,24 +11338,19 @@
+@@ -11073,24 +11348,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2580,7 +2459,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11114,9 +11384,20 @@
+@@ -11124,9 +11394,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
@@ -2603,7 +2482,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11133,7 +11414,7 @@
+@@ -11143,7 +11424,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2612,7 +2491,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`
-@@ -11154,6 +11435,9 @@
+@@ -11164,6 +11445,9 @@
fi
esac
shared_flag='-shared'
@@ -2622,7 +2501,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11162,29 +11446,29 @@
+@@ -11172,29 +11456,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -2661,7 +2540,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11198,8 +11482,8 @@
+@@ -11208,8 +11492,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
@@ -2672,7 +2551,7 @@
fi
fi
;;
-@@ -11212,7 +11496,7 @@
+@@ -11222,7 +11506,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2681,7 +2560,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11222,69 +11506,69 @@
+@@ -11232,69 +11516,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2797,7 +2676,7 @@
;;
dgux*)
-@@ -11317,8 +11601,8 @@
+@@ -11327,8 +11611,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2808,7 +2687,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
-@@ -11326,7 +11610,7 @@
+@@ -11336,7 +11620,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -2817,7 +2696,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
-@@ -11342,16 +11626,16 @@
+@@ -11352,16 +11636,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2838,7 +2717,7 @@
hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -11361,7 +11645,7 @@
+@@ -11371,7 +11655,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -2847,7 +2726,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'
-@@ -11394,7 +11678,7 @@
+@@ -11404,7 +11688,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -2856,7 +2735,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'
-@@ -11404,7 +11688,7 @@
+@@ -11414,7 +11698,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -2865,7 +2744,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
-@@ -11427,7 +11711,8 @@
+@@ -11437,7 +11721,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
@@ -2875,7 +2754,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11437,7 +11722,7 @@
+@@ -11447,7 +11732,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2884,7 +2763,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11448,14 +11733,14 @@
+@@ -11458,14 +11743,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
@@ -2901,7 +2780,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'
-@@ -11467,13 +11752,13 @@
+@@ -11477,13 +11762,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}\*'
@@ -2917,7 +2796,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11492,10 +11777,12 @@
+@@ -11502,10 +11787,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2932,7 +2811,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'
-@@ -11504,8 +11791,18 @@
+@@ -11514,8 +11801,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2953,7 +2832,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11514,7 +11811,7 @@
+@@ -11524,7 +11821,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.
@@ -2962,7 +2841,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11574,9 +11871,9 @@
+@@ -11584,9 +11881,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -2974,7 +2853,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11634,7 +11931,7 @@
+@@ -11644,7 +11941,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2983,7 +2862,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11768,7 +12065,7 @@
+@@ -11778,7 +12075,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
@@ -3072,18 +2951,6 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h3
touch $@
---- config.h.in
-+++ config.h.in
-@@ -651,9 +651,6 @@
- #endif
-
-
--/* define to 1 if -fvisibility is supported */
--#undef __KDE_HAVE_GCC_VISIBILITY
--
-
- #if defined(__SVR4) && !defined(__svr4__)
- #define __svr4__ 1
--- configure
+++ configure
@@ -278,15 +278,15 @@
@@ -3123,7 +2990,7 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1191,7 +1193,7 @@
+@@ -1193,7 +1195,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -3132,7 +2999,7 @@
done
fi
-@@ -2137,6 +2139,31 @@
+@@ -2139,6 +2141,31 @@
@@ -3164,7 +3031,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -2929,8 +2956,7 @@
+@@ -2931,8 +2958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3174,7 +3041,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -2988,8 +3014,7 @@
+@@ -2990,8 +3016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3184,7 +3051,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3105,8 +3130,7 @@
+@@ -3107,8 +3132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3194,7 +3061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3160,8 +3184,7 @@
+@@ -3162,8 +3186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3204,7 +3071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3206,8 +3229,7 @@
+@@ -3208,8 +3231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3214,7 +3081,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3251,8 +3273,7 @@
+@@ -3253,8 +3275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3224,7 +3091,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3809,8 +3830,7 @@
+@@ -3811,8 +3832,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3234,7 +3101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3868,8 +3888,7 @@
+@@ -3870,8 +3890,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3244,7 +3111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3940,8 +3959,7 @@
+@@ -3942,8 +3961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3254,7 +3121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3985,8 +4003,7 @@
+@@ -3987,8 +4005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3264,7 +3131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4164,8 +4181,7 @@
+@@ -4166,8 +4183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3274,7 +3141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4276,8 +4292,7 @@
+@@ -4278,8 +4294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3284,7 +3151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4365,8 +4380,7 @@
+@@ -4367,8 +4382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3294,7 +3161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4468,8 +4482,7 @@
+@@ -4470,8 +4484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3304,7 +3171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4568,8 +4581,7 @@
+@@ -4570,8 +4583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3314,7 +3181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4653,8 +4665,7 @@
+@@ -4655,8 +4667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3324,7 +3191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4743,8 +4754,7 @@
+@@ -4745,8 +4756,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3334,7 +3201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4831,8 +4841,7 @@
+@@ -4833,8 +4843,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3344,7 +3211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4919,8 +4928,7 @@
+@@ -4921,8 +4930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3354,7 +3221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5026,8 +5034,7 @@
+@@ -5028,8 +5036,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3364,7 +3231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5114,8 +5121,7 @@
+@@ -5116,8 +5123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3374,7 +3241,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5202,8 +5208,7 @@
+@@ -5204,8 +5210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3384,7 +3251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5290,8 +5295,7 @@
+@@ -5292,8 +5297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3394,7 +3261,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5422,8 +5426,7 @@
+@@ -5424,8 +5428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3404,7 +3271,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5511,8 +5514,7 @@
+@@ -5513,8 +5516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3414,7 +3281,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5599,8 +5601,7 @@
+@@ -5601,8 +5603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3424,7 +3291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5687,8 +5688,7 @@
+@@ -5689,8 +5690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3434,7 +3301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5775,8 +5775,7 @@
+@@ -5777,8 +5777,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3444,7 +3311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5863,8 +5862,7 @@
+@@ -5865,8 +5864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3454,7 +3321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6287,8 +6285,7 @@
+@@ -6289,8 +6287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3464,7 +3331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6414,8 +6411,7 @@
+@@ -6416,8 +6413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3474,7 +3341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6503,8 +6499,7 @@
+@@ -6505,8 +6501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3484,7 +3351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6587,185 +6582,6 @@
+@@ -6589,185 +6584,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3670,7 +3537,7 @@
fi
-@@ -6942,7 +6758,7 @@
+@@ -6944,7 +6760,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
@@ -3679,7 +3546,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7047,7 +6863,7 @@
+@@ -7049,7 +6865,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,
@@ -3688,7 +3555,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'*)
-@@ -7081,7 +6897,7 @@
+@@ -7083,7 +6899,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3697,7 +3564,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7111,6 +6927,15 @@
+@@ -7113,6 +6929,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3713,7 +3580,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7197,44 +7022,36 @@
+@@ -7199,44 +7024,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3768,7 +3635,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7250,7 +7067,7 @@
+@@ -7252,7 +7069,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3777,7 +3644,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
-@@ -7267,42 +7084,21 @@
+@@ -7269,42 +7086,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3827,7 +3694,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
-@@ -7321,19 +7117,14 @@
+@@ -7323,19 +7119,14 @@
;;
openbsd*)
@@ -3849,7 +3716,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7343,7 +7134,6 @@
+@@ -7345,7 +7136,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3857,16 +3724,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7420,7 +7210,7 @@
+@@ -7422,7 +7212,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7423 "configure"' > conftest.$ac_ext
-+ echo '#line 7213 "configure"' > conftest.$ac_ext
+- echo '#line 7425 "configure"' > conftest.$ac_ext
++ echo '#line 7215 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7463,14 +7253,13 @@
+@@ -7465,14 +7255,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3883,7 +3750,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7482,7 +7271,6 @@
+@@ -7484,7 +7273,6 @@
esac
;;
*64-bit*)
@@ -3891,7 +3758,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7542,8 +7330,7 @@
+@@ -7544,8 +7332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3901,7 +3768,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7618,8 +7405,7 @@
+@@ -7620,8 +7407,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3911,7 +3778,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7789,8 +7575,7 @@
+@@ -7791,8 +7577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3921,7 +3788,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7857,8 +7642,7 @@
+@@ -7859,8 +7644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3931,7 +3798,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7973,6 +7757,243 @@
+@@ -7975,6 +7759,243 @@
done
@@ -4175,16 +4042,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'
-@@ -8065,7 +8086,7 @@
+@@ -8067,7 +8088,7 @@
# Provide some information about the compiler.
--echo "$as_me:8068:" \
-+echo "$as_me:8089:" \
+-echo "$as_me:8070:" \
++echo "$as_me:8091:" \
"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
-@@ -8111,8 +8132,7 @@
+@@ -8113,8 +8134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4194,7 +4061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8161,8 +8181,7 @@
+@@ -8163,8 +8183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4204,7 +4071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8220,7 +8239,7 @@
+@@ -8222,7 +8241,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4213,7 +4080,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8249,20 +8268,53 @@
+@@ -8251,20 +8270,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4273,7 +4140,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.
-@@ -8299,9 +8351,6 @@
+@@ -8301,9 +8353,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4283,7 +4150,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'"
-@@ -8323,6 +8372,13 @@
+@@ -8325,6 +8374,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'"
;;
@@ -4297,7 +4164,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8330,7 +8386,7 @@
+@@ -8332,7 +8388,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4306,7 +4173,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8348,14 +8404,17 @@
+@@ -8350,14 +8406,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4326,7 +4193,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8517,7 +8576,7 @@
+@@ -8519,7 +8578,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4335,7 +4202,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8537,7 +8596,7 @@
+@@ -8539,7 +8598,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4344,7 +4211,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8822,6 +8881,17 @@
+@@ -8824,6 +8883,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4362,7 +4229,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8847,7 +8917,7 @@
+@@ -8849,7 +8919,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4371,7 +4238,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
-@@ -8909,7 +8979,7 @@
+@@ -8911,7 +8981,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4380,7 +4247,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
-@@ -9008,6 +9078,20 @@
+@@ -9010,6 +9080,20 @@
compiler=$CC
@@ -4401,7 +4268,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9044,11 +9128,16 @@
+@@ -9046,11 +9130,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
@@ -4419,7 +4286,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9094,18 +9183,20 @@
+@@ -9096,18 +9185,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 \
@@ -4427,13 +4294,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:9100: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9189: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9104: \$? = $ac_status" >&5
-+ echo "$as_me:9193: \$? = $ac_status" >&5
+- echo "$as_me:9106: \$? = $ac_status" >&5
++ echo "$as_me:9195: \$? = $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
@@ -4445,7 +4312,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9182,7 +9273,7 @@
+@@ -9184,7 +9275,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4454,7 +4321,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9208,6 +9299,16 @@
+@@ -9210,6 +9301,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4471,7 +4338,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9219,7 +9320,7 @@
+@@ -9221,7 +9322,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.
@@ -4480,7 +4347,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9243,12 +9344,19 @@
+@@ -9245,12 +9346,19 @@
;;
linux*)
@@ -4501,7 +4368,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9269,9 +9377,14 @@
+@@ -9271,9 +9379,14 @@
;;
solaris*)
@@ -4517,7 +4384,7 @@
;;
sunos4*)
-@@ -9293,6 +9406,11 @@
+@@ -9295,6 +9408,11 @@
fi
;;
@@ -4529,7 +4396,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9327,18 +9445,20 @@
+@@ -9329,18 +9447,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 \
@@ -4537,13 +4404,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:9333: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9451: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9335: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9453: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9337: \$? = $ac_status" >&5
-+ echo "$as_me:9455: \$? = $ac_status" >&5
+- echo "$as_me:9339: \$? = $ac_status" >&5
++ echo "$as_me:9457: \$? = $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
@@ -4555,7 +4422,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9359,7 +9479,7 @@
+@@ -9361,7 +9481,7 @@
fi
fi
@@ -4564,7 +4431,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9381,38 +9501,36 @@
+@@ -9383,38 +9503,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4585,13 +4452,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:9400: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9513: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9402: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9515: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9404: \$? = $ac_status" >&5
-+ echo "$as_me:9517: \$? = $ac_status" >&5
+- echo "$as_me:9406: \$? = $ac_status" >&5
++ echo "$as_me:9519: \$? = $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
@@ -4615,7 +4482,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9483,6 +9601,16 @@
+@@ -9485,6 +9603,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4632,7 +4499,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9503,6 +9631,27 @@
+@@ -9505,6 +9633,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4660,7 +4527,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9540,7 +9689,7 @@
+@@ -9542,7 +9691,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4669,7 +4536,7 @@
else
ld_shlibs=no
fi
-@@ -9550,13 +9699,13 @@
+@@ -9552,13 +9701,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'
@@ -4686,18 +4553,17 @@
# 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
-@@ -9565,19 +9714,51 @@
+@@ -9567,19 +9716,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -4725,11 +4591,12 @@
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs=no
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4742,7 +4609,7 @@
fi
;;
-@@ -9595,8 +9776,8 @@
+@@ -9597,8 +9778,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4753,7 +4620,7 @@
else
ld_shlibs=no
fi
-@@ -9611,24 +9792,19 @@
+@@ -9613,24 +9794,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4785,7 +4652,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9662,9 +9838,20 @@
+@@ -9664,9 +9840,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
@@ -4808,7 +4675,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9681,7 +9868,7 @@
+@@ -9683,7 +9870,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4817,7 +4684,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`
-@@ -9702,6 +9889,9 @@
+@@ -9704,6 +9891,9 @@
fi
esac
shared_flag='-shared'
@@ -4827,7 +4694,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9710,21 +9900,22 @@
+@@ -9712,21 +9902,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4855,7 +4722,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9748,8 +9939,7 @@
+@@ -9750,8 +9941,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4865,7 +4732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9776,14 +9966,13 @@
+@@ -9778,14 +9968,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4883,7 +4750,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9810,8 +9999,7 @@
+@@ -9812,8 +10001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4893,7 +4760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9848,8 +10036,8 @@
+@@ -9850,8 +10038,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4904,7 +4771,7 @@
fi
fi
;;
-@@ -9862,7 +10050,7 @@
+@@ -9864,7 +10052,7 @@
ld_shlibs=no
;;
@@ -4913,7 +4780,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9872,13 +10060,13 @@
+@@ -9874,13 +10062,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4930,7 +4797,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.
-@@ -9888,52 +10076,52 @@
+@@ -9890,52 +10078,52 @@
;;
darwin* | rhapsody*)
@@ -5023,7 +4890,7 @@
fi
;;
-@@ -9967,8 +10155,8 @@
+@@ -9969,8 +10157,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5034,7 +4901,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9976,7 +10164,7 @@
+@@ -9978,7 +10166,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5043,7 +4910,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
-@@ -9992,16 +10180,16 @@
+@@ -9994,16 +10182,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5064,7 +4931,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10011,7 +10199,7 @@
+@@ -10013,7 +10201,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5073,7 +4940,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10044,7 +10232,7 @@
+@@ -10046,7 +10234,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5082,7 +4949,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'
-@@ -10054,7 +10242,7 @@
+@@ -10056,7 +10244,7 @@
link_all_deplibs=yes
;;
@@ -5091,7 +4958,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10077,7 +10265,8 @@
+@@ -10079,7 +10267,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
@@ -5101,7 +4968,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10087,7 +10276,7 @@
+@@ -10089,7 +10278,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5110,7 +4977,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10098,14 +10287,14 @@
+@@ -10100,14 +10289,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5127,7 +4994,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'
-@@ -10117,13 +10306,13 @@
+@@ -10119,13 +10308,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5143,7 +5010,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10142,10 +10331,12 @@
+@@ -10144,10 +10333,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5158,7 +5025,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'
-@@ -10154,8 +10345,18 @@
+@@ -10156,8 +10347,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5179,7 +5046,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10164,7 +10365,7 @@
+@@ -10166,7 +10367,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.
@@ -5188,7 +5055,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10224,9 +10425,9 @@
+@@ -10226,9 +10427,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5200,7 +5067,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10332,7 +10533,7 @@
+@@ -10334,7 +10535,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5209,7 +5076,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10342,7 +10543,20 @@
+@@ -10344,7 +10545,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5231,7 +5098,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10407,7 +10621,7 @@
+@@ -10409,7 +10623,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5240,7 +5107,7 @@
;;
beos*)
-@@ -10416,7 +10630,7 @@
+@@ -10418,7 +10632,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5249,7 +5116,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10432,7 +10646,7 @@
+@@ -10434,7 +10648,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5258,7 +5125,7 @@
need_version=no
need_lib_prefix=no
-@@ -10444,7 +10658,8 @@
+@@ -10446,7 +10660,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5268,7 +5135,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10474,7 +10689,7 @@
+@@ -10476,7 +10691,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5277,7 +5144,7 @@
;;
esac
;;
-@@ -10497,7 +10712,7 @@
+@@ -10499,7 +10714,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5286,7 +5153,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"`
-@@ -10520,7 +10735,7 @@
+@@ -10522,7 +10737,7 @@
dynamic_linker=no
;;
@@ -5295,7 +5162,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10532,8 +10747,17 @@
+@@ -10534,8 +10749,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5315,7 +5182,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10551,7 +10775,7 @@
+@@ -10553,7 +10777,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5324,7 +5191,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10578,9 +10802,9 @@
+@@ -10580,9 +10804,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5336,7 +5203,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10595,7 +10819,7 @@
+@@ -10597,7 +10821,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5345,7 +5212,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10606,7 +10830,7 @@
+@@ -10608,7 +10832,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5354,7 +5221,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10668,22 +10892,19 @@
+@@ -10670,22 +10894,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'
@@ -5383,7 +5250,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,
-@@ -10693,6 +10914,30 @@
+@@ -10695,6 +10916,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5414,7 +5281,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10702,7 +10947,7 @@
+@@ -10704,7 +10949,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5423,7 +5290,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10731,7 +10976,11 @@
+@@ -10733,7 +10978,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5436,7 +5303,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
-@@ -10751,7 +11000,7 @@
+@@ -10753,7 +11002,7 @@
os2*)
libname_spec='$name'
@@ -5445,7 +5312,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10853,8 +11102,8 @@
+@@ -10855,8 +11104,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5456,7 +5323,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -10980,8 +11229,7 @@
+@@ -10982,8 +11231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5466,7 +5333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11084,8 +11332,7 @@
+@@ -11086,8 +11334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5476,7 +5343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11150,8 +11397,7 @@
+@@ -11152,8 +11399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5486,7 +5353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11244,8 +11490,7 @@
+@@ -11246,8 +11492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5496,7 +5363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11310,8 +11555,7 @@
+@@ -11312,8 +11557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5506,7 +5373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11377,8 +11621,7 @@
+@@ -11379,8 +11623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5516,7 +5383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11444,8 +11687,7 @@
+@@ -11446,8 +11689,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5526,16 +5393,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11520,7 +11762,7 @@
+@@ -11522,7 +11764,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11523 "configure"
-+#line 11765 "configure"
+-#line 11525 "configure"
++#line 11767 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11586,7 +11828,7 @@
+@@ -11588,7 +11830,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5544,16 +5411,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11618,7 +11860,7 @@
+@@ -11620,7 +11862,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11621 "configure"
-+#line 11863 "configure"
+-#line 11623 "configure"
++#line 11865 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11684,7 +11926,7 @@
+@@ -11686,7 +11928,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5562,7 +5429,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11734,7 +11976,7 @@
+@@ -11736,7 +11978,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5571,7 +5438,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11743,47 +11985,10 @@
+@@ -11745,47 +11987,10 @@
fi
;;
@@ -5620,7 +5487,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11809,7 +12014,8 @@
+@@ -11811,7 +12016,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.
@@ -5630,7 +5497,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 \
-@@ -11923,11 +12129,11 @@
+@@ -11925,11 +12131,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5644,7 +5511,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11957,6 +12163,12 @@
+@@ -11959,6 +12165,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5657,7 +5524,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -11987,7 +12199,7 @@
+@@ -11989,7 +12201,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5666,7 +5533,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12018,7 +12230,7 @@
+@@ -12020,7 +12232,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5675,7 +5542,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12033,7 +12245,7 @@
+@@ -12035,7 +12247,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5684,7 +5551,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12260,7 +12472,10 @@
+@@ -12262,7 +12474,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.
@@ -5696,7 +5563,7 @@
fi
-@@ -12325,7 +12540,9 @@
+@@ -12327,7 +12542,9 @@
case $tagname in
CXX)
@@ -5707,7 +5574,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12362,7 +12579,7 @@
+@@ -12364,7 +12581,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5716,7 +5583,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12383,6 +12600,20 @@
+@@ -12385,6 +12602,20 @@
compiler=$CC
@@ -5737,7 +5604,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12404,7 +12635,16 @@
+@@ -12406,7 +12637,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5755,7 +5622,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12475,7 +12715,7 @@
+@@ -12477,7 +12717,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,
@@ -5764,7 +5631,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'*)
-@@ -12509,7 +12749,7 @@
+@@ -12511,7 +12751,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5773,7 +5640,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12528,8 +12768,8 @@
+@@ -12530,8 +12770,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
@@ -5784,7 +5651,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12555,7 +12795,7 @@
+@@ -12557,7 +12797,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.
@@ -5793,7 +5660,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12586,8 +12826,22 @@
+@@ -12588,8 +12828,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5818,7 +5685,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12604,7 +12858,7 @@
+@@ -12606,7 +12860,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5827,7 +5694,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`
-@@ -12625,6 +12879,9 @@
+@@ -12627,6 +12881,9 @@
fi
esac
shared_flag='-shared'
@@ -5837,7 +5704,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12633,15 +12890,16 @@
+@@ -12635,15 +12892,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5858,7 +5725,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.
-@@ -12671,8 +12929,7 @@
+@@ -12673,8 +12931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5868,7 +5735,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12701,13 +12958,12 @@
+@@ -12703,13 +12960,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5884,7 +5751,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12734,8 +12990,7 @@
+@@ -12736,8 +12992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5894,7 +5761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12772,8 +13027,8 @@
+@@ -12774,8 +13029,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -5905,7 +5772,7 @@
fi
fi
;;
-@@ -12786,16 +13041,17 @@
+@@ -12788,16 +13043,17 @@
esac
;;
@@ -5925,7 +5792,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
-@@ -12804,70 +13060,81 @@
+@@ -12806,70 +13062,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6059,7 +5926,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12878,14 +13145,14 @@
+@@ -12880,14 +13147,14 @@
;;
esac
;;
@@ -6076,7 +5943,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12902,12 +13169,12 @@
+@@ -12904,12 +13171,12 @@
# location of the library.
case $cc_basename in
@@ -6092,7 +5959,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12916,11 +13183,11 @@
+@@ -12918,11 +13185,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.
@@ -6106,7 +5973,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12930,7 +13197,7 @@
+@@ -12932,7 +13199,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6115,7 +5982,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12946,7 +13213,7 @@
+@@ -12948,7 +13215,7 @@
;;
esac
fi
@@ -6124,7 +5991,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12967,17 +13234,17 @@
+@@ -12969,17 +13236,17 @@
esac
case $cc_basename in
@@ -6146,7 +6013,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12993,12 +13260,12 @@
+@@ -12995,12 +13262,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6161,7 +6028,7 @@
;;
esac
fi
-@@ -13011,9 +13278,9 @@
+@@ -13013,9 +13280,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6173,7 +6040,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13024,9 +13291,9 @@
+@@ -13026,9 +13293,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6185,7 +6052,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13037,14 +13304,14 @@
+@@ -13039,14 +13306,14 @@
;;
linux*)
case $cc_basename in
@@ -6203,7 +6070,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13062,20 +13329,44 @@
+@@ -13064,20 +13331,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6254,7 +6121,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13103,7 +13394,7 @@
+@@ -13105,7 +13396,7 @@
;;
mvs*)
case $cc_basename in
@@ -6263,7 +6130,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13113,7 +13404,7 @@
+@@ -13115,7 +13406,7 @@
;;
esac
;;
@@ -6272,7 +6139,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=
-@@ -13124,15 +13415,31 @@
+@@ -13126,15 +13417,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::"'
;;
@@ -6306,7 +6173,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13142,14 +13449,14 @@
+@@ -13144,14 +13451,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6324,7 +6191,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13167,7 +13474,7 @@
+@@ -13169,7 +13476,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6333,7 +6200,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13186,13 +13493,13 @@
+@@ -13188,13 +13495,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6349,7 +6216,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13201,17 +13508,17 @@
+@@ -13203,17 +13510,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6371,7 +6238,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13230,7 +13537,7 @@
+@@ -13232,7 +13539,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6380,7 +6247,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13254,7 +13561,7 @@
+@@ -13256,7 +13563,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6389,7 +6256,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13266,12 +13573,12 @@
+@@ -13268,12 +13575,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6404,7 +6271,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13284,36 +13591,33 @@
+@@ -13286,36 +13593,33 @@
;;
solaris*)
case $cc_basename in
@@ -6453,7 +6320,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13321,9 +13625,9 @@
+@@ -13323,9 +13627,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6465,7 +6332,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13333,9 +13637,9 @@
+@@ -13335,9 +13639,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
@@ -6477,7 +6344,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13344,9 +13648,9 @@
+@@ -13346,9 +13650,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6489,7 +6356,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13364,7 +13668,7 @@
+@@ -13366,7 +13670,7 @@
;;
tandem*)
case $cc_basename in
@@ -6498,7 +6365,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13421,7 +13725,7 @@
+@@ -13423,7 +13727,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.
@@ -6507,7 +6374,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13461,7 +13765,7 @@
+@@ -13463,7 +13767,7 @@
fi
;;
@@ -6516,7 +6383,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13497,6 +13801,20 @@
+@@ -13499,6 +13803,20 @@
$rm -f confest.$objext
@@ -6537,7 +6404,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13552,7 +13870,7 @@
+@@ -13554,7 +13872,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6546,7 +6413,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13577,18 +13895,28 @@
+@@ -13579,18 +13897,28 @@
;;
chorus*)
case $cc_basename in
@@ -6578,7 +6445,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13596,22 +13924,22 @@
+@@ -13598,22 +13926,22 @@
;;
esac
;;
@@ -6605,7 +6472,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13626,7 +13954,7 @@
+@@ -13628,7 +13956,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6614,7 +6481,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13637,18 +13965,24 @@
+@@ -13639,18 +13967,24 @@
;;
linux*)
case $cc_basename in
@@ -6642,7 +6509,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13665,25 +13999,25 @@
+@@ -13667,25 +14001,25 @@
;;
mvs*)
case $cc_basename in
@@ -6673,7 +6540,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13699,7 +14033,7 @@
+@@ -13701,7 +14035,7 @@
;;
sco*)
case $cc_basename in
@@ -6682,7 +6549,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13708,13 +14042,13 @@
+@@ -13710,13 +14044,13 @@
;;
solaris*)
case $cc_basename in
@@ -6698,7 +6565,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13724,12 +14058,12 @@
+@@ -13726,12 +14060,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6713,7 +6580,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13739,7 +14073,7 @@
+@@ -13741,7 +14075,7 @@
;;
tandem*)
case $cc_basename in
@@ -6722,7 +6589,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13780,18 +14114,20 @@
+@@ -13782,18 +14116,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 \
@@ -6730,13 +6597,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:13786: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14120: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13788: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13790: \$? = $ac_status" >&5
-+ echo "$as_me:14124: \$? = $ac_status" >&5
+- echo "$as_me:13792: \$? = $ac_status" >&5
++ echo "$as_me:14126: \$? = $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
@@ -6748,7 +6615,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13812,7 +14148,7 @@
+@@ -13814,7 +14150,7 @@
fi
fi
@@ -6757,7 +6624,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13834,38 +14170,36 @@
+@@ -13836,38 +14172,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6778,13 +6645,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:13853: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14182: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13855: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13857: \$? = $ac_status" >&5
-+ echo "$as_me:14186: \$? = $ac_status" >&5
+- echo "$as_me:13859: \$? = $ac_status" >&5
++ echo "$as_me:14188: \$? = $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
@@ -6808,7 +6675,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13915,7 +14249,10 @@
+@@ -13917,7 +14251,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6820,7 +6687,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13998,7 +14335,7 @@
+@@ -14000,7 +14337,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6829,7 +6696,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14008,7 +14345,20 @@
+@@ -14010,7 +14347,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6851,7 +6718,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14073,7 +14423,7 @@
+@@ -14075,7 +14425,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6860,7 +6727,7 @@
;;
beos*)
-@@ -14082,7 +14432,7 @@
+@@ -14084,7 +14434,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6869,7 +6736,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14098,7 +14448,7 @@
+@@ -14100,7 +14450,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6878,7 +6745,7 @@
need_version=no
need_lib_prefix=no
-@@ -14110,7 +14460,8 @@
+@@ -14112,7 +14462,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6888,7 +6755,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14140,7 +14491,7 @@
+@@ -14142,7 +14493,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6897,7 +6764,7 @@
;;
esac
;;
-@@ -14163,7 +14514,7 @@
+@@ -14165,7 +14516,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6906,7 +6773,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"`
-@@ -14186,7 +14537,7 @@
+@@ -14188,7 +14539,7 @@
dynamic_linker=no
;;
@@ -6915,7 +6782,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14198,8 +14549,17 @@
+@@ -14200,8 +14551,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6935,7 +6802,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14217,7 +14577,7 @@
+@@ -14219,7 +14579,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6944,7 +6811,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14244,9 +14604,9 @@
+@@ -14246,9 +14606,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6956,7 +6823,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14261,7 +14621,7 @@
+@@ -14263,7 +14623,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6965,7 +6832,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14272,7 +14632,7 @@
+@@ -14274,7 +14634,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6974,7 +6841,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14334,22 +14694,19 @@
+@@ -14336,22 +14696,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'
@@ -7003,7 +6870,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,
-@@ -14359,6 +14716,30 @@
+@@ -14361,6 +14718,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7034,7 +6901,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14368,7 +14749,7 @@
+@@ -14370,7 +14751,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7043,7 +6910,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14397,7 +14778,11 @@
+@@ -14399,7 +14780,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7056,7 +6923,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
-@@ -14417,7 +14802,7 @@
+@@ -14419,7 +14804,7 @@
os2*)
libname_spec='$name'
@@ -7065,7 +6932,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14519,8 +14904,8 @@
+@@ -14521,8 +14906,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" || \
@@ -7076,7 +6943,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14646,8 +15031,7 @@
+@@ -14648,8 +15033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7086,7 +6953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14750,8 +15134,7 @@
+@@ -14752,8 +15136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7096,7 +6963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14816,8 +15199,7 @@
+@@ -14818,8 +15201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7106,7 +6973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14910,8 +15292,7 @@
+@@ -14912,8 +15294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7116,7 +6983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14976,8 +15357,7 @@
+@@ -14978,8 +15359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7126,7 +6993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15043,8 +15423,7 @@
+@@ -15045,8 +15425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7136,7 +7003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15110,8 +15489,7 @@
+@@ -15112,8 +15491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7146,16 +7013,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15186,7 +15564,7 @@
+@@ -15188,7 +15566,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15189 "configure"
-+#line 15567 "configure"
+-#line 15191 "configure"
++#line 15569 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15252,7 +15630,7 @@
+@@ -15254,7 +15632,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7164,16 +7031,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15284,7 +15662,7 @@
+@@ -15286,7 +15664,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15287 "configure"
-+#line 15665 "configure"
+-#line 15289 "configure"
++#line 15667 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15350,7 +15728,7 @@
+@@ -15352,7 +15730,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7182,7 +7049,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15401,7 +15779,8 @@
+@@ -15403,7 +15781,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.
@@ -7192,7 +7059,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 \
-@@ -15501,6 +15880,12 @@
+@@ -15503,6 +15882,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7205,7 +7072,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15531,7 +15916,7 @@
+@@ -15533,7 +15918,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7214,7 +7081,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15562,7 +15947,7 @@
+@@ -15564,7 +15949,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7223,7 +7090,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15577,7 +15962,7 @@
+@@ -15579,7 +15964,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7232,7 +7099,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15779,7 +16164,10 @@
+@@ -15781,7 +16166,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.
@@ -7244,7 +7111,7 @@
fi
-@@ -15855,12 +16243,35 @@
+@@ -15857,12 +16245,35 @@
compiler=$CC
@@ -7281,7 +7148,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15873,7 +16284,7 @@
+@@ -15875,7 +16286,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7290,7 +7157,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15881,8 +16292,10 @@
+@@ -15883,8 +16294,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7303,7 +7170,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15959,7 +16372,7 @@
+@@ -15961,7 +16374,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7312,7 +7179,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -15985,6 +16398,16 @@
+@@ -15987,6 +16400,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7329,7 +7196,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -15996,7 +16419,7 @@
+@@ -15998,7 +16421,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.
@@ -7338,7 +7205,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16020,12 +16443,19 @@
+@@ -16022,12 +16445,19 @@
;;
linux*)
@@ -7359,7 +7226,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16046,9 +16476,14 @@
+@@ -16048,9 +16478,14 @@
;;
solaris*)
@@ -7375,7 +7242,7 @@
;;
sunos4*)
-@@ -16070,6 +16505,11 @@
+@@ -16072,6 +16507,11 @@
fi
;;
@@ -7387,7 +7254,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16104,18 +16544,20 @@
+@@ -16106,18 +16546,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 \
@@ -7395,13 +7262,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:16110: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16550: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16112: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16552: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16114: \$? = $ac_status" >&5
-+ echo "$as_me:16554: \$? = $ac_status" >&5
+- echo "$as_me:16116: \$? = $ac_status" >&5
++ echo "$as_me:16556: \$? = $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
@@ -7413,7 +7280,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16136,7 +16578,7 @@
+@@ -16138,7 +16580,7 @@
fi
fi
@@ -7422,7 +7289,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16158,38 +16600,36 @@
+@@ -16160,38 +16602,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7443,13 +7310,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:16177: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16612: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16614: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16181: \$? = $ac_status" >&5
-+ echo "$as_me:16616: \$? = $ac_status" >&5
+- echo "$as_me:16183: \$? = $ac_status" >&5
++ echo "$as_me:16618: \$? = $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
@@ -7473,7 +7340,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16260,6 +16700,16 @@
+@@ -16262,6 +16702,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7490,7 +7357,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16280,6 +16730,27 @@
+@@ -16282,6 +16732,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7518,7 +7385,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16317,7 +16788,7 @@
+@@ -16319,7 +16790,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7527,7 +7394,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16327,13 +16798,13 @@
+@@ -16329,13 +16800,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'
@@ -7544,7 +7411,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
-@@ -16342,19 +16813,51 @@
+@@ -16344,19 +16815,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7553,10 +7420,9 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -7586,9 +7452,10 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7601,7 +7468,7 @@
fi
;;
-@@ -16372,8 +16875,8 @@
+@@ -16374,8 +16877,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7612,7 +7479,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16388,24 +16891,19 @@
+@@ -16390,24 +16893,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7644,7 +7511,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16439,9 +16937,20 @@
+@@ -16441,9 +16939,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
@@ -7667,7 +7534,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16458,7 +16967,7 @@
+@@ -16460,7 +16969,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7676,7 +7543,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`
-@@ -16479,6 +16988,9 @@
+@@ -16481,6 +16990,9 @@
fi
esac
shared_flag='-shared'
@@ -7686,7 +7553,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16487,21 +16999,22 @@
+@@ -16489,21 +17001,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7714,7 +7581,7 @@
program main
end
-@@ -16515,8 +17028,7 @@
+@@ -16517,8 +17030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7724,7 +7591,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16543,14 +17055,13 @@
+@@ -16545,14 +17057,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7742,7 +7609,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16567,8 +17078,7 @@
+@@ -16569,8 +17080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7752,7 +7619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16605,8 +17115,8 @@
+@@ -16607,8 +17117,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7763,7 +7630,7 @@
fi
fi
;;
-@@ -16619,7 +17129,7 @@
+@@ -16621,7 +17131,7 @@
ld_shlibs_F77=no
;;
@@ -7772,7 +7639,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16629,68 +17139,68 @@
+@@ -16631,68 +17141,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7885,7 +7752,7 @@
fi
;;
-@@ -16724,8 +17234,8 @@
+@@ -16726,8 +17236,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7896,7 +7763,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16733,7 +17243,7 @@
+@@ -16735,7 +17245,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7905,7 +7772,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
-@@ -16749,16 +17259,16 @@
+@@ -16751,16 +17261,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7926,7 +7793,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16768,7 +17278,7 @@
+@@ -16770,7 +17280,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7935,7 +7802,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16801,7 +17311,7 @@
+@@ -16803,7 +17313,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7944,7 +7811,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'
-@@ -16811,7 +17321,7 @@
+@@ -16813,7 +17323,7 @@
link_all_deplibs_F77=yes
;;
@@ -7953,7 +7820,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
-@@ -16834,7 +17344,8 @@
+@@ -16836,7 +17346,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
@@ -7963,7 +7830,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16844,7 +17355,7 @@
+@@ -16846,7 +17357,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7972,7 +7839,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16855,14 +17366,14 @@
+@@ -16857,14 +17368,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7989,7 +7856,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'
-@@ -16874,13 +17385,13 @@
+@@ -16876,13 +17387,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8005,7 +7872,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16899,10 +17410,12 @@
+@@ -16901,10 +17412,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8020,7 +7887,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'
-@@ -16911,8 +17424,18 @@
+@@ -16913,8 +17426,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8041,7 +7908,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16921,7 +17444,7 @@
+@@ -16923,7 +17446,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.
@@ -8050,7 +7917,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16981,9 +17504,9 @@
+@@ -16983,9 +17506,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8062,7 +7929,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17089,7 +17612,7 @@
+@@ -17091,7 +17614,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8071,7 +7938,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17099,7 +17622,20 @@
+@@ -17101,7 +17624,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8093,7 +7960,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17164,7 +17700,7 @@
+@@ -17166,7 +17702,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8102,7 +7969,7 @@
;;
beos*)
-@@ -17173,7 +17709,7 @@
+@@ -17175,7 +17711,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8111,7 +7978,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17189,7 +17725,7 @@
+@@ -17191,7 +17727,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8120,7 +7987,7 @@
need_version=no
need_lib_prefix=no
-@@ -17201,7 +17737,8 @@
+@@ -17203,7 +17739,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8130,7 +7997,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17231,7 +17768,7 @@
+@@ -17233,7 +17770,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8139,7 +8006,7 @@
;;
esac
;;
-@@ -17254,7 +17791,7 @@
+@@ -17256,7 +17793,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8148,7 +8015,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"`
-@@ -17277,7 +17814,7 @@
+@@ -17279,7 +17816,7 @@
dynamic_linker=no
;;
@@ -8157,7 +8024,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17289,8 +17826,17 @@
+@@ -17291,8 +17828,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8177,7 +8044,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17308,7 +17854,7 @@
+@@ -17310,7 +17856,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8186,7 +8053,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17335,9 +17881,9 @@
+@@ -17337,9 +17883,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8198,7 +8065,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17352,7 +17898,7 @@
+@@ -17354,7 +17900,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8207,7 +8074,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17363,7 +17909,7 @@
+@@ -17365,7 +17911,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8216,7 +8083,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17425,22 +17971,19 @@
+@@ -17427,22 +17973,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'
@@ -8245,7 +8112,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,
-@@ -17450,6 +17993,30 @@
+@@ -17452,6 +17995,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8276,7 +8143,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17459,7 +18026,7 @@
+@@ -17461,7 +18028,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8285,7 +8152,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17488,7 +18055,11 @@
+@@ -17490,7 +18057,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8298,7 +8165,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
-@@ -17508,7 +18079,7 @@
+@@ -17510,7 +18081,7 @@
os2*)
libname_spec='$name'
@@ -8307,7 +8174,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17610,8 +18181,8 @@
+@@ -17612,8 +18183,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" || \
@@ -8318,7 +8185,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17687,7 +18258,8 @@
+@@ -17689,7 +18260,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.
@@ -8328,7 +8195,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 \
-@@ -17787,6 +18359,12 @@
+@@ -17789,6 +18361,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8341,7 +8208,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17817,7 +18395,7 @@
+@@ -17819,7 +18397,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8350,7 +8217,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17848,7 +18426,7 @@
+@@ -17850,7 +18428,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8359,7 +8226,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17863,7 +18441,7 @@
+@@ -17865,7 +18443,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8368,7 +8235,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18065,7 +18643,10 @@
+@@ -18067,7 +18645,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.
@@ -8380,7 +8247,7 @@
fi
-@@ -18098,7 +18679,7 @@
+@@ -18100,7 +18681,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8389,7 +8256,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18109,15 +18690,41 @@
+@@ -18111,15 +18692,41 @@
compiler=$CC
@@ -8431,7 +8298,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
-@@ -18144,18 +18751,20 @@
+@@ -18146,18 +18753,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 \
@@ -8439,13 +8306,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:18150: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18757: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18152: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18759: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18154: \$? = $ac_status" >&5
-+ echo "$as_me:18761: \$? = $ac_status" >&5
+- echo "$as_me:18156: \$? = $ac_status" >&5
++ echo "$as_me:18763: \$? = $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
@@ -8457,7 +8324,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18232,7 +18841,7 @@
+@@ -18234,7 +18843,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8466,7 +8333,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18258,6 +18867,16 @@
+@@ -18260,6 +18869,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8483,7 +8350,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18269,7 +18888,7 @@
+@@ -18271,7 +18890,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.
@@ -8492,7 +8359,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18293,12 +18912,19 @@
+@@ -18295,12 +18914,19 @@
;;
linux*)
@@ -8513,7 +8380,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18319,9 +18945,14 @@
+@@ -18321,9 +18947,14 @@
;;
solaris*)
@@ -8529,7 +8396,7 @@
;;
sunos4*)
-@@ -18343,6 +18974,11 @@
+@@ -18345,6 +18976,11 @@
fi
;;
@@ -8541,7 +8408,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18377,18 +19013,20 @@
+@@ -18379,18 +19015,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 \
@@ -8549,13 +8416,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:18383: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19019: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18385: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19021: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18387: \$? = $ac_status" >&5
-+ echo "$as_me:19023: \$? = $ac_status" >&5
+- echo "$as_me:18389: \$? = $ac_status" >&5
++ echo "$as_me:19025: \$? = $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
@@ -8567,7 +8434,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18409,7 +19047,7 @@
+@@ -18411,7 +19049,7 @@
fi
fi
@@ -8576,7 +8443,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18431,38 +19069,36 @@
+@@ -18433,38 +19071,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8597,13 +8464,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:18450: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19081: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18452: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19083: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18454: \$? = $ac_status" >&5
-+ echo "$as_me:19085: \$? = $ac_status" >&5
+- echo "$as_me:18456: \$? = $ac_status" >&5
++ echo "$as_me:19087: \$? = $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
@@ -8627,7 +8494,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18533,6 +19169,16 @@
+@@ -18535,6 +19171,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8644,7 +8511,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18553,6 +19199,27 @@
+@@ -18555,6 +19201,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8672,7 +8539,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18590,7 +19257,7 @@
+@@ -18592,7 +19259,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8681,7 +8548,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18600,13 +19267,13 @@
+@@ -18602,13 +19269,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'
@@ -8698,7 +8565,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
-@@ -18615,19 +19282,51 @@
+@@ -18617,19 +19284,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8755,7 +8622,7 @@
fi
;;
-@@ -18645,8 +19344,8 @@
+@@ -18647,8 +19346,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8766,7 +8633,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18661,24 +19360,19 @@
+@@ -18663,24 +19362,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8798,7 +8665,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18712,9 +19406,20 @@
+@@ -18714,9 +19408,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
@@ -8821,7 +8688,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18731,7 +19436,7 @@
+@@ -18733,7 +19438,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8830,7 +8697,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`
-@@ -18752,6 +19457,9 @@
+@@ -18754,6 +19459,9 @@
fi
esac
shared_flag='-shared'
@@ -8840,7 +8707,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18760,21 +19468,22 @@
+@@ -18762,21 +19470,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8868,7 +8735,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18798,8 +19507,7 @@
+@@ -18800,8 +19509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8878,7 +8745,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18826,14 +19534,13 @@
+@@ -18828,14 +19536,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8896,7 +8763,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18860,8 +19567,7 @@
+@@ -18862,8 +19569,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8906,7 +8773,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18898,8 +19604,8 @@
+@@ -18900,8 +19606,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -8917,7 +8784,7 @@
fi
fi
;;
-@@ -18912,7 +19618,7 @@
+@@ -18914,7 +19620,7 @@
ld_shlibs_GCJ=no
;;
@@ -8926,7 +8793,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18922,68 +19628,68 @@
+@@ -18924,68 +19630,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9039,7 +8906,7 @@
fi
;;
-@@ -19017,8 +19723,8 @@
+@@ -19019,8 +19725,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9050,7 +8917,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19026,7 +19732,7 @@
+@@ -19028,7 +19734,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9059,7 +8926,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
-@@ -19042,16 +19748,16 @@
+@@ -19044,16 +19750,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9080,7 +8947,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19061,7 +19767,7 @@
+@@ -19063,7 +19769,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9089,7 +8956,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19094,7 +19800,7 @@
+@@ -19096,7 +19802,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9098,7 +8965,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'
-@@ -19104,7 +19810,7 @@
+@@ -19106,7 +19812,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9107,7 +8974,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
-@@ -19127,7 +19833,8 @@
+@@ -19129,7 +19835,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
@@ -9117,7 +8984,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19137,7 +19844,7 @@
+@@ -19139,7 +19846,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9126,7 +8993,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19148,14 +19855,14 @@
+@@ -19150,14 +19857,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9143,7 +9010,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'
-@@ -19167,13 +19874,13 @@
+@@ -19169,13 +19876,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9159,7 +9026,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19192,10 +19899,12 @@
+@@ -19194,10 +19901,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9174,7 +9041,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'
-@@ -19204,8 +19913,18 @@
+@@ -19206,8 +19915,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9195,7 +9062,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19214,7 +19933,7 @@
+@@ -19216,7 +19935,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.
@@ -9204,7 +9071,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19274,9 +19993,9 @@
+@@ -19276,9 +19995,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9216,7 +9083,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19382,7 +20101,7 @@
+@@ -19384,7 +20103,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9225,7 +9092,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19392,7 +20111,20 @@
+@@ -19394,7 +20113,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9247,7 +9114,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19457,7 +20189,7 @@
+@@ -19459,7 +20191,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9256,7 +9123,7 @@
;;
beos*)
-@@ -19466,7 +20198,7 @@
+@@ -19468,7 +20200,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9265,7 +9132,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19482,7 +20214,7 @@
+@@ -19484,7 +20216,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9274,7 +9141,7 @@
need_version=no
need_lib_prefix=no
-@@ -19494,7 +20226,8 @@
+@@ -19496,7 +20228,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9284,7 +9151,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19524,7 +20257,7 @@
+@@ -19526,7 +20259,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9293,7 +9160,7 @@
;;
esac
;;
-@@ -19547,7 +20280,7 @@
+@@ -19549,7 +20282,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9302,7 +9169,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"`
-@@ -19570,7 +20303,7 @@
+@@ -19572,7 +20305,7 @@
dynamic_linker=no
;;
@@ -9311,7 +9178,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19582,8 +20315,17 @@
+@@ -19584,8 +20317,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9331,7 +9198,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19601,7 +20343,7 @@
+@@ -19603,7 +20345,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9340,7 +9207,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19628,9 +20370,9 @@
+@@ -19630,9 +20372,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9352,7 +9219,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19645,7 +20387,7 @@
+@@ -19647,7 +20389,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9361,7 +9228,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19656,7 +20398,7 @@
+@@ -19658,7 +20400,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9370,7 +9237,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19718,22 +20460,19 @@
+@@ -19720,22 +20462,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'
@@ -9399,7 +9266,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,
-@@ -19743,6 +20482,30 @@
+@@ -19745,6 +20484,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9430,7 +9297,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19752,7 +20515,7 @@
+@@ -19754,7 +20517,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9439,7 +9306,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19781,7 +20544,11 @@
+@@ -19783,7 +20546,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9452,7 +9319,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
-@@ -19801,7 +20568,7 @@
+@@ -19803,7 +20570,7 @@
os2*)
libname_spec='$name'
@@ -9461,7 +9328,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19903,8 +20670,8 @@
+@@ -19905,8 +20672,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" || \
@@ -9472,7 +9339,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20030,8 +20797,7 @@
+@@ -20032,8 +20799,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9482,7 +9349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20134,8 +20900,7 @@
+@@ -20136,8 +20902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9492,7 +9359,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20200,8 +20965,7 @@
+@@ -20202,8 +20967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9502,7 +9369,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20294,8 +21058,7 @@
+@@ -20296,8 +21060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9512,7 +9379,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20360,8 +21123,7 @@
+@@ -20362,8 +21125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9522,7 +9389,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20427,8 +21189,7 @@
+@@ -20429,8 +21191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9532,7 +9399,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20494,8 +21255,7 @@
+@@ -20496,8 +21257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9542,16 +9409,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20570,7 +21330,7 @@
+@@ -20572,7 +21332,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20573 "configure"
-+#line 21333 "configure"
+-#line 20575 "configure"
++#line 21335 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20636,7 +21396,7 @@
+@@ -20638,7 +21398,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9560,16 +9427,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20668,7 +21428,7 @@
+@@ -20670,7 +21430,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20671 "configure"
-+#line 21431 "configure"
+-#line 20673 "configure"
++#line 21433 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20734,7 +21494,7 @@
+@@ -20736,7 +21496,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9578,7 +9445,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20785,7 +21545,8 @@
+@@ -20787,7 +21547,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.
@@ -9588,7 +9455,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 \
-@@ -20885,6 +21646,12 @@
+@@ -20887,6 +21648,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9601,7 +9468,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20915,7 +21682,7 @@
+@@ -20917,7 +21684,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9610,7 +9477,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20946,7 +21713,7 @@
+@@ -20948,7 +21715,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9619,7 +9486,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20961,7 +21728,7 @@
+@@ -20963,7 +21730,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9628,7 +9495,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21163,7 +21930,10 @@
+@@ -21165,7 +21932,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.
@@ -9640,7 +9507,7 @@
fi
-@@ -21206,11 +21976,35 @@
+@@ -21208,11 +21978,35 @@
compiler=$CC
@@ -9676,7 +9543,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21226,7 +22020,8 @@
+@@ -21228,7 +22022,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.
@@ -9686,7 +9553,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 \
-@@ -21326,6 +22121,12 @@
+@@ -21328,6 +22123,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9699,7 +9566,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21356,7 +22157,7 @@
+@@ -21358,7 +22159,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9708,7 +9575,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21387,7 +22188,7 @@
+@@ -21389,7 +22190,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9717,7 +9584,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21402,7 +22203,7 @@
+@@ -21404,7 +22205,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9726,7 +9593,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21604,7 +22405,10 @@
+@@ -21606,7 +22407,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.
@@ -9738,7 +9605,7 @@
fi
-@@ -21651,7 +22455,7 @@
+@@ -21653,7 +22457,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9747,7 +9614,7 @@
# Prevent multiple expansion
-@@ -22092,8 +22896,7 @@
+@@ -22094,8 +22898,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9757,7 +9624,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22190,8 +22993,7 @@
+@@ -22192,8 +22995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9767,7 +9634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22260,8 +23062,7 @@
+@@ -22262,8 +23064,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9777,7 +9644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22364,8 +23165,7 @@
+@@ -22366,8 +23167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9787,7 +9654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22434,8 +23234,7 @@
+@@ -22436,8 +23236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9797,7 +9664,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22510,8 +23309,7 @@
+@@ -22512,8 +23311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9807,7 +9674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22618,8 +23416,7 @@
+@@ -22620,8 +23418,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9817,7 +9684,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22890,8 +23687,7 @@
+@@ -22892,8 +23689,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9827,7 +9694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23041,8 +23837,7 @@
+@@ -23043,8 +23839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9837,7 +9704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23227,8 +24022,7 @@
+@@ -23229,8 +24024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9847,7 +9714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23330,8 +24124,7 @@
+@@ -23332,8 +24126,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9857,7 +9724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23433,8 +24226,7 @@
+@@ -23435,8 +24228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9867,7 +9734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23535,8 +24327,7 @@
+@@ -23537,8 +24329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9877,7 +9744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23667,9 +24458,6 @@
+@@ -23669,9 +24460,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9887,7 +9754,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23703,8 +24491,7 @@
+@@ -23705,8 +24493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9897,7 +9764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23808,8 +24595,7 @@
+@@ -23810,8 +24597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9907,7 +9774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23888,9 +24674,6 @@
+@@ -23890,9 +24676,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9917,7 +9784,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23923,8 +24706,7 @@
+@@ -23925,8 +24708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9927,7 +9794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24027,8 +24809,7 @@
+@@ -24029,8 +24811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9937,7 +9804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24118,8 +24899,7 @@
+@@ -24120,8 +24901,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9947,7 +9814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24180,8 +24960,7 @@
+@@ -24182,8 +24962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9957,7 +9824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24249,8 +25028,7 @@
+@@ -24251,8 +25030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9967,7 +9834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24316,8 +25094,7 @@
+@@ -24318,8 +25096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9977,7 +9844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24410,8 +25187,7 @@
+@@ -24412,8 +25189,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9987,7 +9854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24489,8 +25265,7 @@
+@@ -24491,8 +25267,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9997,7 +9864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24574,8 +25349,7 @@
+@@ -24576,8 +25351,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10007,7 +9874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24643,8 +25417,7 @@
+@@ -24645,8 +25419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10017,7 +9884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24739,8 +25512,7 @@
+@@ -24741,8 +25514,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10027,7 +9894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24804,8 +25576,7 @@
+@@ -24806,8 +25578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10037,7 +9904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24900,8 +25671,7 @@
+@@ -24902,8 +25673,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10047,7 +9914,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24965,8 +25735,7 @@
+@@ -24967,8 +25737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10057,7 +9924,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25062,8 +25831,7 @@
+@@ -25064,8 +25833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10067,7 +9934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25127,8 +25895,7 @@
+@@ -25129,8 +25897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10077,7 +9944,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25225,8 +25992,7 @@
+@@ -25227,8 +25994,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10087,7 +9954,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25291,8 +26057,7 @@
+@@ -25293,8 +26059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10097,7 +9964,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25360,8 +26125,7 @@
+@@ -25362,8 +26127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10107,7 +9974,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25512,8 +26276,7 @@
+@@ -25514,8 +26278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10117,7 +9984,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25668,8 +26431,7 @@
+@@ -25670,8 +26433,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10127,7 +9994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25734,8 +26496,7 @@
+@@ -25736,8 +26498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10137,7 +10004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25882,8 +26643,7 @@
+@@ -25884,8 +26645,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10147,7 +10014,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26038,8 +26798,7 @@
+@@ -26040,8 +26800,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10157,7 +10024,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26095,9 +26854,6 @@
+@@ -26097,9 +26856,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10167,7 +10034,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26131,8 +26887,7 @@
+@@ -26133,8 +26889,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10177,7 +10044,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26236,8 +26991,7 @@
+@@ -26238,8 +26993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10187,7 +10054,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26337,8 +27091,7 @@
+@@ -26339,8 +27093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10197,7 +10064,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26412,8 +27165,7 @@
+@@ -26414,8 +27167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10207,7 +10074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26476,8 +27228,7 @@
+@@ -26478,8 +27230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10217,7 +10084,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26539,8 +27290,7 @@
+@@ -26541,8 +27292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10227,7 +10094,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26580,8 +27330,7 @@
+@@ -26582,8 +27332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10237,7 +10104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26637,8 +27386,7 @@
+@@ -26639,8 +27388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10247,7 +10114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26678,8 +27426,7 @@
+@@ -26680,8 +27428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10257,7 +10124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26743,8 +27490,7 @@
+@@ -26745,8 +27492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10267,7 +10134,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26775,10 +27521,8 @@
+@@ -26777,10 +27523,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10280,7 +10147,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26889,8 +27633,7 @@
+@@ -26891,8 +27635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10290,7 +10157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26952,8 +27695,7 @@
+@@ -26954,8 +27697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10300,7 +10167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26993,8 +27735,7 @@
+@@ -26995,8 +27737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10310,7 +10177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27050,8 +27791,7 @@
+@@ -27052,8 +27793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10320,7 +10187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27091,8 +27831,7 @@
+@@ -27093,8 +27833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10330,7 +10197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27156,8 +27895,7 @@
+@@ -27158,8 +27897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10340,7 +10207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27188,10 +27926,8 @@
+@@ -27190,10 +27928,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10353,7 +10220,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27302,8 +28038,7 @@
+@@ -27304,8 +28040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10363,7 +10230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27365,8 +28100,7 @@
+@@ -27367,8 +28102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10373,7 +10240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27406,8 +28140,7 @@
+@@ -27408,8 +28142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10383,7 +10250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27463,8 +28196,7 @@
+@@ -27465,8 +28198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10393,7 +10260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27504,8 +28236,7 @@
+@@ -27506,8 +28238,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10403,7 +10270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27569,8 +28300,7 @@
+@@ -27571,8 +28302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10413,7 +10280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27601,10 +28331,8 @@
+@@ -27603,10 +28333,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10426,7 +10293,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27715,8 +28443,7 @@
+@@ -27717,8 +28445,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10436,7 +10303,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27778,8 +28505,7 @@
+@@ -27780,8 +28507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10446,7 +10313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27819,8 +28545,7 @@
+@@ -27821,8 +28547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10456,7 +10323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27876,8 +28601,7 @@
+@@ -27878,8 +28603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10466,7 +10333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27917,8 +28641,7 @@
+@@ -27919,8 +28643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10476,7 +10343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27982,8 +28705,7 @@
+@@ -27984,8 +28707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10486,7 +10353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28014,10 +28736,8 @@
+@@ -28016,10 +28738,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10499,7 +10366,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28136,8 +28856,7 @@
+@@ -28138,8 +28858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10509,7 +10376,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28208,8 +28927,7 @@
+@@ -28210,8 +28929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10519,7 +10386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28279,8 +28997,7 @@
+@@ -28281,8 +28999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10529,7 +10396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28342,8 +29059,7 @@
+@@ -28344,8 +29061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10539,7 +10406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28383,8 +29099,7 @@
+@@ -28385,8 +29101,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10549,7 +10416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28440,8 +29155,7 @@
+@@ -28442,8 +29157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10559,7 +10426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28481,8 +29195,7 @@
+@@ -28483,8 +29197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10569,7 +10436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28546,8 +29259,7 @@
+@@ -28548,8 +29261,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10579,7 +10446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28578,10 +29290,8 @@
+@@ -28580,10 +29292,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10592,7 +10459,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28693,8 +29403,7 @@
+@@ -28695,8 +29405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10602,7 +10469,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28756,8 +29465,7 @@
+@@ -28758,8 +29467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10612,7 +10479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28797,8 +29505,7 @@
+@@ -28799,8 +29507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10622,7 +10489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28854,8 +29561,7 @@
+@@ -28856,8 +29563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10632,7 +10499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28895,8 +29601,7 @@
+@@ -28897,8 +29603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10642,7 +10509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28960,8 +29665,7 @@
+@@ -28962,8 +29667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10652,7 +10519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28992,10 +29696,8 @@
+@@ -28994,10 +29698,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10665,7 +10532,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29106,8 +29808,7 @@
+@@ -29108,8 +29810,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10675,7 +10542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29188,8 +29889,7 @@
+@@ -29190,8 +29891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10685,7 +10552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29289,8 +29989,7 @@
+@@ -29291,8 +29991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10695,7 +10562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29470,8 +30169,7 @@
+@@ -29472,8 +30171,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10705,7 +10572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29580,8 +30278,7 @@
+@@ -29582,8 +30280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10715,353 +10582,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29846,345 +30543,6 @@
-
-
-
-- echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
--echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
--
-- if test "x$GXX" = "xyes"; then
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-- #include <exception>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "GCC visibility push" >/dev/null 2>&1; then
--
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- kde_stdc_visibility_patched=yes
--else
--
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
-- visibility support. Disabling -fvisibility=hidden" >&5
--echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-- visibility support. Disabling -fvisibility=hidden" >&2;}
--
-- kde_stdc_visibility_patched=no
--fi
--rm -f conftest*
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
-- kde_have_gcc_visibility=no
--
--echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
--echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
--kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
+@@ -29945,8 +30642,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--fi
--
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
--
-- kde_have_gcc_visibility=yes
-- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
--echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
--if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--
-- safe_CXXFLAGS=$CXXFLAGS
-- CXXFLAGS="$CXXFLAGS $all_includes"
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
--
--int
--main ()
--{
--/* elvis is alive */
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -30041,8 +30737,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- kde_cv_val_qt_gcc_visibility_patched=no
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--kde_cv_val_qt_gcc_visibility_patched=yes
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
-- CXXFLAGS=$safe_CXXFLAGS
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--fi
--echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
--echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
--
-- if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--
-- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
--echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
--if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--
-- safe_CXXFLAGS=$CXXFLAGS
-- safe_LDFLAGS=$LDFLAGS
-- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-- LDFLAGS="$LDFLAGS -shared -fPIC"
--
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-- #include <string>
-- int some_function( void ) __attribute__ ((visibility("default")));
-- int some_function( void )
-- {
-- std::string s("blafasel");
-- return 0;
-- }
--
--int
--main ()
--{
--/* elvis is alive */
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -30135,8 +30830,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- kde_cv_val_gcc_visibility_bug=no
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--kde_cv_val_gcc_visibility_bug=yes
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--
-- CXXFLAGS=$safe_CXXFLAGS
-- LDFLAGS=$safe_LDFLAGS
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--fi
--echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
--echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
--
-- if test x$kde_cv_val_gcc_visibility_bug = xno; then
-- CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-- fi
--
--
-- HAVE_GCC_VISIBILITY=1
--
--cat >>confdefs.h <<_ACEOF
--#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
--_ACEOF
--
-- fi
--
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
--
--fi
--
-- fi
--
--
--
-
-
-
-@@ -30237,8 +30595,7 @@
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -30248,8 +30942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11071,7 +10622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30330,8 +30687,7 @@
+@@ -30341,8 +31034,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11081,7 +10632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30403,8 +30759,7 @@
+@@ -30414,8 +31106,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11091,7 +10642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30458,8 +30813,7 @@
+@@ -30469,8 +31160,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11101,7 +10652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30530,8 +30884,7 @@
+@@ -30541,8 +31231,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11111,7 +10662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30585,8 +30938,7 @@
+@@ -30596,8 +31285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11121,7 +10672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30653,8 +31005,7 @@
+@@ -30664,8 +31352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11131,7 +10682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30840,8 +31191,7 @@
+@@ -30851,8 +31538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11141,15 +10692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30962,6 +31312,7 @@
-
-
-
-+
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
- ac_ext=cc
-@@ -31007,8 +31358,7 @@
+@@ -31018,8 +31704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11159,7 +10702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31319,8 +31669,7 @@
+@@ -31330,8 +32015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11169,7 +10712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31543,8 +31892,7 @@
+@@ -31554,8 +32238,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11179,7 +10722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31620,8 +31968,7 @@
+@@ -31631,8 +32314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11189,7 +10732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31763,8 +32110,7 @@
+@@ -31774,8 +32456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11199,7 +10742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31839,8 +32185,7 @@
+@@ -31850,8 +32531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11209,7 +10752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31900,8 +32245,7 @@
+@@ -31911,8 +32591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11219,7 +10762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31984,8 +32328,7 @@
+@@ -31995,8 +32674,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11229,7 +10772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32078,8 +32421,7 @@
+@@ -32089,8 +32767,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11239,7 +10782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32187,8 +32529,7 @@
+@@ -32198,8 +32875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11249,7 +10792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32286,8 +32627,7 @@
+@@ -32297,8 +32973,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11259,7 +10802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32374,8 +32714,7 @@
+@@ -32385,8 +33060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11269,7 +10812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32452,8 +32791,7 @@
+@@ -32463,8 +33137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11279,25 +10822,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32506,7 +32844,7 @@
+@@ -32517,7 +33190,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 32509: $i/$j" >&5
-+ echo "configure: 32847: $i/$j" >&5
+- echo "configure: 32520: $i/$j" >&5
++ echo "configure: 33193: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -32804,7 +33142,7 @@
+@@ -32815,7 +33488,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 32807: $i/$j" >&5
-+ echo "configure: 33145: $i/$j" >&5
+- echo "configure: 32818: $i/$j" >&5
++ echo "configure: 33491: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -33481,8 +33819,7 @@
+@@ -33492,8 +34165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11307,34 +10850,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33640,7 +33977,7 @@
+@@ -33651,7 +34323,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 33643: $i/$j" >&5
-+ echo "configure: 33980: $i/$j" >&5
+- echo "configure: 33654: $i/$j" >&5
++ echo "configure: 34326: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -33670,7 +34007,7 @@
+@@ -33681,7 +34353,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 33673: $i/$j" >&5
-+ echo "configure: 34010: $i/$j" >&5
+- echo "configure: 33684: $i/$j" >&5
++ echo "configure: 34356: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -33688,7 +34025,7 @@
+@@ -33699,7 +34371,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 33691: $i/$j" >&5
-+ echo "configure: 34028: $i/$j" >&5
+- echo "configure: 33702: $i/$j" >&5
++ echo "configure: 34374: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -33908,8 +34245,7 @@
+@@ -33919,8 +34591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11344,7 +10887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33969,8 +34305,7 @@
+@@ -33980,8 +34651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11354,7 +10897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34063,8 +34398,7 @@
+@@ -34074,8 +34744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11364,7 +10907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34129,8 +34463,7 @@
+@@ -34140,8 +34809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11374,7 +10917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34254,8 +34587,7 @@
+@@ -34265,8 +34933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11384,7 +10927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34413,8 +34745,7 @@
+@@ -34424,8 +35091,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11394,7 +10937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34480,8 +34811,7 @@
+@@ -34491,8 +35157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11404,7 +10947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34523,8 +34853,7 @@
+@@ -34534,8 +35199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11414,7 +10957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34581,8 +34910,7 @@
+@@ -34592,8 +35256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11424,7 +10967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34764,8 +35092,7 @@
+@@ -34775,8 +35438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11434,7 +10977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34829,8 +35156,7 @@
+@@ -34840,8 +35502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11444,7 +10987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34898,8 +35224,7 @@
+@@ -34909,8 +35570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11454,7 +10997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35084,8 +35409,7 @@
+@@ -35095,8 +35755,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11464,7 +11007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35127,18 +35451,24 @@
+@@ -35138,18 +35797,24 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
@@ -11501,7 +11044,7 @@
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -35370,9 +35700,6 @@
+@@ -35381,9 +36046,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11511,7 +11054,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35405,8 +35732,7 @@
+@@ -35416,8 +36078,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11521,7 +11064,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35509,8 +35835,7 @@
+@@ -35520,8 +36181,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11531,7 +11074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35589,9 +35914,6 @@
+@@ -35600,9 +36260,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11541,7 +11084,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35622,8 +35944,7 @@
+@@ -35633,8 +36290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11551,7 +11094,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35724,8 +36045,7 @@
+@@ -35735,8 +36391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11561,7 +11104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35804,9 +36124,6 @@
+@@ -35815,9 +36470,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11571,7 +11114,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35841,8 +36158,7 @@
+@@ -35852,8 +36504,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11581,7 +11124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35947,8 +36263,7 @@
+@@ -35958,8 +36609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11591,7 +11134,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36027,9 +36342,6 @@
+@@ -36038,9 +36688,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11601,7 +11144,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36062,8 +36374,7 @@
+@@ -36073,8 +36720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11611,7 +11154,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36166,8 +36477,7 @@
+@@ -36177,8 +36823,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11621,7 +11164,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36245,9 +36555,6 @@
+@@ -36256,9 +36901,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11631,7 +11174,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36280,8 +36587,7 @@
+@@ -36291,8 +36933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11641,7 +11184,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36384,8 +36690,7 @@
+@@ -36395,8 +37036,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11651,7 +11194,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36479,8 +36784,7 @@
+@@ -36490,8 +37130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11661,7 +11204,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36562,8 +36866,7 @@
+@@ -36573,8 +37212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11671,7 +11214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36641,8 +36944,7 @@
+@@ -36652,8 +37290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11681,7 +11224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36791,8 +37093,7 @@
+@@ -36802,8 +37439,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11691,7 +11234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36944,8 +37245,7 @@
+@@ -36955,8 +37591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11701,7 +11244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37058,8 +37358,7 @@
+@@ -37069,8 +37704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11711,7 +11254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37211,8 +37510,7 @@
+@@ -37222,8 +37856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11721,7 +11264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37326,8 +37624,7 @@
+@@ -37337,8 +37970,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11731,7 +11274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37479,8 +37776,7 @@
+@@ -37490,8 +38122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11741,7 +11284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37594,8 +37890,7 @@
+@@ -37605,8 +38236,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11751,7 +11294,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37756,8 +38051,7 @@
+@@ -37767,8 +38397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11761,7 +11304,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37884,8 +38178,7 @@
+@@ -37895,8 +38524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11771,7 +11314,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38046,8 +38339,7 @@
+@@ -38057,8 +38685,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11781,7 +11324,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38220,8 +38512,7 @@
+@@ -38231,8 +38858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11791,7 +11334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38274,8 +38565,7 @@
+@@ -38285,8 +38911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11801,7 +11344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38336,9 +38626,6 @@
+@@ -38347,9 +38972,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11811,7 +11354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38374,8 +38661,7 @@
+@@ -38385,8 +39007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11821,7 +11364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38482,8 +38768,7 @@
+@@ -38493,8 +39114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11831,7 +11374,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38585,8 +38870,7 @@
+@@ -38596,8 +39216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11841,7 +11384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38634,8 +38918,7 @@
+@@ -38645,8 +39264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11851,7 +11394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38683,8 +38966,7 @@
+@@ -38694,8 +39312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11861,7 +11404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38793,8 +39075,7 @@
+@@ -38804,8 +39421,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11871,7 +11414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38872,8 +39153,7 @@
+@@ -38883,8 +39499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11881,7 +11424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38953,8 +39233,7 @@
+@@ -38964,8 +39579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11891,7 +11434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39068,8 +39347,7 @@
+@@ -39079,8 +39693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11901,7 +11444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39165,8 +39443,7 @@
+@@ -39176,8 +39789,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11911,7 +11454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39331,8 +39608,7 @@
+@@ -39342,8 +39954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11921,7 +11464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39393,8 +39669,7 @@
+@@ -39404,8 +40015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11931,7 +11474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39455,8 +39730,7 @@
+@@ -39466,8 +40076,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11941,7 +11484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39523,8 +39797,7 @@
+@@ -39534,8 +40143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11951,7 +11494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39604,8 +39877,7 @@
+@@ -39615,8 +40223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11961,7 +11504,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39695,8 +39967,7 @@
+@@ -39706,8 +40313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11971,7 +11514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39951,8 +40222,7 @@
+@@ -39962,8 +40568,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11981,7 +11524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40105,8 +40375,7 @@
+@@ -40116,8 +40721,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11991,7 +11534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40215,8 +40484,7 @@
+@@ -40226,8 +40830,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12001,7 +11544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40286,8 +40554,7 @@
+@@ -40297,8 +40900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12011,7 +11554,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40450,8 +40717,7 @@
+@@ -40461,8 +41063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12021,7 +11564,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40614,8 +40880,7 @@
+@@ -40625,8 +41226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12031,7 +11574,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40781,8 +41046,7 @@
+@@ -40792,8 +41392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12041,7 +11584,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40861,8 +41125,7 @@
+@@ -40872,8 +41471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12051,7 +11594,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40918,8 +41181,7 @@
+@@ -40929,8 +41527,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12061,7 +11604,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41288,8 +41550,7 @@
+@@ -41299,8 +41896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12071,7 +11614,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41387,8 +41648,7 @@
+@@ -41398,8 +41994,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12081,7 +11624,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41451,8 +41711,7 @@
+@@ -41462,8 +42057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12091,7 +11634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41533,8 +41792,7 @@
+@@ -41544,8 +42138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12101,7 +11644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41675,8 +41933,7 @@
+@@ -41686,8 +42279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12111,7 +11654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42244,6 +42501,13 @@
+@@ -42255,6 +42847,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -12125,7 +11668,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
-@@ -43003,6 +43267,9 @@
+@@ -43014,6 +43613,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -12135,7 +11678,7 @@
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -43363,11 +43630,6 @@
+@@ -43374,11 +43976,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12147,7 +11690,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -43406,6 +43668,12 @@
+@@ -43417,6 +44014,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
More information about the pkg-kde-commits
mailing list