[Pkg-kde-commits] rev 2464 - trunk/packages/kdetoys/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Nov 30 19:19:45 UTC 2005
Author: chrsmrtn
Date: 2005-11-30 19:19:43 +0000 (Wed, 30 Nov 2005)
New Revision: 2464
Modified:
trunk/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
buildprep update for kdetoys.
Modified: trunk/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/98_buildprep.diff 2005-11-30 19:14:53 UTC (rev 2463)
+++ trunk/packages/kdetoys/debian/patches/98_buildprep.diff 2005-11-30 19:19:43 UTC (rev 2464)
@@ -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~
@@ -2489,10 +2368,9 @@
else
- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -2522,9 +2400,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -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
@@ -2992,6 +2871,44 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- amor/data/Makefile.in
+++ amor/data/Makefile.in
@@ -190,6 +190,9 @@
@@ -3600,18 +3517,6 @@
+amorwidget.o: amorwidget.moc
amorbubble.lo: amorbubble.moc
amordialog.o: amordialog.moc
---- config.h.in
-+++ config.h.in
-@@ -277,9 +277,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 @@
@@ -3651,7 +3556,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1180,7 +1182,7 @@
+@@ -1182,7 +1184,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -3660,19 +3565,10 @@
done
fi
-@@ -1952,7 +1954,7 @@
+@@ -2085,6 +2087,31 @@
- # Define the identity of the package.
-- PACKAGE=kdetoys
-+ PACKAGE=kdetoys-rc1
- VERSION="3.5"
-
-@@ -2083,6 +2085,31 @@
-
-
-
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -3701,7 +3597,7 @@
unset CDPATH
-@@ -3016,8 +3043,7 @@
+@@ -3018,8 +3045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3711,7 +3607,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3075,8 +3101,7 @@
+@@ -3077,8 +3103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3721,7 +3617,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3192,8 +3217,7 @@
+@@ -3194,8 +3219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3731,7 +3627,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3247,8 +3271,7 @@
+@@ -3249,8 +3273,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3741,7 +3637,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3293,8 +3316,7 @@
+@@ -3295,8 +3318,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3751,7 +3647,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3338,8 +3360,7 @@
+@@ -3340,8 +3362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3761,7 +3657,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3896,8 +3917,7 @@
+@@ -3898,8 +3919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3771,7 +3667,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3955,8 +3975,7 @@
+@@ -3957,8 +3977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3781,7 +3677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4027,8 +4046,7 @@
+@@ -4029,8 +4048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3791,7 +3687,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4072,8 +4090,7 @@
+@@ -4074,8 +4092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3801,7 +3697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4251,8 +4268,7 @@
+@@ -4253,8 +4270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3811,7 +3707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4363,8 +4379,7 @@
+@@ -4365,8 +4381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3821,7 +3717,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4452,8 +4467,7 @@
+@@ -4454,8 +4469,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3831,7 +3727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4555,8 +4569,7 @@
+@@ -4557,8 +4571,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3841,7 +3737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4655,8 +4668,7 @@
+@@ -4657,8 +4670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3851,7 +3747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4740,8 +4752,7 @@
+@@ -4742,8 +4754,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3861,7 +3757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4830,8 +4841,7 @@
+@@ -4832,8 +4843,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3871,7 +3767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4918,8 +4928,7 @@
+@@ -4920,8 +4930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3881,7 +3777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5006,8 +5015,7 @@
+@@ -5008,8 +5017,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3891,7 +3787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5113,8 +5121,7 @@
+@@ -5115,8 +5123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3901,7 +3797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5201,8 +5208,7 @@
+@@ -5203,8 +5210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3911,7 +3807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5289,8 +5295,7 @@
+@@ -5291,8 +5297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3921,7 +3817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5377,8 +5382,7 @@
+@@ -5379,8 +5384,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3931,7 +3827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5509,8 +5513,7 @@
+@@ -5511,8 +5515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3941,7 +3837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5598,8 +5601,7 @@
+@@ -5600,8 +5603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3951,7 +3847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5686,8 +5688,7 @@
+@@ -5688,8 +5690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3961,7 +3857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5774,8 +5775,7 @@
+@@ -5776,8 +5777,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3971,7 +3867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5862,8 +5862,7 @@
+@@ -5864,8 +5864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3981,7 +3877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5950,8 +5949,7 @@
+@@ -5952,8 +5951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3991,7 +3887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6374,8 +6372,7 @@
+@@ -6376,8 +6374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4001,7 +3897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6501,8 +6498,7 @@
+@@ -6503,8 +6500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4011,7 +3907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6590,8 +6586,7 @@
+@@ -6592,8 +6588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4021,7 +3917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6674,185 +6669,6 @@
+@@ -6676,185 +6671,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -4207,7 +4103,7 @@
fi
-@@ -7016,7 +6832,7 @@
+@@ -7018,7 +6834,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
@@ -4216,7 +4112,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7121,7 +6937,7 @@
+@@ -7123,7 +6939,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,
@@ -4225,7 +4121,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'*)
-@@ -7155,7 +6971,7 @@
+@@ -7157,7 +6973,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4234,7 +4130,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7185,6 +7001,15 @@
+@@ -7187,6 +7003,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4250,7 +4146,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7271,44 +7096,36 @@
+@@ -7273,44 +7098,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -4305,7 +4201,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7324,7 +7141,7 @@
+@@ -7326,7 +7143,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -4314,7 +4210,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
-@@ -7341,42 +7158,21 @@
+@@ -7343,42 +7160,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -4364,7 +4260,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
-@@ -7395,19 +7191,14 @@
+@@ -7397,19 +7193,14 @@
;;
openbsd*)
@@ -4386,7 +4282,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7417,7 +7208,6 @@
+@@ -7419,7 +7210,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -4394,16 +4290,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7494,7 +7284,7 @@
+@@ -7496,7 +7286,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7497 "configure"' > conftest.$ac_ext
-+ echo '#line 7287 "configure"' > conftest.$ac_ext
+- echo '#line 7499 "configure"' > conftest.$ac_ext
++ echo '#line 7289 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7537,14 +7327,13 @@
+@@ -7539,14 +7329,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4420,7 +4316,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7556,7 +7345,6 @@
+@@ -7558,7 +7347,6 @@
esac
;;
*64-bit*)
@@ -4428,7 +4324,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7616,8 +7404,7 @@
+@@ -7618,8 +7406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4438,7 +4334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7692,8 +7479,7 @@
+@@ -7694,8 +7481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4448,7 +4344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7863,8 +7649,7 @@
+@@ -7865,8 +7651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4458,7 +4354,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7931,8 +7716,7 @@
+@@ -7933,8 +7718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4468,7 +4364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8047,6 +7831,243 @@
+@@ -8049,6 +7833,243 @@
done
@@ -4712,16 +4608,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'
-@@ -8139,7 +8160,7 @@
+@@ -8141,7 +8162,7 @@
# Provide some information about the compiler.
--echo "$as_me:8142:" \
-+echo "$as_me:8163:" \
+-echo "$as_me:8144:" \
++echo "$as_me:8165:" \
"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
-@@ -8185,8 +8206,7 @@
+@@ -8187,8 +8208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4731,7 +4627,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8235,8 +8255,7 @@
+@@ -8237,8 +8257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4741,7 +4637,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8294,7 +8313,7 @@
+@@ -8296,7 +8315,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4750,7 +4646,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8323,20 +8342,53 @@
+@@ -8325,20 +8344,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4810,7 +4706,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.
-@@ -8373,9 +8425,6 @@
+@@ -8375,9 +8427,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4820,7 +4716,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'"
-@@ -8397,6 +8446,13 @@
+@@ -8399,6 +8448,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'"
;;
@@ -4834,7 +4730,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8404,7 +8460,7 @@
+@@ -8406,7 +8462,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4843,7 +4739,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8422,14 +8478,17 @@
+@@ -8424,14 +8480,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4863,7 +4759,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8591,7 +8650,7 @@
+@@ -8593,7 +8652,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4872,7 +4768,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8611,7 +8670,7 @@
+@@ -8613,7 +8672,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4881,7 +4777,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8896,6 +8955,17 @@
+@@ -8898,6 +8957,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4899,7 +4795,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8921,7 +8991,7 @@
+@@ -8923,7 +8993,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4908,7 +4804,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
-@@ -8983,7 +9053,7 @@
+@@ -8985,7 +9055,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4917,7 +4813,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
-@@ -9082,6 +9152,20 @@
+@@ -9084,6 +9154,20 @@
compiler=$CC
@@ -4938,7 +4834,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9118,11 +9202,16 @@
+@@ -9120,11 +9204,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
@@ -4956,7 +4852,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9168,18 +9257,20 @@
+@@ -9170,18 +9259,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 \
@@ -4964,13 +4860,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:9174: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9263: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9176: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9178: \$? = $ac_status" >&5
-+ echo "$as_me:9267: \$? = $ac_status" >&5
+- echo "$as_me:9180: \$? = $ac_status" >&5
++ echo "$as_me:9269: \$? = $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
@@ -4982,7 +4878,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9256,7 +9347,7 @@
+@@ -9258,7 +9349,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4991,7 +4887,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9282,6 +9373,16 @@
+@@ -9284,6 +9375,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -5008,7 +4904,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9293,7 +9394,7 @@
+@@ -9295,7 +9396,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.
@@ -5017,7 +4913,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9317,12 +9418,19 @@
+@@ -9319,12 +9420,19 @@
;;
linux*)
@@ -5038,7 +4934,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9343,9 +9451,14 @@
+@@ -9345,9 +9453,14 @@
;;
solaris*)
@@ -5054,7 +4950,7 @@
;;
sunos4*)
-@@ -9367,6 +9480,11 @@
+@@ -9369,6 +9482,11 @@
fi
;;
@@ -5066,7 +4962,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9401,18 +9519,20 @@
+@@ -9403,18 +9521,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 \
@@ -5074,13 +4970,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:9407: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9525: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9409: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9527: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9411: \$? = $ac_status" >&5
-+ echo "$as_me:9529: \$? = $ac_status" >&5
+- echo "$as_me:9413: \$? = $ac_status" >&5
++ echo "$as_me:9531: \$? = $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
@@ -5092,7 +4988,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9433,7 +9553,7 @@
+@@ -9435,7 +9555,7 @@
fi
fi
@@ -5101,7 +4997,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9455,38 +9575,36 @@
+@@ -9457,38 +9577,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5122,13 +5018,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:9474: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9587: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9476: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9478: \$? = $ac_status" >&5
-+ echo "$as_me:9591: \$? = $ac_status" >&5
+- echo "$as_me:9480: \$? = $ac_status" >&5
++ echo "$as_me:9593: \$? = $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
@@ -5152,7 +5048,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9557,6 +9675,16 @@
+@@ -9559,6 +9677,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -5169,7 +5065,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9577,6 +9705,27 @@
+@@ -9579,6 +9707,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5197,7 +5093,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9614,7 +9763,7 @@
+@@ -9616,7 +9765,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5206,7 +5102,7 @@
else
ld_shlibs=no
fi
-@@ -9624,13 +9773,13 @@
+@@ -9626,13 +9775,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'
@@ -5223,17 +5119,18 @@
# 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
-@@ -9639,19 +9788,51 @@
+@@ -9641,19 +9790,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
-+ ;;
-+
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -5261,12 +5158,11 @@
+ $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
- ;;
-
-- netbsd*)
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
+ 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'
@@ -5279,7 +5175,7 @@
fi
;;
-@@ -9669,8 +9850,8 @@
+@@ -9671,8 +9852,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5290,7 +5186,7 @@
else
ld_shlibs=no
fi
-@@ -9685,24 +9866,19 @@
+@@ -9687,24 +9868,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5322,7 +5218,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9736,9 +9912,20 @@
+@@ -9738,9 +9914,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
@@ -5345,7 +5241,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9755,7 +9942,7 @@
+@@ -9757,7 +9944,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -5354,7 +5250,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`
-@@ -9776,6 +9963,9 @@
+@@ -9778,6 +9965,9 @@
fi
esac
shared_flag='-shared'
@@ -5364,7 +5260,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9784,21 +9974,22 @@
+@@ -9786,21 +9976,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5392,7 +5288,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9822,8 +10013,7 @@
+@@ -9824,8 +10015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5402,7 +5298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9850,14 +10040,13 @@
+@@ -9852,14 +10042,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5420,7 +5316,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9884,8 +10073,7 @@
+@@ -9886,8 +10075,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5430,7 +5326,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9922,8 +10110,8 @@
+@@ -9924,8 +10112,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -5441,7 +5337,7 @@
fi
fi
;;
-@@ -9936,7 +10124,7 @@
+@@ -9938,7 +10126,7 @@
ld_shlibs=no
;;
@@ -5450,7 +5346,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9946,13 +10134,13 @@
+@@ -9948,13 +10136,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5467,7 +5363,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.
-@@ -9962,52 +10150,52 @@
+@@ -9964,52 +10152,52 @@
;;
darwin* | rhapsody*)
@@ -5560,7 +5456,7 @@
fi
;;
-@@ -10041,8 +10229,8 @@
+@@ -10043,8 +10231,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5571,7 +5467,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10050,7 +10238,7 @@
+@@ -10052,7 +10240,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5580,7 +5476,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
-@@ -10066,16 +10254,16 @@
+@@ -10068,16 +10256,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5601,7 +5497,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10085,7 +10273,7 @@
+@@ -10087,7 +10275,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5610,7 +5506,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10118,7 +10306,7 @@
+@@ -10120,7 +10308,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5619,7 +5515,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'
-@@ -10128,7 +10316,7 @@
+@@ -10130,7 +10318,7 @@
link_all_deplibs=yes
;;
@@ -5628,7 +5524,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10151,7 +10339,8 @@
+@@ -10153,7 +10341,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
@@ -5638,7 +5534,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10161,7 +10350,7 @@
+@@ -10163,7 +10352,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5647,7 +5543,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10172,14 +10361,14 @@
+@@ -10174,14 +10363,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5664,7 +5560,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'
-@@ -10191,13 +10380,13 @@
+@@ -10193,13 +10382,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5680,7 +5576,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10216,10 +10405,12 @@
+@@ -10218,10 +10407,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5695,7 +5591,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'
-@@ -10228,8 +10419,18 @@
+@@ -10230,8 +10421,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5716,7 +5612,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10238,7 +10439,7 @@
+@@ -10240,7 +10441,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.
@@ -5725,7 +5621,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10298,9 +10499,9 @@
+@@ -10300,9 +10501,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5737,7 +5633,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10406,7 +10607,7 @@
+@@ -10408,7 +10609,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5746,7 +5642,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10416,7 +10617,20 @@
+@@ -10418,7 +10619,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5768,7 +5664,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10481,7 +10695,7 @@
+@@ -10483,7 +10697,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5777,7 +5673,7 @@
;;
beos*)
-@@ -10490,7 +10704,7 @@
+@@ -10492,7 +10706,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5786,7 +5682,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10506,7 +10720,7 @@
+@@ -10508,7 +10722,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5795,7 +5691,7 @@
need_version=no
need_lib_prefix=no
-@@ -10518,7 +10732,8 @@
+@@ -10520,7 +10734,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5805,7 +5701,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10548,7 +10763,7 @@
+@@ -10550,7 +10765,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5814,7 +5710,7 @@
;;
esac
;;
-@@ -10571,7 +10786,7 @@
+@@ -10573,7 +10788,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5823,7 +5719,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"`
-@@ -10594,7 +10809,7 @@
+@@ -10596,7 +10811,7 @@
dynamic_linker=no
;;
@@ -5832,7 +5728,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10606,8 +10821,17 @@
+@@ -10608,8 +10823,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5852,7 +5748,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10625,7 +10849,7 @@
+@@ -10627,7 +10851,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5861,7 +5757,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10652,9 +10876,9 @@
+@@ -10654,9 +10878,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5873,7 +5769,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10669,7 +10893,7 @@
+@@ -10671,7 +10895,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5882,7 +5778,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10680,7 +10904,7 @@
+@@ -10682,7 +10906,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5891,7 +5787,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10742,22 +10966,19 @@
+@@ -10744,22 +10968,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'
@@ -5920,7 +5816,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,
-@@ -10767,6 +10988,30 @@
+@@ -10769,6 +10990,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5951,7 +5847,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10776,7 +11021,7 @@
+@@ -10778,7 +11023,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5960,7 +5856,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10805,7 +11050,11 @@
+@@ -10807,7 +11052,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5973,7 +5869,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
-@@ -10825,7 +11074,7 @@
+@@ -10827,7 +11076,7 @@
os2*)
libname_spec='$name'
@@ -5982,7 +5878,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10927,8 +11176,8 @@
+@@ -10929,8 +11178,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5993,7 +5889,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11054,8 +11303,7 @@
+@@ -11056,8 +11305,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6003,7 +5899,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11158,8 +11406,7 @@
+@@ -11160,8 +11408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6013,7 +5909,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11224,8 +11471,7 @@
+@@ -11226,8 +11473,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6023,7 +5919,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11318,8 +11564,7 @@
+@@ -11320,8 +11566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6033,7 +5929,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11384,8 +11629,7 @@
+@@ -11386,8 +11631,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6043,7 +5939,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11451,8 +11695,7 @@
+@@ -11453,8 +11697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6053,7 +5949,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11518,8 +11761,7 @@
+@@ -11520,8 +11763,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6063,16 +5959,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11594,7 +11836,7 @@
+@@ -11596,7 +11838,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11597 "configure"
-+#line 11839 "configure"
+-#line 11599 "configure"
++#line 11841 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11660,7 +11902,7 @@
+@@ -11662,7 +11904,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6081,16 +5977,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11692,7 +11934,7 @@
+@@ -11694,7 +11936,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11695 "configure"
-+#line 11937 "configure"
+-#line 11697 "configure"
++#line 11939 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11758,7 +12000,7 @@
+@@ -11760,7 +12002,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6099,7 +5995,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11808,7 +12050,7 @@
+@@ -11810,7 +12052,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -6108,7 +6004,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11817,47 +12059,10 @@
+@@ -11819,47 +12061,10 @@
fi
;;
@@ -6157,7 +6053,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11883,7 +12088,8 @@
+@@ -11885,7 +12090,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.
@@ -6167,7 +6063,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 \
-@@ -11997,11 +12203,11 @@
+@@ -11999,11 +12205,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -6181,7 +6077,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12031,6 +12237,12 @@
+@@ -12033,6 +12239,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -6194,7 +6090,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12061,7 +12273,7 @@
+@@ -12063,7 +12275,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6203,7 +6099,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12092,7 +12304,7 @@
+@@ -12094,7 +12306,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6212,7 +6108,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12107,7 +12319,7 @@
+@@ -12109,7 +12321,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -6221,7 +6117,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12334,7 +12546,10 @@
+@@ -12336,7 +12548,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.
@@ -6233,7 +6129,7 @@
fi
-@@ -12399,7 +12614,9 @@
+@@ -12401,7 +12616,9 @@
case $tagname in
CXX)
@@ -6244,7 +6140,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12436,7 +12653,7 @@
+@@ -12438,7 +12655,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -6253,7 +6149,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12457,6 +12674,20 @@
+@@ -12459,6 +12676,20 @@
compiler=$CC
@@ -6274,7 +6170,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12478,7 +12709,16 @@
+@@ -12480,7 +12711,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -6292,7 +6188,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12549,7 +12789,7 @@
+@@ -12551,7 +12791,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,
@@ -6301,7 +6197,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'*)
-@@ -12583,7 +12823,7 @@
+@@ -12585,7 +12825,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6310,7 +6206,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12602,8 +12842,8 @@
+@@ -12604,8 +12844,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
@@ -6321,7 +6217,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12629,7 +12869,7 @@
+@@ -12631,7 +12871,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.
@@ -6330,7 +6226,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12660,8 +12900,22 @@
+@@ -12662,8 +12902,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -6355,7 +6251,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12678,7 +12932,7 @@
+@@ -12680,7 +12934,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -6364,7 +6260,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`
-@@ -12699,6 +12953,9 @@
+@@ -12701,6 +12955,9 @@
fi
esac
shared_flag='-shared'
@@ -6374,7 +6270,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12707,15 +12964,16 @@
+@@ -12709,15 +12966,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6395,7 +6291,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.
-@@ -12745,8 +13003,7 @@
+@@ -12747,8 +13005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6405,7 +6301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12775,13 +13032,12 @@
+@@ -12777,13 +13034,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6421,7 +6317,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12808,8 +13064,7 @@
+@@ -12810,8 +13066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6431,7 +6327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12846,8 +13101,8 @@
+@@ -12848,8 +13103,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -6442,7 +6338,7 @@
fi
fi
;;
-@@ -12860,16 +13115,17 @@
+@@ -12862,16 +13117,17 @@
esac
;;
@@ -6462,7 +6358,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
-@@ -12878,70 +13134,81 @@
+@@ -12880,70 +13136,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6596,7 +6492,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12952,14 +13219,14 @@
+@@ -12954,14 +13221,14 @@
;;
esac
;;
@@ -6613,7 +6509,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12976,12 +13243,12 @@
+@@ -12978,12 +13245,12 @@
# location of the library.
case $cc_basename in
@@ -6629,7 +6525,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12990,11 +13257,11 @@
+@@ -12992,11 +13259,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.
@@ -6643,7 +6539,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13004,7 +13271,7 @@
+@@ -13006,7 +13273,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6652,7 +6548,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13020,7 +13287,7 @@
+@@ -13022,7 +13289,7 @@
;;
esac
fi
@@ -6661,7 +6557,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13041,17 +13308,17 @@
+@@ -13043,17 +13310,17 @@
esac
case $cc_basename in
@@ -6683,7 +6579,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13067,12 +13334,12 @@
+@@ -13069,12 +13336,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6698,7 +6594,7 @@
;;
esac
fi
-@@ -13085,9 +13352,9 @@
+@@ -13087,9 +13354,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6710,7 +6606,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13098,9 +13365,9 @@
+@@ -13100,9 +13367,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6722,7 +6618,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13111,14 +13378,14 @@
+@@ -13113,14 +13380,14 @@
;;
linux*)
case $cc_basename in
@@ -6740,7 +6636,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13136,20 +13403,44 @@
+@@ -13138,20 +13405,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6791,7 +6687,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13177,7 +13468,7 @@
+@@ -13179,7 +13470,7 @@
;;
mvs*)
case $cc_basename in
@@ -6800,7 +6696,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13187,7 +13478,7 @@
+@@ -13189,7 +13480,7 @@
;;
esac
;;
@@ -6809,7 +6705,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=
-@@ -13198,15 +13489,31 @@
+@@ -13200,15 +13491,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::"'
;;
@@ -6843,7 +6739,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13216,14 +13523,14 @@
+@@ -13218,14 +13525,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6861,7 +6757,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13241,7 +13548,7 @@
+@@ -13243,7 +13550,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6870,7 +6766,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13260,13 +13567,13 @@
+@@ -13262,13 +13569,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6886,7 +6782,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13275,17 +13582,17 @@
+@@ -13277,17 +13584,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6908,7 +6804,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13304,7 +13611,7 @@
+@@ -13306,7 +13613,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6917,7 +6813,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13328,7 +13635,7 @@
+@@ -13330,7 +13637,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6926,7 +6822,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13340,12 +13647,12 @@
+@@ -13342,12 +13649,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6941,7 +6837,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13358,36 +13665,33 @@
+@@ -13360,36 +13667,33 @@
;;
solaris*)
case $cc_basename in
@@ -6990,7 +6886,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13395,9 +13699,9 @@
+@@ -13397,9 +13701,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -7002,7 +6898,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13407,9 +13711,9 @@
+@@ -13409,9 +13713,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
@@ -7014,7 +6910,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13418,9 +13722,9 @@
+@@ -13420,9 +13724,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7026,7 +6922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13438,7 +13742,7 @@
+@@ -13440,7 +13744,7 @@
;;
tandem*)
case $cc_basename in
@@ -7035,7 +6931,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13495,7 +13799,7 @@
+@@ -13497,7 +13801,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.
@@ -7044,7 +6940,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13535,7 +13839,7 @@
+@@ -13537,7 +13841,7 @@
fi
;;
@@ -7053,7 +6949,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13571,6 +13875,20 @@
+@@ -13573,6 +13877,20 @@
$rm -f confest.$objext
@@ -7074,7 +6970,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13626,7 +13944,7 @@
+@@ -13628,7 +13946,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7083,7 +6979,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13651,18 +13969,28 @@
+@@ -13653,18 +13971,28 @@
;;
chorus*)
case $cc_basename in
@@ -7115,7 +7011,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13670,22 +13998,22 @@
+@@ -13672,22 +14000,22 @@
;;
esac
;;
@@ -7142,7 +7038,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13700,7 +14028,7 @@
+@@ -13702,7 +14030,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -7151,7 +7047,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13711,18 +14039,24 @@
+@@ -13713,18 +14041,24 @@
;;
linux*)
case $cc_basename in
@@ -7179,7 +7075,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13739,25 +14073,25 @@
+@@ -13741,25 +14075,25 @@
;;
mvs*)
case $cc_basename in
@@ -7210,7 +7106,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13773,7 +14107,7 @@
+@@ -13775,7 +14109,7 @@
;;
sco*)
case $cc_basename in
@@ -7219,7 +7115,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13782,13 +14116,13 @@
+@@ -13784,13 +14118,13 @@
;;
solaris*)
case $cc_basename in
@@ -7235,7 +7131,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13798,12 +14132,12 @@
+@@ -13800,12 +14134,12 @@
;;
sunos4*)
case $cc_basename in
@@ -7250,7 +7146,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13813,7 +14147,7 @@
+@@ -13815,7 +14149,7 @@
;;
tandem*)
case $cc_basename in
@@ -7259,7 +7155,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13854,18 +14188,20 @@
+@@ -13856,18 +14190,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 \
@@ -7267,13 +7163,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:13860: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14194: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13862: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13864: \$? = $ac_status" >&5
-+ echo "$as_me:14198: \$? = $ac_status" >&5
+- echo "$as_me:13866: \$? = $ac_status" >&5
++ echo "$as_me:14200: \$? = $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
@@ -7285,7 +7181,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13886,7 +14222,7 @@
+@@ -13888,7 +14224,7 @@
fi
fi
@@ -7294,7 +7190,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13908,38 +14244,36 @@
+@@ -13910,38 +14246,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7315,13 +7211,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:13927: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14256: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13929: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14258: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13931: \$? = $ac_status" >&5
-+ echo "$as_me:14260: \$? = $ac_status" >&5
+- echo "$as_me:13933: \$? = $ac_status" >&5
++ echo "$as_me:14262: \$? = $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
@@ -7345,7 +7241,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13989,7 +14323,10 @@
+@@ -13991,7 +14325,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -7357,7 +7253,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14072,7 +14409,7 @@
+@@ -14074,7 +14411,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7366,7 +7262,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14082,7 +14419,20 @@
+@@ -14084,7 +14421,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7388,7 +7284,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14147,7 +14497,7 @@
+@@ -14149,7 +14499,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7397,7 +7293,7 @@
;;
beos*)
-@@ -14156,7 +14506,7 @@
+@@ -14158,7 +14508,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7406,7 +7302,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14172,7 +14522,7 @@
+@@ -14174,7 +14524,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7415,7 +7311,7 @@
need_version=no
need_lib_prefix=no
-@@ -14184,7 +14534,8 @@
+@@ -14186,7 +14536,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7425,7 +7321,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14214,7 +14565,7 @@
+@@ -14216,7 +14567,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7434,7 +7330,7 @@
;;
esac
;;
-@@ -14237,7 +14588,7 @@
+@@ -14239,7 +14590,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7443,7 +7339,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"`
-@@ -14260,7 +14611,7 @@
+@@ -14262,7 +14613,7 @@
dynamic_linker=no
;;
@@ -7452,7 +7348,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14272,8 +14623,17 @@
+@@ -14274,8 +14625,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7472,7 +7368,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14291,7 +14651,7 @@
+@@ -14293,7 +14653,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7481,7 +7377,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14318,9 +14678,9 @@
+@@ -14320,9 +14680,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7493,7 +7389,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14335,7 +14695,7 @@
+@@ -14337,7 +14697,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7502,7 +7398,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14346,7 +14706,7 @@
+@@ -14348,7 +14708,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7511,7 +7407,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14408,22 +14768,19 @@
+@@ -14410,22 +14770,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'
@@ -7540,7 +7436,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,
-@@ -14433,6 +14790,30 @@
+@@ -14435,6 +14792,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7571,7 +7467,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14442,7 +14823,7 @@
+@@ -14444,7 +14825,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7580,7 +7476,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14471,7 +14852,11 @@
+@@ -14473,7 +14854,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7593,7 +7489,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
-@@ -14491,7 +14876,7 @@
+@@ -14493,7 +14878,7 @@
os2*)
libname_spec='$name'
@@ -7602,7 +7498,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14593,8 +14978,8 @@
+@@ -14595,8 +14980,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" || \
@@ -7613,7 +7509,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14720,8 +15105,7 @@
+@@ -14722,8 +15107,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7623,7 +7519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14824,8 +15208,7 @@
+@@ -14826,8 +15210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7633,7 +7529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14890,8 +15273,7 @@
+@@ -14892,8 +15275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7643,7 +7539,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14984,8 +15366,7 @@
+@@ -14986,8 +15368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7653,7 +7549,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15050,8 +15431,7 @@
+@@ -15052,8 +15433,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7663,7 +7559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15117,8 +15497,7 @@
+@@ -15119,8 +15499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7673,7 +7569,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15184,8 +15563,7 @@
+@@ -15186,8 +15565,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7683,16 +7579,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15260,7 +15638,7 @@
+@@ -15262,7 +15640,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15263 "configure"
-+#line 15641 "configure"
+-#line 15265 "configure"
++#line 15643 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15326,7 +15704,7 @@
+@@ -15328,7 +15706,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7701,16 +7597,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15358,7 +15736,7 @@
+@@ -15360,7 +15738,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15361 "configure"
-+#line 15739 "configure"
+-#line 15363 "configure"
++#line 15741 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15424,7 +15802,7 @@
+@@ -15426,7 +15804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7719,7 +7615,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15475,7 +15853,8 @@
+@@ -15477,7 +15855,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.
@@ -7729,7 +7625,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 \
-@@ -15575,6 +15954,12 @@
+@@ -15577,6 +15956,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7742,7 +7638,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15605,7 +15990,7 @@
+@@ -15607,7 +15992,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7751,7 +7647,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15636,7 +16021,7 @@
+@@ -15638,7 +16023,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7760,7 +7656,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15651,7 +16036,7 @@
+@@ -15653,7 +16038,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7769,7 +7665,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15853,7 +16238,10 @@
+@@ -15855,7 +16240,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.
@@ -7781,7 +7677,7 @@
fi
-@@ -15929,12 +16317,35 @@
+@@ -15931,12 +16319,35 @@
compiler=$CC
@@ -7818,7 +7714,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15947,7 +16358,7 @@
+@@ -15949,7 +16360,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7827,7 +7723,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15955,8 +16366,10 @@
+@@ -15957,8 +16368,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7840,7 +7736,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16033,7 +16446,7 @@
+@@ -16035,7 +16448,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7849,7 +7745,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16059,6 +16472,16 @@
+@@ -16061,6 +16474,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7866,7 +7762,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16070,7 +16493,7 @@
+@@ -16072,7 +16495,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.
@@ -7875,7 +7771,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16094,12 +16517,19 @@
+@@ -16096,12 +16519,19 @@
;;
linux*)
@@ -7896,7 +7792,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16120,9 +16550,14 @@
+@@ -16122,9 +16552,14 @@
;;
solaris*)
@@ -7912,7 +7808,7 @@
;;
sunos4*)
-@@ -16144,6 +16579,11 @@
+@@ -16146,6 +16581,11 @@
fi
;;
@@ -7924,7 +7820,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16178,18 +16618,20 @@
+@@ -16180,18 +16620,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 \
@@ -7932,13 +7828,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:16184: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16624: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16186: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16626: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16188: \$? = $ac_status" >&5
-+ echo "$as_me:16628: \$? = $ac_status" >&5
+- echo "$as_me:16190: \$? = $ac_status" >&5
++ echo "$as_me:16630: \$? = $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
@@ -7950,7 +7846,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16210,7 +16652,7 @@
+@@ -16212,7 +16654,7 @@
fi
fi
@@ -7959,7 +7855,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16232,38 +16674,36 @@
+@@ -16234,38 +16676,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7980,13 +7876,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:16251: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16686: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16253: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16255: \$? = $ac_status" >&5
-+ echo "$as_me:16690: \$? = $ac_status" >&5
+- echo "$as_me:16257: \$? = $ac_status" >&5
++ echo "$as_me:16692: \$? = $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
@@ -8010,7 +7906,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16334,6 +16774,16 @@
+@@ -16336,6 +16776,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8027,7 +7923,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16354,6 +16804,27 @@
+@@ -16356,6 +16806,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8055,7 +7951,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16391,7 +16862,7 @@
+@@ -16393,7 +16864,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8064,7 +7960,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16401,13 +16872,13 @@
+@@ -16403,13 +16874,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'
@@ -8081,13 +7977,14 @@
# 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
-@@ -16416,19 +16887,51 @@
+@@ -16418,19 +16889,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
+ else
+- ld_shlibs=no
+ ld_shlibs_F77=no
+ fi
+ ;;
@@ -8119,8 +8016,7 @@
+ $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_F77=no
- else
-- ld_shlibs=no
++ else
+ ld_shlibs_F77=no
fi
;;
@@ -8138,7 +8034,7 @@
fi
;;
-@@ -16446,8 +16949,8 @@
+@@ -16448,8 +16951,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8149,7 +8045,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16462,24 +16965,19 @@
+@@ -16464,24 +16967,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8181,7 +8077,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16513,9 +17011,20 @@
+@@ -16515,9 +17013,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
@@ -8204,7 +8100,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16532,7 +17041,7 @@
+@@ -16534,7 +17043,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -8213,7 +8109,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`
-@@ -16553,6 +17062,9 @@
+@@ -16555,6 +17064,9 @@
fi
esac
shared_flag='-shared'
@@ -8223,7 +8119,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16561,21 +17073,22 @@
+@@ -16563,21 +17075,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8251,7 +8147,7 @@
program main
end
-@@ -16589,8 +17102,7 @@
+@@ -16591,8 +17104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8261,7 +8157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16617,14 +17129,13 @@
+@@ -16619,14 +17131,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8279,7 +8175,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16641,8 +17152,7 @@
+@@ -16643,8 +17154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8289,7 +8185,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16679,8 +17189,8 @@
+@@ -16681,8 +17191,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -8300,7 +8196,7 @@
fi
fi
;;
-@@ -16693,7 +17203,7 @@
+@@ -16695,7 +17205,7 @@
ld_shlibs_F77=no
;;
@@ -8309,7 +8205,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16703,68 +17213,68 @@
+@@ -16705,68 +17215,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8422,7 +8318,7 @@
fi
;;
-@@ -16798,8 +17308,8 @@
+@@ -16800,8 +17310,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8433,7 +8329,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16807,7 +17317,7 @@
+@@ -16809,7 +17319,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8442,7 +8338,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
-@@ -16823,16 +17333,16 @@
+@@ -16825,16 +17335,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8463,7 +8359,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16842,7 +17352,7 @@
+@@ -16844,7 +17354,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8472,7 +8368,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16875,7 +17385,7 @@
+@@ -16877,7 +17387,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8481,7 +8377,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'
-@@ -16885,7 +17395,7 @@
+@@ -16887,7 +17397,7 @@
link_all_deplibs_F77=yes
;;
@@ -8490,7 +8386,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
-@@ -16908,7 +17418,8 @@
+@@ -16910,7 +17420,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
@@ -8500,7 +8396,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16918,7 +17429,7 @@
+@@ -16920,7 +17431,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8509,7 +8405,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16929,14 +17440,14 @@
+@@ -16931,14 +17442,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8526,7 +8422,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'
-@@ -16948,13 +17459,13 @@
+@@ -16950,13 +17461,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8542,7 +8438,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16973,10 +17484,12 @@
+@@ -16975,10 +17486,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8557,7 +8453,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'
-@@ -16985,8 +17498,18 @@
+@@ -16987,8 +17500,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8578,7 +8474,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16995,7 +17518,7 @@
+@@ -16997,7 +17520,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.
@@ -8587,7 +8483,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17055,9 +17578,9 @@
+@@ -17057,9 +17580,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8599,7 +8495,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17163,7 +17686,7 @@
+@@ -17165,7 +17688,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8608,7 +8504,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17173,7 +17696,20 @@
+@@ -17175,7 +17698,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8630,7 +8526,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17238,7 +17774,7 @@
+@@ -17240,7 +17776,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8639,7 +8535,7 @@
;;
beos*)
-@@ -17247,7 +17783,7 @@
+@@ -17249,7 +17785,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8648,7 +8544,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17263,7 +17799,7 @@
+@@ -17265,7 +17801,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8657,7 +8553,7 @@
need_version=no
need_lib_prefix=no
-@@ -17275,7 +17811,8 @@
+@@ -17277,7 +17813,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8667,7 +8563,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17305,7 +17842,7 @@
+@@ -17307,7 +17844,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8676,7 +8572,7 @@
;;
esac
;;
-@@ -17328,7 +17865,7 @@
+@@ -17330,7 +17867,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8685,7 +8581,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"`
-@@ -17351,7 +17888,7 @@
+@@ -17353,7 +17890,7 @@
dynamic_linker=no
;;
@@ -8694,7 +8590,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17363,8 +17900,17 @@
+@@ -17365,8 +17902,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8714,7 +8610,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17382,7 +17928,7 @@
+@@ -17384,7 +17930,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8723,7 +8619,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17409,9 +17955,9 @@
+@@ -17411,9 +17957,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8735,7 +8631,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17426,7 +17972,7 @@
+@@ -17428,7 +17974,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8744,7 +8640,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17437,7 +17983,7 @@
+@@ -17439,7 +17985,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8753,7 +8649,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17499,22 +18045,19 @@
+@@ -17501,22 +18047,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'
@@ -8782,7 +8678,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,
-@@ -17524,6 +18067,30 @@
+@@ -17526,6 +18069,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8813,7 +8709,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17533,7 +18100,7 @@
+@@ -17535,7 +18102,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8822,7 +8718,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17562,7 +18129,11 @@
+@@ -17564,7 +18131,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8835,7 +8731,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
-@@ -17582,7 +18153,7 @@
+@@ -17584,7 +18155,7 @@
os2*)
libname_spec='$name'
@@ -8844,7 +8740,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17684,8 +18255,8 @@
+@@ -17686,8 +18257,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" || \
@@ -8855,7 +8751,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17761,7 +18332,8 @@
+@@ -17763,7 +18334,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.
@@ -8865,7 +8761,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 \
-@@ -17861,6 +18433,12 @@
+@@ -17863,6 +18435,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8878,7 +8774,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17891,7 +18469,7 @@
+@@ -17893,7 +18471,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8887,7 +8783,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17922,7 +18500,7 @@
+@@ -17924,7 +18502,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8896,7 +8792,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17937,7 +18515,7 @@
+@@ -17939,7 +18517,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8905,7 +8801,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18139,7 +18717,10 @@
+@@ -18141,7 +18719,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.
@@ -8917,7 +8813,7 @@
fi
-@@ -18172,7 +18753,7 @@
+@@ -18174,7 +18755,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8926,7 +8822,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18183,15 +18764,41 @@
+@@ -18185,15 +18766,41 @@
compiler=$CC
@@ -8968,7 +8864,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
-@@ -18218,18 +18825,20 @@
+@@ -18220,18 +18827,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 \
@@ -8976,13 +8872,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:18224: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18831: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18226: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18833: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18228: \$? = $ac_status" >&5
-+ echo "$as_me:18835: \$? = $ac_status" >&5
+- echo "$as_me:18230: \$? = $ac_status" >&5
++ echo "$as_me:18837: \$? = $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
@@ -8994,7 +8890,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18306,7 +18915,7 @@
+@@ -18308,7 +18917,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -9003,7 +8899,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18332,6 +18941,16 @@
+@@ -18334,6 +18943,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -9020,7 +8916,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18343,7 +18962,7 @@
+@@ -18345,7 +18964,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.
@@ -9029,7 +8925,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18367,12 +18986,19 @@
+@@ -18369,12 +18988,19 @@
;;
linux*)
@@ -9050,7 +8946,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18393,9 +19019,14 @@
+@@ -18395,9 +19021,14 @@
;;
solaris*)
@@ -9066,7 +8962,7 @@
;;
sunos4*)
-@@ -18417,6 +19048,11 @@
+@@ -18419,6 +19050,11 @@
fi
;;
@@ -9078,7 +8974,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18451,18 +19087,20 @@
+@@ -18453,18 +19089,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 \
@@ -9086,13 +8982,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:18457: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19093: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18459: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19095: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18461: \$? = $ac_status" >&5
-+ echo "$as_me:19097: \$? = $ac_status" >&5
+- echo "$as_me:18463: \$? = $ac_status" >&5
++ echo "$as_me:19099: \$? = $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
@@ -9104,7 +9000,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18483,7 +19121,7 @@
+@@ -18485,7 +19123,7 @@
fi
fi
@@ -9113,7 +9009,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18505,38 +19143,36 @@
+@@ -18507,38 +19145,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9134,13 +9030,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:18524: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19155: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18526: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18528: \$? = $ac_status" >&5
-+ echo "$as_me:19159: \$? = $ac_status" >&5
+- echo "$as_me:18530: \$? = $ac_status" >&5
++ echo "$as_me:19161: \$? = $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
@@ -9164,7 +9060,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18607,6 +19243,16 @@
+@@ -18609,6 +19245,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -9181,7 +9077,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18627,6 +19273,27 @@
+@@ -18629,6 +19275,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -9209,7 +9105,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18664,7 +19331,7 @@
+@@ -18666,7 +19333,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -9218,7 +9114,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18674,13 +19341,13 @@
+@@ -18676,13 +19343,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'
@@ -9235,7 +9131,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
-@@ -18689,19 +19356,51 @@
+@@ -18691,19 +19358,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -9244,9 +9140,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -9276,10 +9173,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -9292,7 +9188,7 @@
fi
;;
-@@ -18719,8 +19418,8 @@
+@@ -18721,8 +19420,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9303,7 +9199,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18735,24 +19434,19 @@
+@@ -18737,24 +19436,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9335,7 +9231,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18786,9 +19480,20 @@
+@@ -18788,9 +19482,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
@@ -9358,7 +9254,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18805,7 +19510,7 @@
+@@ -18807,7 +19512,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -9367,7 +9263,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`
-@@ -18826,6 +19531,9 @@
+@@ -18828,6 +19533,9 @@
fi
esac
shared_flag='-shared'
@@ -9377,7 +9273,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18834,21 +19542,22 @@
+@@ -18836,21 +19544,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -9405,7 +9301,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18872,8 +19581,7 @@
+@@ -18874,8 +19583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9415,7 +9311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18900,14 +19608,13 @@
+@@ -18902,14 +19610,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9433,7 +9329,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18934,8 +19641,7 @@
+@@ -18936,8 +19643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9443,7 +9339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18972,8 +19678,8 @@
+@@ -18974,8 +19680,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -9454,7 +9350,7 @@
fi
fi
;;
-@@ -18986,7 +19692,7 @@
+@@ -18988,7 +19694,7 @@
ld_shlibs_GCJ=no
;;
@@ -9463,7 +9359,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18996,68 +19702,68 @@
+@@ -18998,68 +19704,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9576,7 +9472,7 @@
fi
;;
-@@ -19091,8 +19797,8 @@
+@@ -19093,8 +19799,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9587,7 +9483,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19100,7 +19806,7 @@
+@@ -19102,7 +19808,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9596,7 +9492,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
-@@ -19116,16 +19822,16 @@
+@@ -19118,16 +19824,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9617,7 +9513,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19135,7 +19841,7 @@
+@@ -19137,7 +19843,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9626,7 +9522,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19168,7 +19874,7 @@
+@@ -19170,7 +19876,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9635,7 +9531,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'
-@@ -19178,7 +19884,7 @@
+@@ -19180,7 +19886,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9644,7 +9540,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
-@@ -19201,7 +19907,8 @@
+@@ -19203,7 +19909,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
@@ -9654,7 +9550,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19211,7 +19918,7 @@
+@@ -19213,7 +19920,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9663,7 +9559,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19222,14 +19929,14 @@
+@@ -19224,14 +19931,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9680,7 +9576,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'
-@@ -19241,13 +19948,13 @@
+@@ -19243,13 +19950,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9696,7 +9592,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19266,10 +19973,12 @@
+@@ -19268,10 +19975,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9711,7 +9607,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'
-@@ -19278,8 +19987,18 @@
+@@ -19280,8 +19989,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9732,7 +9628,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19288,7 +20007,7 @@
+@@ -19290,7 +20009,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.
@@ -9741,7 +9637,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19348,9 +20067,9 @@
+@@ -19350,9 +20069,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9753,7 +9649,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19456,7 +20175,7 @@
+@@ -19458,7 +20177,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9762,7 +9658,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19466,7 +20185,20 @@
+@@ -19468,7 +20187,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9784,7 +9680,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19531,7 +20263,7 @@
+@@ -19533,7 +20265,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9793,7 +9689,7 @@
;;
beos*)
-@@ -19540,7 +20272,7 @@
+@@ -19542,7 +20274,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9802,7 +9698,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19556,7 +20288,7 @@
+@@ -19558,7 +20290,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9811,7 +9707,7 @@
need_version=no
need_lib_prefix=no
-@@ -19568,7 +20300,8 @@
+@@ -19570,7 +20302,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9821,7 +9717,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19598,7 +20331,7 @@
+@@ -19600,7 +20333,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9830,7 +9726,7 @@
;;
esac
;;
-@@ -19621,7 +20354,7 @@
+@@ -19623,7 +20356,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9839,7 +9735,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"`
-@@ -19644,7 +20377,7 @@
+@@ -19646,7 +20379,7 @@
dynamic_linker=no
;;
@@ -9848,7 +9744,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19656,8 +20389,17 @@
+@@ -19658,8 +20391,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9868,7 +9764,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19675,7 +20417,7 @@
+@@ -19677,7 +20419,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9877,7 +9773,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19702,9 +20444,9 @@
+@@ -19704,9 +20446,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9889,7 +9785,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19719,7 +20461,7 @@
+@@ -19721,7 +20463,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9898,7 +9794,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19730,7 +20472,7 @@
+@@ -19732,7 +20474,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9907,7 +9803,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19792,22 +20534,19 @@
+@@ -19794,22 +20536,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'
@@ -9936,7 +9832,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,
-@@ -19817,6 +20556,30 @@
+@@ -19819,6 +20558,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9967,7 +9863,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19826,7 +20589,7 @@
+@@ -19828,7 +20591,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9976,7 +9872,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19855,7 +20618,11 @@
+@@ -19857,7 +20620,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9989,7 +9885,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
-@@ -19875,7 +20642,7 @@
+@@ -19877,7 +20644,7 @@
os2*)
libname_spec='$name'
@@ -9998,7 +9894,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19977,8 +20744,8 @@
+@@ -19979,8 +20746,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" || \
@@ -10009,7 +9905,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20104,8 +20871,7 @@
+@@ -20106,8 +20873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10019,7 +9915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20208,8 +20974,7 @@
+@@ -20210,8 +20976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10029,7 +9925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20274,8 +21039,7 @@
+@@ -20276,8 +21041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10039,7 +9935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20368,8 +21132,7 @@
+@@ -20370,8 +21134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10049,7 +9945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20434,8 +21197,7 @@
+@@ -20436,8 +21199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10059,7 +9955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20501,8 +21263,7 @@
+@@ -20503,8 +21265,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10069,7 +9965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20568,8 +21329,7 @@
+@@ -20570,8 +21331,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10079,16 +9975,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20644,7 +21404,7 @@
+@@ -20646,7 +21406,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20647 "configure"
-+#line 21407 "configure"
+-#line 20649 "configure"
++#line 21409 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20710,7 +21470,7 @@
+@@ -20712,7 +21472,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -10097,16 +9993,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20742,7 +21502,7 @@
+@@ -20744,7 +21504,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20745 "configure"
-+#line 21505 "configure"
+-#line 20747 "configure"
++#line 21507 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20808,7 +21568,7 @@
+@@ -20810,7 +21570,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -10115,7 +10011,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20859,7 +21619,8 @@
+@@ -20861,7 +21621,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.
@@ -10125,7 +10021,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 \
-@@ -20959,6 +21720,12 @@
+@@ -20961,6 +21722,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -10138,7 +10034,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20989,7 +21756,7 @@
+@@ -20991,7 +21758,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -10147,7 +10043,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21020,7 +21787,7 @@
+@@ -21022,7 +21789,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -10156,7 +10052,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21035,7 +21802,7 @@
+@@ -21037,7 +21804,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -10165,7 +10061,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21237,7 +22004,10 @@
+@@ -21239,7 +22006,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.
@@ -10177,7 +10073,7 @@
fi
-@@ -21280,11 +22050,35 @@
+@@ -21282,11 +22052,35 @@
compiler=$CC
@@ -10213,7 +10109,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21300,7 +22094,8 @@
+@@ -21302,7 +22096,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.
@@ -10223,7 +10119,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 \
-@@ -21400,6 +22195,12 @@
+@@ -21402,6 +22197,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -10236,7 +10132,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21430,7 +22231,7 @@
+@@ -21432,7 +22233,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -10245,7 +10141,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21461,7 +22262,7 @@
+@@ -21463,7 +22264,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -10254,7 +10150,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21476,7 +22277,7 @@
+@@ -21478,7 +22279,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -10263,7 +10159,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21678,7 +22479,10 @@
+@@ -21680,7 +22481,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.
@@ -10275,7 +10171,7 @@
fi
-@@ -21725,7 +22529,7 @@
+@@ -21727,7 +22531,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -10284,7 +10180,7 @@
# Prevent multiple expansion
-@@ -21966,8 +22770,7 @@
+@@ -21968,8 +22772,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10294,7 +10190,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22041,9 +22844,6 @@
+@@ -22043,9 +22846,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10304,7 +10200,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22077,8 +22877,7 @@
+@@ -22079,8 +22879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10314,7 +10210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22182,8 +22981,7 @@
+@@ -22184,8 +22983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10324,7 +10220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22262,9 +23060,6 @@
+@@ -22264,9 +23062,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10334,7 +10230,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22297,8 +23092,7 @@
+@@ -22299,8 +23094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10344,7 +10240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22401,8 +23195,7 @@
+@@ -22403,8 +23197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10354,7 +10250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22492,8 +23285,7 @@
+@@ -22494,8 +23287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10364,7 +10260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22554,8 +23346,7 @@
+@@ -22556,8 +23348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10374,7 +10270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22623,8 +23414,7 @@
+@@ -22625,8 +23416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10384,7 +10280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22690,8 +23480,7 @@
+@@ -22692,8 +23482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10394,7 +10290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22784,8 +23573,7 @@
+@@ -22786,8 +23575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10404,7 +10300,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22863,8 +23651,7 @@
+@@ -22865,8 +23653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10414,7 +10310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22948,8 +23735,7 @@
+@@ -22950,8 +23737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10424,7 +10320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23017,8 +23803,7 @@
+@@ -23019,8 +23805,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10434,7 +10330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23113,8 +23898,7 @@
+@@ -23115,8 +23900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10444,7 +10340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23178,8 +23962,7 @@
+@@ -23180,8 +23964,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10454,7 +10350,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23274,8 +24057,7 @@
+@@ -23276,8 +24059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10464,7 +10360,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23339,8 +24121,7 @@
+@@ -23341,8 +24123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10474,7 +10370,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23436,8 +24217,7 @@
+@@ -23438,8 +24219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10484,7 +10380,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23501,8 +24281,7 @@
+@@ -23503,8 +24283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10494,7 +10390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23599,8 +24378,7 @@
+@@ -23601,8 +24380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10504,7 +10400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23665,8 +24443,7 @@
+@@ -23667,8 +24445,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10514,7 +10410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23734,8 +24511,7 @@
+@@ -23736,8 +24513,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10524,7 +10420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23886,8 +24662,7 @@
+@@ -23888,8 +24664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10534,7 +10430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24042,8 +24817,7 @@
+@@ -24044,8 +24819,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10544,7 +10440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24108,8 +24882,7 @@
+@@ -24110,8 +24884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10554,7 +10450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24256,8 +25029,7 @@
+@@ -24258,8 +25031,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10564,7 +10460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24412,8 +25184,7 @@
+@@ -24414,8 +25186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10574,7 +10470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24469,9 +25240,6 @@
+@@ -24471,9 +25242,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10584,7 +10480,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24505,8 +25273,7 @@
+@@ -24507,8 +25275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10594,7 +10490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24610,8 +25377,7 @@
+@@ -24612,8 +25379,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10604,7 +10500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24711,8 +25477,7 @@
+@@ -24713,8 +25479,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10614,7 +10510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24786,8 +25551,7 @@
+@@ -24788,8 +25553,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10624,7 +10520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24850,8 +25614,7 @@
+@@ -24852,8 +25616,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10634,7 +10530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24913,8 +25676,7 @@
+@@ -24915,8 +25678,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10644,7 +10540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24954,8 +25716,7 @@
+@@ -24956,8 +25718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10654,7 +10550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25011,8 +25772,7 @@
+@@ -25013,8 +25774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10664,7 +10560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25052,8 +25812,7 @@
+@@ -25054,8 +25814,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10674,7 +10570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25117,8 +25876,7 @@
+@@ -25119,8 +25878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10684,7 +10580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25149,10 +25907,8 @@
+@@ -25151,10 +25909,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10697,7 +10593,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25263,8 +26019,7 @@
+@@ -25265,8 +26021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10707,7 +10603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25326,8 +26081,7 @@
+@@ -25328,8 +26083,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10717,7 +10613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25367,8 +26121,7 @@
+@@ -25369,8 +26123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10727,7 +10623,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25424,8 +26177,7 @@
+@@ -25426,8 +26179,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10737,7 +10633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25465,8 +26217,7 @@
+@@ -25467,8 +26219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10747,7 +10643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25530,8 +26281,7 @@
+@@ -25532,8 +26283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10757,7 +10653,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25562,10 +26312,8 @@
+@@ -25564,10 +26314,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10770,7 +10666,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25676,8 +26424,7 @@
+@@ -25678,8 +26426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10780,7 +10676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25739,8 +26486,7 @@
+@@ -25741,8 +26488,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10790,7 +10686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25780,8 +26526,7 @@
+@@ -25782,8 +26528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10800,7 +10696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25837,8 +26582,7 @@
+@@ -25839,8 +26584,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10810,7 +10706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25878,8 +26622,7 @@
+@@ -25880,8 +26624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10820,7 +10716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25943,8 +26686,7 @@
+@@ -25945,8 +26688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10830,7 +10726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25975,10 +26717,8 @@
+@@ -25977,10 +26719,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10843,7 +10739,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26089,8 +26829,7 @@
+@@ -26091,8 +26831,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10853,7 +10749,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26152,8 +26891,7 @@
+@@ -26154,8 +26893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10863,7 +10759,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26193,8 +26931,7 @@
+@@ -26195,8 +26933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10873,7 +10769,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26250,8 +26987,7 @@
+@@ -26252,8 +26989,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10883,7 +10779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26291,8 +27027,7 @@
+@@ -26293,8 +27029,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10893,7 +10789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26356,8 +27091,7 @@
+@@ -26358,8 +27093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10903,7 +10799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26388,10 +27122,8 @@
+@@ -26390,10 +27124,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10916,7 +10812,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26510,8 +27242,7 @@
+@@ -26512,8 +27244,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10926,7 +10822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26582,8 +27313,7 @@
+@@ -26584,8 +27315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10936,7 +10832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26653,8 +27383,7 @@
+@@ -26655,8 +27385,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10946,7 +10842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26716,8 +27445,7 @@
+@@ -26718,8 +27447,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10956,7 +10852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26757,8 +27485,7 @@
+@@ -26759,8 +27487,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10966,7 +10862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26814,8 +27541,7 @@
+@@ -26816,8 +27543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10976,7 +10872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26855,8 +27581,7 @@
+@@ -26857,8 +27583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10986,7 +10882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26920,8 +27645,7 @@
+@@ -26922,8 +27647,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10996,7 +10892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26952,10 +27676,8 @@
+@@ -26954,10 +27678,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11009,7 +10905,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27067,8 +27789,7 @@
+@@ -27069,8 +27791,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11019,7 +10915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27130,8 +27851,7 @@
+@@ -27132,8 +27853,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11029,7 +10925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27171,8 +27891,7 @@
+@@ -27173,8 +27893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11039,7 +10935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27228,8 +27947,7 @@
+@@ -27230,8 +27949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11049,7 +10945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27269,8 +27987,7 @@
+@@ -27271,8 +27989,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11059,7 +10955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27334,8 +28051,7 @@
+@@ -27336,8 +28053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11069,7 +10965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27366,10 +28082,8 @@
+@@ -27368,10 +28084,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11082,7 +10978,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27480,8 +28194,7 @@
+@@ -27482,8 +28196,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11092,7 +10988,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27562,8 +28275,7 @@
+@@ -27564,8 +28277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11102,7 +10998,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27663,8 +28375,7 @@
+@@ -27665,8 +28377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11112,7 +11008,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27844,8 +28555,7 @@
+@@ -27846,8 +28557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11122,7 +11018,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27954,8 +28664,7 @@
+@@ -27956,8 +28666,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11132,7 +11028,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28179,8 +28888,7 @@
+@@ -28181,8 +28890,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11142,7 +11038,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28403,8 +29111,7 @@
+@@ -28405,8 +29113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11152,7 +11048,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28480,8 +29187,7 @@
+@@ -28482,8 +29189,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11162,7 +11058,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28707,8 +29413,7 @@
+@@ -28709,8 +29415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11172,7 +11068,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28783,8 +29488,7 @@
+@@ -28785,8 +29490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11182,7 +11078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28844,8 +29548,7 @@
+@@ -28846,8 +29550,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11192,7 +11088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28928,8 +29631,7 @@
+@@ -28930,8 +29633,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11202,7 +11098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29022,8 +29724,7 @@
+@@ -29024,8 +29726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11212,7 +11108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29197,8 +29898,7 @@
+@@ -29199,8 +29900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11222,7 +11118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29296,8 +29996,7 @@
+@@ -29298,8 +29998,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11232,7 +11128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29384,8 +30083,7 @@
+@@ -29386,8 +30085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11242,7 +11138,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29462,8 +30160,7 @@
+@@ -29464,8 +30162,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11252,25 +11148,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29516,7 +30213,7 @@
+@@ -29518,7 +30215,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29519: $i/$j" >&5
-+ echo "configure: 30216: $i/$j" >&5
+- echo "configure: 29521: $i/$j" >&5
++ echo "configure: 30218: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29814,7 +30511,7 @@
+@@ -29816,7 +30513,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29817: $i/$j" >&5
-+ echo "configure: 30514: $i/$j" >&5
+- echo "configure: 29819: $i/$j" >&5
++ echo "configure: 30516: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30491,8 +31188,7 @@
+@@ -30493,8 +31190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11280,389 +11176,73 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30651,7 +31347,7 @@
+@@ -30653,7 +31349,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30654: $i/$j" >&5
-+ echo "configure: 31350: $i/$j" >&5
+- echo "configure: 30656: $i/$j" >&5
++ echo "configure: 31352: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30681,7 +31377,7 @@
+@@ -30683,7 +31379,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30684: $i/$j" >&5
-+ echo "configure: 31380: $i/$j" >&5
+- echo "configure: 30686: $i/$j" >&5
++ echo "configure: 31382: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30699,7 +31395,7 @@
+@@ -30701,7 +31397,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30702: $i/$j" >&5
-+ echo "configure: 31398: $i/$j" >&5
+- echo "configure: 30704: $i/$j" >&5
++ echo "configure: 31400: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32222,7 +32918,7 @@
+@@ -32224,7 +32920,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32225: $i/$j" >&5
-+ echo "configure: 32921: $i/$j" >&5
+- echo "configure: 32227: $i/$j" >&5
++ echo "configure: 32923: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32381,345 +33077,6 @@
- #MIN_CONFIG
-
-
--
--
-- 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); } &&
+@@ -32482,8 +33178,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=$?
+@@ -32578,8 +33273,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=$?
+@@ -32672,8 +33366,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
--
- CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-
-
-@@ -32743,9 +33100,6 @@
++ { 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=$?
+@@ -32754,9 +33447,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11672,7 +11252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32776,8 +33130,7 @@
+@@ -32787,8 +33477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11682,7 +11262,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32878,8 +33231,7 @@
+@@ -32889,8 +33578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11692,7 +11272,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32958,9 +33310,6 @@
+@@ -32969,9 +33657,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11702,7 +11282,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32991,8 +33340,7 @@
+@@ -33002,8 +33687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11712,7 +11292,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33093,8 +33441,7 @@
+@@ -33104,8 +33788,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11722,7 +11302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33173,9 +33520,6 @@
+@@ -33184,9 +33867,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11732,7 +11312,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33211,8 +33555,7 @@
+@@ -33222,8 +33902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11742,7 +11322,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33318,8 +33661,7 @@
+@@ -33329,8 +34008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11752,7 +11332,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33701,6 +34043,13 @@
+@@ -33712,6 +34390,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11766,7 +11346,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
-@@ -34415,6 +34764,9 @@
+@@ -34426,6 +35111,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -11776,7 +11356,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -34776,11 +35128,6 @@
+@@ -34787,11 +35475,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11788,7 +11368,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. */
-@@ -34819,6 +35166,12 @@
+@@ -34830,6 +35513,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11803,17 +11383,15 @@
sed "$ac_vpsub
--- configure.in
+++ configure.in
-@@ -40,7 +40,9 @@
- AC_ARG_PROGRAM
-
+@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kdetoys, "3.5") dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kdetoys-rc1, "3.5") dnl searches for some needed programs
-+
-+AM_MAINTAINER_MODE
+ AM_INIT_AUTOMAKE(kdetoys, "3.5.0") dnl searches for some needed programs
++AM_MAINTAINER_MODE
++
KDE_SET_PREFIX
+ dnl generate the config header
--- doc/amor/Makefile.in
+++ doc/amor/Makefile.in
@@ -164,6 +164,9 @@
More information about the pkg-kde-commits
mailing list