[pkg-kde-commits] rev 2569 - trunk/packages/kdewebdev/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Dec 6 19:01:03 UTC 2005
Author: chrsmrtn
Date: 2005-12-06 19:01:01 +0000 (Tue, 06 Dec 2005)
New Revision: 2569
Modified:
trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
Log:
buildprep update for kdewebdev.
Modified: trunk/packages/kdewebdev/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/98_buildprep.diff 2005-12-06 18:54:12 UTC (rev 2568)
+++ trunk/packages/kdewebdev/debian/patches/98_buildprep.diff 2005-12-06 19:01:01 UTC (rev 2569)
@@ -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
@@ -3030,18 +2909,6 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
---- config.h.in
-+++ config.h.in
-@@ -377,9 +377,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 @@
@@ -3081,7 +2948,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
-@@ -1187,7 +1189,7 @@
+@@ -1189,7 +1191,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -3090,19 +2957,10 @@
done
fi
-@@ -1959,7 +1961,7 @@
+@@ -2092,6 +2094,31 @@
- # Define the identity of the package.
-- PACKAGE=kdewebdev
-+ PACKAGE=kdewebdev-rc1
- VERSION="3.5"
-
-@@ -2090,6 +2092,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.
@@ -3131,7 +2989,7 @@
unset CDPATH
-@@ -3023,8 +3050,7 @@
+@@ -3025,8 +3052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3141,7 +2999,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3082,8 +3108,7 @@
+@@ -3084,8 +3110,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3151,7 +3009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3199,8 +3224,7 @@
+@@ -3201,8 +3226,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3161,7 +3019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3254,8 +3278,7 @@
+@@ -3256,8 +3280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3171,7 +3029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3300,8 +3323,7 @@
+@@ -3302,8 +3325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3181,7 +3039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3345,8 +3367,7 @@
+@@ -3347,8 +3369,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3191,7 +3049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3903,8 +3924,7 @@
+@@ -3905,8 +3926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3201,7 +3059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3962,8 +3982,7 @@
+@@ -3964,8 +3984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3211,7 +3069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4034,8 +4053,7 @@
+@@ -4036,8 +4055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3221,7 +3079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4079,8 +4097,7 @@
+@@ -4081,8 +4099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3231,7 +3089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4258,8 +4275,7 @@
+@@ -4260,8 +4277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3241,7 +3099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4370,8 +4386,7 @@
+@@ -4372,8 +4388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3251,7 +3109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4459,8 +4474,7 @@
+@@ -4461,8 +4476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3261,7 +3119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4562,8 +4576,7 @@
+@@ -4564,8 +4578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3271,7 +3129,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4662,8 +4675,7 @@
+@@ -4664,8 +4677,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3281,7 +3139,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4747,8 +4759,7 @@
+@@ -4749,8 +4761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3291,7 +3149,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4837,8 +4848,7 @@
+@@ -4839,8 +4850,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3301,7 +3159,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4925,8 +4935,7 @@
+@@ -4927,8 +4937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3311,7 +3169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5013,8 +5022,7 @@
+@@ -5015,8 +5024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3321,7 +3179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5120,8 +5128,7 @@
+@@ -5122,8 +5130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3331,7 +3189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5208,8 +5215,7 @@
+@@ -5210,8 +5217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3341,7 +3199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5296,8 +5302,7 @@
+@@ -5298,8 +5304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3351,7 +3209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5384,8 +5389,7 @@
+@@ -5386,8 +5391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3361,7 +3219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5516,8 +5520,7 @@
+@@ -5518,8 +5522,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3371,7 +3229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5605,8 +5608,7 @@
+@@ -5607,8 +5610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3381,7 +3239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5693,8 +5695,7 @@
+@@ -5695,8 +5697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3391,7 +3249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5781,8 +5782,7 @@
+@@ -5783,8 +5784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3401,7 +3259,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5869,8 +5869,7 @@
+@@ -5871,8 +5871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3411,7 +3269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5957,8 +5956,7 @@
+@@ -5959,8 +5958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3421,7 +3279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6381,8 +6379,7 @@
+@@ -6383,8 +6381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3431,7 +3289,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6508,8 +6505,7 @@
+@@ -6510,8 +6507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3441,7 +3299,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6597,8 +6593,7 @@
+@@ -6599,8 +6595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3451,7 +3309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6681,185 +6676,6 @@
+@@ -6683,185 +6678,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3637,7 +3495,7 @@
fi
-@@ -7023,7 +6839,7 @@
+@@ -7025,7 +6841,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
@@ -3646,7 +3504,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7128,7 +6944,7 @@
+@@ -7130,7 +6946,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,
@@ -3655,7 +3513,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'*)
-@@ -7162,7 +6978,7 @@
+@@ -7164,7 +6980,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3664,7 +3522,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7192,6 +7008,15 @@
+@@ -7194,6 +7010,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3680,7 +3538,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7278,44 +7103,36 @@
+@@ -7280,44 +7105,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3735,7 +3593,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7331,7 +7148,7 @@
+@@ -7333,7 +7150,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3744,7 +3602,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
-@@ -7348,42 +7165,21 @@
+@@ -7350,42 +7167,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3794,7 +3652,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
-@@ -7402,19 +7198,14 @@
+@@ -7404,19 +7200,14 @@
;;
openbsd*)
@@ -3816,7 +3674,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7424,7 +7215,6 @@
+@@ -7426,7 +7217,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3824,16 +3682,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7501,7 +7291,7 @@
+@@ -7503,7 +7293,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7504 "configure"' > conftest.$ac_ext
-+ echo '#line 7294 "configure"' > conftest.$ac_ext
+- echo '#line 7506 "configure"' > conftest.$ac_ext
++ echo '#line 7296 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7544,14 +7334,13 @@
+@@ -7546,14 +7336,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3850,7 +3708,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7563,7 +7352,6 @@
+@@ -7565,7 +7354,6 @@
esac
;;
*64-bit*)
@@ -3858,7 +3716,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7623,8 +7411,7 @@
+@@ -7625,8 +7413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3868,7 +3726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7699,8 +7486,7 @@
+@@ -7701,8 +7488,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3878,7 +3736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7870,8 +7656,7 @@
+@@ -7872,8 +7658,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3888,7 +3746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7938,8 +7723,7 @@
+@@ -7940,8 +7725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3898,7 +3756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8054,6 +7838,243 @@
+@@ -8056,6 +7840,243 @@
done
@@ -4142,16 +4000,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'
-@@ -8146,7 +8167,7 @@
+@@ -8148,7 +8169,7 @@
# Provide some information about the compiler.
--echo "$as_me:8149:" \
-+echo "$as_me:8170:" \
+-echo "$as_me:8151:" \
++echo "$as_me:8172:" \
"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
-@@ -8192,8 +8213,7 @@
+@@ -8194,8 +8215,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4161,7 +4019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8242,8 +8262,7 @@
+@@ -8244,8 +8264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4171,7 +4029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8301,7 +8320,7 @@
+@@ -8303,7 +8322,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4180,7 +4038,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8330,20 +8349,53 @@
+@@ -8332,20 +8351,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4240,7 +4098,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.
-@@ -8380,9 +8432,6 @@
+@@ -8382,9 +8434,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4250,7 +4108,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'"
-@@ -8404,6 +8453,13 @@
+@@ -8406,6 +8455,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'"
;;
@@ -4264,7 +4122,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8411,7 +8467,7 @@
+@@ -8413,7 +8469,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4273,7 +4131,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8429,14 +8485,17 @@
+@@ -8431,14 +8487,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4293,7 +4151,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8598,7 +8657,7 @@
+@@ -8600,7 +8659,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4302,7 +4160,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8618,7 +8677,7 @@
+@@ -8620,7 +8679,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4311,7 +4169,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8903,6 +8962,17 @@
+@@ -8905,6 +8964,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4329,7 +4187,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8928,7 +8998,7 @@
+@@ -8930,7 +9000,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4338,7 +4196,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
-@@ -8990,7 +9060,7 @@
+@@ -8992,7 +9062,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4347,7 +4205,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
-@@ -9089,6 +9159,20 @@
+@@ -9091,6 +9161,20 @@
compiler=$CC
@@ -4368,7 +4226,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9125,11 +9209,16 @@
+@@ -9127,11 +9211,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
@@ -4386,7 +4244,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9175,18 +9264,20 @@
+@@ -9177,18 +9266,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 \
@@ -4394,13 +4252,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:9181: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9270: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9183: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9272: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9185: \$? = $ac_status" >&5
-+ echo "$as_me:9274: \$? = $ac_status" >&5
+- echo "$as_me:9187: \$? = $ac_status" >&5
++ echo "$as_me:9276: \$? = $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
@@ -4412,7 +4270,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9263,7 +9354,7 @@
+@@ -9265,7 +9356,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4421,7 +4279,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9289,6 +9380,16 @@
+@@ -9291,6 +9382,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4438,7 +4296,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9300,7 +9401,7 @@
+@@ -9302,7 +9403,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.
@@ -4447,7 +4305,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9324,12 +9425,19 @@
+@@ -9326,12 +9427,19 @@
;;
linux*)
@@ -4468,7 +4326,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9350,9 +9458,14 @@
+@@ -9352,9 +9460,14 @@
;;
solaris*)
@@ -4484,7 +4342,7 @@
;;
sunos4*)
-@@ -9374,6 +9487,11 @@
+@@ -9376,6 +9489,11 @@
fi
;;
@@ -4496,7 +4354,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9408,18 +9526,20 @@
+@@ -9410,18 +9528,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 \
@@ -4504,13 +4362,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:9414: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9532: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9416: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9534: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9418: \$? = $ac_status" >&5
-+ echo "$as_me:9536: \$? = $ac_status" >&5
+- echo "$as_me:9420: \$? = $ac_status" >&5
++ echo "$as_me:9538: \$? = $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
@@ -4522,7 +4380,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9440,7 +9560,7 @@
+@@ -9442,7 +9562,7 @@
fi
fi
@@ -4531,7 +4389,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9462,38 +9582,36 @@
+@@ -9464,38 +9584,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4552,13 +4410,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:9481: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9594: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9483: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9485: \$? = $ac_status" >&5
-+ echo "$as_me:9598: \$? = $ac_status" >&5
+- echo "$as_me:9487: \$? = $ac_status" >&5
++ echo "$as_me:9600: \$? = $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
@@ -4582,7 +4440,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9564,6 +9682,16 @@
+@@ -9566,6 +9684,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4599,7 +4457,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9584,6 +9712,27 @@
+@@ -9586,6 +9714,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4627,7 +4485,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9621,7 +9770,7 @@
+@@ -9623,7 +9772,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4636,7 +4494,7 @@
else
ld_shlibs=no
fi
-@@ -9631,13 +9780,13 @@
+@@ -9633,13 +9782,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'
@@ -4653,7 +4511,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9646,19 +9795,51 @@
+@@ -9648,19 +9797,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4709,7 +4567,7 @@
fi
;;
-@@ -9676,8 +9857,8 @@
+@@ -9678,8 +9859,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4720,7 +4578,7 @@
else
ld_shlibs=no
fi
-@@ -9692,24 +9873,19 @@
+@@ -9694,24 +9875,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4752,7 +4610,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9743,9 +9919,20 @@
+@@ -9745,9 +9921,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
@@ -4775,7 +4633,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9762,7 +9949,7 @@
+@@ -9764,7 +9951,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4784,7 +4642,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`
-@@ -9783,6 +9970,9 @@
+@@ -9785,6 +9972,9 @@
fi
esac
shared_flag='-shared'
@@ -4794,7 +4652,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9791,21 +9981,22 @@
+@@ -9793,21 +9983,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4822,7 +4680,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9829,8 +10020,7 @@
+@@ -9831,8 +10022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4832,7 +4690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9857,14 +10047,13 @@
+@@ -9859,14 +10049,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4850,7 +4708,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9891,8 +10080,7 @@
+@@ -9893,8 +10082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4860,7 +4718,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9929,8 +10117,8 @@
+@@ -9931,8 +10119,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4871,7 +4729,7 @@
fi
fi
;;
-@@ -9943,7 +10131,7 @@
+@@ -9945,7 +10133,7 @@
ld_shlibs=no
;;
@@ -4880,7 +4738,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9953,13 +10141,13 @@
+@@ -9955,13 +10143,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4897,7 +4755,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.
-@@ -9969,52 +10157,52 @@
+@@ -9971,52 +10159,52 @@
;;
darwin* | rhapsody*)
@@ -4990,7 +4848,7 @@
fi
;;
-@@ -10048,8 +10236,8 @@
+@@ -10050,8 +10238,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5001,7 +4859,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10057,7 +10245,7 @@
+@@ -10059,7 +10247,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5010,7 +4868,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
-@@ -10073,16 +10261,16 @@
+@@ -10075,16 +10263,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5031,7 +4889,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10092,7 +10280,7 @@
+@@ -10094,7 +10282,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5040,7 +4898,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10125,7 +10313,7 @@
+@@ -10127,7 +10315,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5049,7 +4907,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'
-@@ -10135,7 +10323,7 @@
+@@ -10137,7 +10325,7 @@
link_all_deplibs=yes
;;
@@ -5058,7 +4916,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10158,7 +10346,8 @@
+@@ -10160,7 +10348,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
@@ -5068,7 +4926,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10168,7 +10357,7 @@
+@@ -10170,7 +10359,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5077,7 +4935,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10179,14 +10368,14 @@
+@@ -10181,14 +10370,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5094,7 +4952,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'
-@@ -10198,13 +10387,13 @@
+@@ -10200,13 +10389,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5110,7 +4968,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10223,10 +10412,12 @@
+@@ -10225,10 +10414,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5125,7 +4983,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'
-@@ -10235,8 +10426,18 @@
+@@ -10237,8 +10428,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5146,7 +5004,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10245,7 +10446,7 @@
+@@ -10247,7 +10448,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.
@@ -5155,7 +5013,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10305,9 +10506,9 @@
+@@ -10307,9 +10508,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5167,7 +5025,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10413,7 +10614,7 @@
+@@ -10415,7 +10616,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5176,7 +5034,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10423,7 +10624,20 @@
+@@ -10425,7 +10626,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5198,7 +5056,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10488,7 +10702,7 @@
+@@ -10490,7 +10704,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5207,7 +5065,7 @@
;;
beos*)
-@@ -10497,7 +10711,7 @@
+@@ -10499,7 +10713,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5216,7 +5074,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10513,7 +10727,7 @@
+@@ -10515,7 +10729,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5225,7 +5083,7 @@
need_version=no
need_lib_prefix=no
-@@ -10525,7 +10739,8 @@
+@@ -10527,7 +10741,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5235,7 +5093,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10555,7 +10770,7 @@
+@@ -10557,7 +10772,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5244,7 +5102,7 @@
;;
esac
;;
-@@ -10578,7 +10793,7 @@
+@@ -10580,7 +10795,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5253,7 +5111,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"`
-@@ -10601,7 +10816,7 @@
+@@ -10603,7 +10818,7 @@
dynamic_linker=no
;;
@@ -5262,7 +5120,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10613,8 +10828,17 @@
+@@ -10615,8 +10830,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5282,7 +5140,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10632,7 +10856,7 @@
+@@ -10634,7 +10858,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5291,7 +5149,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10659,9 +10883,9 @@
+@@ -10661,9 +10885,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5303,7 +5161,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10676,7 +10900,7 @@
+@@ -10678,7 +10902,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5312,7 +5170,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10687,7 +10911,7 @@
+@@ -10689,7 +10913,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5321,7 +5179,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10749,22 +10973,19 @@
+@@ -10751,22 +10975,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'
@@ -5350,7 +5208,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,
-@@ -10774,6 +10995,30 @@
+@@ -10776,6 +10997,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5381,7 +5239,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10783,7 +11028,7 @@
+@@ -10785,7 +11030,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5390,7 +5248,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10812,7 +11057,11 @@
+@@ -10814,7 +11059,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5403,7 +5261,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
-@@ -10832,7 +11081,7 @@
+@@ -10834,7 +11083,7 @@
os2*)
libname_spec='$name'
@@ -5412,7 +5270,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10934,8 +11183,8 @@
+@@ -10936,8 +11185,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5423,7 +5281,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11061,8 +11310,7 @@
+@@ -11063,8 +11312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5433,7 +5291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11165,8 +11413,7 @@
+@@ -11167,8 +11415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5443,7 +5301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11231,8 +11478,7 @@
+@@ -11233,8 +11480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5453,7 +5311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11325,8 +11571,7 @@
+@@ -11327,8 +11573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5463,7 +5321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11391,8 +11636,7 @@
+@@ -11393,8 +11638,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5473,7 +5331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11458,8 +11702,7 @@
+@@ -11460,8 +11704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5483,7 +5341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11525,8 +11768,7 @@
+@@ -11527,8 +11770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5493,16 +5351,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11601,7 +11843,7 @@
+@@ -11603,7 +11845,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11604 "configure"
-+#line 11846 "configure"
+-#line 11606 "configure"
++#line 11848 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11667,7 +11909,7 @@
+@@ -11669,7 +11911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5511,16 +5369,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11699,7 +11941,7 @@
+@@ -11701,7 +11943,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11702 "configure"
-+#line 11944 "configure"
+-#line 11704 "configure"
++#line 11946 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11765,7 +12007,7 @@
+@@ -11767,7 +12009,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5529,7 +5387,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11815,7 +12057,7 @@
+@@ -11817,7 +12059,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5538,7 +5396,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11824,47 +12066,10 @@
+@@ -11826,47 +12068,10 @@
fi
;;
@@ -5587,7 +5445,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11890,7 +12095,8 @@
+@@ -11892,7 +12097,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.
@@ -5597,7 +5455,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 \
-@@ -12004,11 +12210,11 @@
+@@ -12006,11 +12212,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5611,7 +5469,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12038,6 +12244,12 @@
+@@ -12040,6 +12246,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5624,7 +5482,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12068,7 +12280,7 @@
+@@ -12070,7 +12282,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5633,7 +5491,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12099,7 +12311,7 @@
+@@ -12101,7 +12313,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5642,7 +5500,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12114,7 +12326,7 @@
+@@ -12116,7 +12328,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5651,7 +5509,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12341,7 +12553,10 @@
+@@ -12343,7 +12555,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.
@@ -5663,7 +5521,7 @@
fi
-@@ -12406,7 +12621,9 @@
+@@ -12408,7 +12623,9 @@
case $tagname in
CXX)
@@ -5674,7 +5532,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12443,7 +12660,7 @@
+@@ -12445,7 +12662,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5683,7 +5541,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12464,6 +12681,20 @@
+@@ -12466,6 +12683,20 @@
compiler=$CC
@@ -5704,7 +5562,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12485,7 +12716,16 @@
+@@ -12487,7 +12718,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5722,7 +5580,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12556,7 +12796,7 @@
+@@ -12558,7 +12798,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,
@@ -5731,7 +5589,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'*)
-@@ -12590,7 +12830,7 @@
+@@ -12592,7 +12832,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5740,7 +5598,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12609,8 +12849,8 @@
+@@ -12611,8 +12851,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
@@ -5751,7 +5609,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12636,7 +12876,7 @@
+@@ -12638,7 +12878,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.
@@ -5760,7 +5618,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12667,8 +12907,22 @@
+@@ -12669,8 +12909,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5785,7 +5643,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12685,7 +12939,7 @@
+@@ -12687,7 +12941,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5794,7 +5652,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`
-@@ -12706,6 +12960,9 @@
+@@ -12708,6 +12962,9 @@
fi
esac
shared_flag='-shared'
@@ -5804,7 +5662,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12714,15 +12971,16 @@
+@@ -12716,15 +12973,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5825,7 +5683,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.
-@@ -12752,8 +13010,7 @@
+@@ -12754,8 +13012,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5835,7 +5693,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12782,13 +13039,12 @@
+@@ -12784,13 +13041,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5851,7 +5709,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12815,8 +13071,7 @@
+@@ -12817,8 +13073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5861,7 +5719,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12853,8 +13108,8 @@
+@@ -12855,8 +13110,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -5872,7 +5730,7 @@
fi
fi
;;
-@@ -12867,16 +13122,17 @@
+@@ -12869,16 +13124,17 @@
esac
;;
@@ -5892,7 +5750,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
-@@ -12885,70 +13141,81 @@
+@@ -12887,70 +13143,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6026,7 +5884,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12959,14 +13226,14 @@
+@@ -12961,14 +13228,14 @@
;;
esac
;;
@@ -6043,7 +5901,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12983,12 +13250,12 @@
+@@ -12985,12 +13252,12 @@
# location of the library.
case $cc_basename in
@@ -6059,7 +5917,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12997,11 +13264,11 @@
+@@ -12999,11 +13266,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.
@@ -6073,7 +5931,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13011,7 +13278,7 @@
+@@ -13013,7 +13280,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6082,7 +5940,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13027,7 +13294,7 @@
+@@ -13029,7 +13296,7 @@
;;
esac
fi
@@ -6091,7 +5949,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13048,17 +13315,17 @@
+@@ -13050,17 +13317,17 @@
esac
case $cc_basename in
@@ -6113,7 +5971,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13074,12 +13341,12 @@
+@@ -13076,12 +13343,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6128,7 +5986,7 @@
;;
esac
fi
-@@ -13092,9 +13359,9 @@
+@@ -13094,9 +13361,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6140,7 +5998,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13105,9 +13372,9 @@
+@@ -13107,9 +13374,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6152,7 +6010,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13118,14 +13385,14 @@
+@@ -13120,14 +13387,14 @@
;;
linux*)
case $cc_basename in
@@ -6170,7 +6028,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13143,20 +13410,44 @@
+@@ -13145,20 +13412,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6221,7 +6079,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13184,7 +13475,7 @@
+@@ -13186,7 +13477,7 @@
;;
mvs*)
case $cc_basename in
@@ -6230,7 +6088,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13194,7 +13485,7 @@
+@@ -13196,7 +13487,7 @@
;;
esac
;;
@@ -6239,7 +6097,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=
-@@ -13205,15 +13496,31 @@
+@@ -13207,15 +13498,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::"'
;;
@@ -6273,7 +6131,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13223,14 +13530,14 @@
+@@ -13225,14 +13532,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6291,7 +6149,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13248,7 +13555,7 @@
+@@ -13250,7 +13557,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6300,7 +6158,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13267,13 +13574,13 @@
+@@ -13269,13 +13576,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6316,7 +6174,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13282,17 +13589,17 @@
+@@ -13284,17 +13591,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6338,7 +6196,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13311,7 +13618,7 @@
+@@ -13313,7 +13620,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6347,7 +6205,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13335,7 +13642,7 @@
+@@ -13337,7 +13644,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6356,7 +6214,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13347,12 +13654,12 @@
+@@ -13349,12 +13656,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6371,7 +6229,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13365,36 +13672,33 @@
+@@ -13367,36 +13674,33 @@
;;
solaris*)
case $cc_basename in
@@ -6420,7 +6278,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13402,9 +13706,9 @@
+@@ -13404,9 +13708,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6432,7 +6290,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13414,9 +13718,9 @@
+@@ -13416,9 +13720,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
@@ -6444,7 +6302,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13425,9 +13729,9 @@
+@@ -13427,9 +13731,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6456,7 +6314,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13445,7 +13749,7 @@
+@@ -13447,7 +13751,7 @@
;;
tandem*)
case $cc_basename in
@@ -6465,7 +6323,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13502,7 +13806,7 @@
+@@ -13504,7 +13808,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.
@@ -6474,7 +6332,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13542,7 +13846,7 @@
+@@ -13544,7 +13848,7 @@
fi
;;
@@ -6483,7 +6341,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13578,6 +13882,20 @@
+@@ -13580,6 +13884,20 @@
$rm -f confest.$objext
@@ -6504,7 +6362,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13633,7 +13951,7 @@
+@@ -13635,7 +13953,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6513,7 +6371,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13658,18 +13976,28 @@
+@@ -13660,18 +13978,28 @@
;;
chorus*)
case $cc_basename in
@@ -6545,7 +6403,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13677,22 +14005,22 @@
+@@ -13679,22 +14007,22 @@
;;
esac
;;
@@ -6572,7 +6430,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13707,7 +14035,7 @@
+@@ -13709,7 +14037,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6581,7 +6439,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13718,18 +14046,24 @@
+@@ -13720,18 +14048,24 @@
;;
linux*)
case $cc_basename in
@@ -6609,7 +6467,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13746,25 +14080,25 @@
+@@ -13748,25 +14082,25 @@
;;
mvs*)
case $cc_basename in
@@ -6640,7 +6498,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13780,7 +14114,7 @@
+@@ -13782,7 +14116,7 @@
;;
sco*)
case $cc_basename in
@@ -6649,7 +6507,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13789,13 +14123,13 @@
+@@ -13791,13 +14125,13 @@
;;
solaris*)
case $cc_basename in
@@ -6665,7 +6523,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13805,12 +14139,12 @@
+@@ -13807,12 +14141,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6680,7 +6538,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13820,7 +14154,7 @@
+@@ -13822,7 +14156,7 @@
;;
tandem*)
case $cc_basename in
@@ -6689,7 +6547,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13861,18 +14195,20 @@
+@@ -13863,18 +14197,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 \
@@ -6697,13 +6555,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:13867: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14201: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13869: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14203: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13871: \$? = $ac_status" >&5
-+ echo "$as_me:14205: \$? = $ac_status" >&5
+- echo "$as_me:13873: \$? = $ac_status" >&5
++ echo "$as_me:14207: \$? = $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
@@ -6715,7 +6573,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13893,7 +14229,7 @@
+@@ -13895,7 +14231,7 @@
fi
fi
@@ -6724,7 +6582,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13915,38 +14251,36 @@
+@@ -13917,38 +14253,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6745,13 +6603,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:13934: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14263: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13936: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13938: \$? = $ac_status" >&5
-+ echo "$as_me:14267: \$? = $ac_status" >&5
+- echo "$as_me:13940: \$? = $ac_status" >&5
++ echo "$as_me:14269: \$? = $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
@@ -6775,7 +6633,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13996,7 +14330,10 @@
+@@ -13998,7 +14332,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6787,7 +6645,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14079,7 +14416,7 @@
+@@ -14081,7 +14418,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6796,7 +6654,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14089,7 +14426,20 @@
+@@ -14091,7 +14428,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6818,7 +6676,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14154,7 +14504,7 @@
+@@ -14156,7 +14506,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6827,7 +6685,7 @@
;;
beos*)
-@@ -14163,7 +14513,7 @@
+@@ -14165,7 +14515,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6836,7 +6694,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14179,7 +14529,7 @@
+@@ -14181,7 +14531,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6845,7 +6703,7 @@
need_version=no
need_lib_prefix=no
-@@ -14191,7 +14541,8 @@
+@@ -14193,7 +14543,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6855,7 +6713,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14221,7 +14572,7 @@
+@@ -14223,7 +14574,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6864,7 +6722,7 @@
;;
esac
;;
-@@ -14244,7 +14595,7 @@
+@@ -14246,7 +14597,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6873,7 +6731,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"`
-@@ -14267,7 +14618,7 @@
+@@ -14269,7 +14620,7 @@
dynamic_linker=no
;;
@@ -6882,7 +6740,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14279,8 +14630,17 @@
+@@ -14281,8 +14632,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6902,7 +6760,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14298,7 +14658,7 @@
+@@ -14300,7 +14660,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6911,7 +6769,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14325,9 +14685,9 @@
+@@ -14327,9 +14687,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6923,7 +6781,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14342,7 +14702,7 @@
+@@ -14344,7 +14704,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6932,7 +6790,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14353,7 +14713,7 @@
+@@ -14355,7 +14715,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6941,7 +6799,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14415,22 +14775,19 @@
+@@ -14417,22 +14777,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'
@@ -6970,7 +6828,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,
-@@ -14440,6 +14797,30 @@
+@@ -14442,6 +14799,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7001,7 +6859,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14449,7 +14830,7 @@
+@@ -14451,7 +14832,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7010,7 +6868,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14478,7 +14859,11 @@
+@@ -14480,7 +14861,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7023,7 +6881,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
-@@ -14498,7 +14883,7 @@
+@@ -14500,7 +14885,7 @@
os2*)
libname_spec='$name'
@@ -7032,7 +6890,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14600,8 +14985,8 @@
+@@ -14602,8 +14987,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" || \
@@ -7043,7 +6901,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14727,8 +15112,7 @@
+@@ -14729,8 +15114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7053,7 +6911,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14831,8 +15215,7 @@
+@@ -14833,8 +15217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7063,7 +6921,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14897,8 +15280,7 @@
+@@ -14899,8 +15282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7073,7 +6931,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14991,8 +15373,7 @@
+@@ -14993,8 +15375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7083,7 +6941,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15057,8 +15438,7 @@
+@@ -15059,8 +15440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7093,7 +6951,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15124,8 +15504,7 @@
+@@ -15126,8 +15506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7103,7 +6961,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15191,8 +15570,7 @@
+@@ -15193,8 +15572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7113,16 +6971,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15267,7 +15645,7 @@
+@@ -15269,7 +15647,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15270 "configure"
-+#line 15648 "configure"
+-#line 15272 "configure"
++#line 15650 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15333,7 +15711,7 @@
+@@ -15335,7 +15713,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7131,16 +6989,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15365,7 +15743,7 @@
+@@ -15367,7 +15745,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15368 "configure"
-+#line 15746 "configure"
+-#line 15370 "configure"
++#line 15748 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15431,7 +15809,7 @@
+@@ -15433,7 +15811,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7149,7 +7007,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15482,7 +15860,8 @@
+@@ -15484,7 +15862,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.
@@ -7159,7 +7017,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 \
-@@ -15582,6 +15961,12 @@
+@@ -15584,6 +15963,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7172,7 +7030,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15612,7 +15997,7 @@
+@@ -15614,7 +15999,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7181,7 +7039,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15643,7 +16028,7 @@
+@@ -15645,7 +16030,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7190,7 +7048,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15658,7 +16043,7 @@
+@@ -15660,7 +16045,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7199,7 +7057,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15860,7 +16245,10 @@
+@@ -15862,7 +16247,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.
@@ -7211,7 +7069,7 @@
fi
-@@ -15936,12 +16324,35 @@
+@@ -15938,12 +16326,35 @@
compiler=$CC
@@ -7248,7 +7106,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15954,7 +16365,7 @@
+@@ -15956,7 +16367,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7257,7 +7115,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15962,8 +16373,10 @@
+@@ -15964,8 +16375,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7270,7 +7128,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16040,7 +16453,7 @@
+@@ -16042,7 +16455,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7279,7 +7137,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16066,6 +16479,16 @@
+@@ -16068,6 +16481,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7296,7 +7154,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16077,7 +16500,7 @@
+@@ -16079,7 +16502,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.
@@ -7305,7 +7163,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16101,12 +16524,19 @@
+@@ -16103,12 +16526,19 @@
;;
linux*)
@@ -7326,7 +7184,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16127,9 +16557,14 @@
+@@ -16129,9 +16559,14 @@
;;
solaris*)
@@ -7342,7 +7200,7 @@
;;
sunos4*)
-@@ -16151,6 +16586,11 @@
+@@ -16153,6 +16588,11 @@
fi
;;
@@ -7354,7 +7212,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16185,18 +16625,20 @@
+@@ -16187,18 +16627,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 \
@@ -7362,13 +7220,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:16191: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16631: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16195: \$? = $ac_status" >&5
-+ echo "$as_me:16635: \$? = $ac_status" >&5
+- echo "$as_me:16197: \$? = $ac_status" >&5
++ echo "$as_me:16637: \$? = $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
@@ -7380,7 +7238,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16217,7 +16659,7 @@
+@@ -16219,7 +16661,7 @@
fi
fi
@@ -7389,7 +7247,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16239,38 +16681,36 @@
+@@ -16241,38 +16683,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7410,13 +7268,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:16258: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16693: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16260: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16695: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16262: \$? = $ac_status" >&5
-+ echo "$as_me:16697: \$? = $ac_status" >&5
+- echo "$as_me:16264: \$? = $ac_status" >&5
++ echo "$as_me:16699: \$? = $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
@@ -7440,7 +7298,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16341,6 +16781,16 @@
+@@ -16343,6 +16783,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7457,7 +7315,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16361,6 +16811,27 @@
+@@ -16363,6 +16813,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7485,7 +7343,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16398,7 +16869,7 @@
+@@ -16400,7 +16871,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7494,7 +7352,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16408,13 +16879,13 @@
+@@ -16410,13 +16881,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'
@@ -7511,7 +7369,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16423,19 +16894,51 @@
+@@ -16425,19 +16896,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7568,7 +7426,7 @@
fi
;;
-@@ -16453,8 +16956,8 @@
+@@ -16455,8 +16958,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7579,7 +7437,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16469,24 +16972,19 @@
+@@ -16471,24 +16974,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7611,7 +7469,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16520,9 +17018,20 @@
+@@ -16522,9 +17020,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
@@ -7634,7 +7492,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16539,7 +17048,7 @@
+@@ -16541,7 +17050,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7643,7 +7501,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`
-@@ -16560,6 +17069,9 @@
+@@ -16562,6 +17071,9 @@
fi
esac
shared_flag='-shared'
@@ -7653,7 +7511,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16568,21 +17080,22 @@
+@@ -16570,21 +17082,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7681,7 +7539,7 @@
program main
end
-@@ -16596,8 +17109,7 @@
+@@ -16598,8 +17111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7691,7 +7549,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16624,14 +17136,13 @@
+@@ -16626,14 +17138,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7709,7 +7567,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16648,8 +17159,7 @@
+@@ -16650,8 +17161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7719,7 +7577,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16686,8 +17196,8 @@
+@@ -16688,8 +17198,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7730,7 +7588,7 @@
fi
fi
;;
-@@ -16700,7 +17210,7 @@
+@@ -16702,7 +17212,7 @@
ld_shlibs_F77=no
;;
@@ -7739,7 +7597,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16710,68 +17220,68 @@
+@@ -16712,68 +17222,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7852,7 +7710,7 @@
fi
;;
-@@ -16805,8 +17315,8 @@
+@@ -16807,8 +17317,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7863,7 +7721,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16814,7 +17324,7 @@
+@@ -16816,7 +17326,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7872,7 +7730,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
-@@ -16830,16 +17340,16 @@
+@@ -16832,16 +17342,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7893,7 +7751,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16849,7 +17359,7 @@
+@@ -16851,7 +17361,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7902,7 +7760,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16882,7 +17392,7 @@
+@@ -16884,7 +17394,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7911,7 +7769,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'
-@@ -16892,7 +17402,7 @@
+@@ -16894,7 +17404,7 @@
link_all_deplibs_F77=yes
;;
@@ -7920,7 +7778,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
-@@ -16915,7 +17425,8 @@
+@@ -16917,7 +17427,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
@@ -7930,7 +7788,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16925,7 +17436,7 @@
+@@ -16927,7 +17438,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7939,7 +7797,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16936,14 +17447,14 @@
+@@ -16938,14 +17449,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7956,7 +7814,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'
-@@ -16955,13 +17466,13 @@
+@@ -16957,13 +17468,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7972,7 +7830,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16980,10 +17491,12 @@
+@@ -16982,10 +17493,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7987,7 +7845,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'
-@@ -16992,8 +17505,18 @@
+@@ -16994,8 +17507,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8008,7 +7866,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17002,7 +17525,7 @@
+@@ -17004,7 +17527,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.
@@ -8017,7 +7875,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17062,9 +17585,9 @@
+@@ -17064,9 +17587,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8029,7 +7887,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17170,7 +17693,7 @@
+@@ -17172,7 +17695,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8038,7 +7896,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17180,7 +17703,20 @@
+@@ -17182,7 +17705,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8060,7 +7918,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17245,7 +17781,7 @@
+@@ -17247,7 +17783,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8069,7 +7927,7 @@
;;
beos*)
-@@ -17254,7 +17790,7 @@
+@@ -17256,7 +17792,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8078,7 +7936,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17270,7 +17806,7 @@
+@@ -17272,7 +17808,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8087,7 +7945,7 @@
need_version=no
need_lib_prefix=no
-@@ -17282,7 +17818,8 @@
+@@ -17284,7 +17820,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8097,7 +7955,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17312,7 +17849,7 @@
+@@ -17314,7 +17851,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8106,7 +7964,7 @@
;;
esac
;;
-@@ -17335,7 +17872,7 @@
+@@ -17337,7 +17874,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8115,7 +7973,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"`
-@@ -17358,7 +17895,7 @@
+@@ -17360,7 +17897,7 @@
dynamic_linker=no
;;
@@ -8124,7 +7982,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17370,8 +17907,17 @@
+@@ -17372,8 +17909,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8144,7 +8002,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17389,7 +17935,7 @@
+@@ -17391,7 +17937,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8153,7 +8011,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17416,9 +17962,9 @@
+@@ -17418,9 +17964,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8165,7 +8023,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17433,7 +17979,7 @@
+@@ -17435,7 +17981,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8174,7 +8032,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17444,7 +17990,7 @@
+@@ -17446,7 +17992,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8183,7 +8041,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17506,22 +18052,19 @@
+@@ -17508,22 +18054,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'
@@ -8212,7 +8070,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,
-@@ -17531,6 +18074,30 @@
+@@ -17533,6 +18076,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8243,7 +8101,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17540,7 +18107,7 @@
+@@ -17542,7 +18109,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8252,7 +8110,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17569,7 +18136,11 @@
+@@ -17571,7 +18138,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8265,7 +8123,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
-@@ -17589,7 +18160,7 @@
+@@ -17591,7 +18162,7 @@
os2*)
libname_spec='$name'
@@ -8274,7 +8132,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17691,8 +18262,8 @@
+@@ -17693,8 +18264,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" || \
@@ -8285,7 +8143,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17768,7 +18339,8 @@
+@@ -17770,7 +18341,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.
@@ -8295,7 +8153,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 \
-@@ -17868,6 +18440,12 @@
+@@ -17870,6 +18442,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8308,7 +8166,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17898,7 +18476,7 @@
+@@ -17900,7 +18478,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8317,7 +8175,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17929,7 +18507,7 @@
+@@ -17931,7 +18509,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8326,7 +8184,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17944,7 +18522,7 @@
+@@ -17946,7 +18524,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8335,7 +8193,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18146,7 +18724,10 @@
+@@ -18148,7 +18726,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.
@@ -8347,7 +8205,7 @@
fi
-@@ -18179,7 +18760,7 @@
+@@ -18181,7 +18762,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8356,7 +8214,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18190,15 +18771,41 @@
+@@ -18192,15 +18773,41 @@
compiler=$CC
@@ -8398,7 +8256,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
-@@ -18225,18 +18832,20 @@
+@@ -18227,18 +18834,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 \
@@ -8406,13 +8264,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:18231: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18838: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18233: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18840: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18235: \$? = $ac_status" >&5
-+ echo "$as_me:18842: \$? = $ac_status" >&5
+- echo "$as_me:18237: \$? = $ac_status" >&5
++ echo "$as_me:18844: \$? = $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
@@ -8424,7 +8282,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18313,7 +18922,7 @@
+@@ -18315,7 +18924,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8433,7 +8291,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18339,6 +18948,16 @@
+@@ -18341,6 +18950,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8450,7 +8308,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18350,7 +18969,7 @@
+@@ -18352,7 +18971,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.
@@ -8459,7 +8317,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18374,12 +18993,19 @@
+@@ -18376,12 +18995,19 @@
;;
linux*)
@@ -8480,7 +8338,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18400,9 +19026,14 @@
+@@ -18402,9 +19028,14 @@
;;
solaris*)
@@ -8496,7 +8354,7 @@
;;
sunos4*)
-@@ -18424,6 +19055,11 @@
+@@ -18426,6 +19057,11 @@
fi
;;
@@ -8508,7 +8366,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18458,18 +19094,20 @@
+@@ -18460,18 +19096,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 \
@@ -8516,13 +8374,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:18464: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19100: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18466: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19102: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18468: \$? = $ac_status" >&5
-+ echo "$as_me:19104: \$? = $ac_status" >&5
+- echo "$as_me:18470: \$? = $ac_status" >&5
++ echo "$as_me:19106: \$? = $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
@@ -8534,7 +8392,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18490,7 +19128,7 @@
+@@ -18492,7 +19130,7 @@
fi
fi
@@ -8543,7 +8401,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18512,38 +19150,36 @@
+@@ -18514,38 +19152,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8564,13 +8422,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:18531: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19162: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18533: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19164: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18535: \$? = $ac_status" >&5
-+ echo "$as_me:19166: \$? = $ac_status" >&5
+- echo "$as_me:18537: \$? = $ac_status" >&5
++ echo "$as_me:19168: \$? = $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
@@ -8594,7 +8452,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18614,6 +19250,16 @@
+@@ -18616,6 +19252,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8611,7 +8469,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18634,6 +19280,27 @@
+@@ -18636,6 +19282,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8639,7 +8497,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18671,7 +19338,7 @@
+@@ -18673,7 +19340,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8648,7 +8506,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18681,13 +19348,13 @@
+@@ -18683,13 +19350,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'
@@ -8665,7 +8523,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
-@@ -18696,19 +19363,51 @@
+@@ -18698,19 +19365,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8722,7 +8580,7 @@
fi
;;
-@@ -18726,8 +19425,8 @@
+@@ -18728,8 +19427,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8733,7 +8591,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18742,24 +19441,19 @@
+@@ -18744,24 +19443,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8765,7 +8623,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18793,9 +19487,20 @@
+@@ -18795,9 +19489,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
@@ -8788,7 +8646,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18812,7 +19517,7 @@
+@@ -18814,7 +19519,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8797,7 +8655,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`
-@@ -18833,6 +19538,9 @@
+@@ -18835,6 +19540,9 @@
fi
esac
shared_flag='-shared'
@@ -8807,7 +8665,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18841,21 +19549,22 @@
+@@ -18843,21 +19551,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8835,7 +8693,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18879,8 +19588,7 @@
+@@ -18881,8 +19590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8845,7 +8703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18907,14 +19615,13 @@
+@@ -18909,14 +19617,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8863,7 +8721,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18941,8 +19648,7 @@
+@@ -18943,8 +19650,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8873,7 +8731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18979,8 +19685,8 @@
+@@ -18981,8 +19687,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -8884,7 +8742,7 @@
fi
fi
;;
-@@ -18993,7 +19699,7 @@
+@@ -18995,7 +19701,7 @@
ld_shlibs_GCJ=no
;;
@@ -8893,7 +8751,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19003,68 +19709,68 @@
+@@ -19005,68 +19711,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9006,7 +8864,7 @@
fi
;;
-@@ -19098,8 +19804,8 @@
+@@ -19100,8 +19806,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9017,7 +8875,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19107,7 +19813,7 @@
+@@ -19109,7 +19815,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9026,7 +8884,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
-@@ -19123,16 +19829,16 @@
+@@ -19125,16 +19831,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9047,7 +8905,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19142,7 +19848,7 @@
+@@ -19144,7 +19850,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9056,7 +8914,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19175,7 +19881,7 @@
+@@ -19177,7 +19883,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9065,7 +8923,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'
-@@ -19185,7 +19891,7 @@
+@@ -19187,7 +19893,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9074,7 +8932,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
-@@ -19208,7 +19914,8 @@
+@@ -19210,7 +19916,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
@@ -9084,7 +8942,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19218,7 +19925,7 @@
+@@ -19220,7 +19927,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9093,7 +8951,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19229,14 +19936,14 @@
+@@ -19231,14 +19938,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9110,7 +8968,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'
-@@ -19248,13 +19955,13 @@
+@@ -19250,13 +19957,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9126,7 +8984,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19273,10 +19980,12 @@
+@@ -19275,10 +19982,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9141,7 +8999,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'
-@@ -19285,8 +19994,18 @@
+@@ -19287,8 +19996,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9162,7 +9020,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19295,7 +20014,7 @@
+@@ -19297,7 +20016,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.
@@ -9171,7 +9029,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19355,9 +20074,9 @@
+@@ -19357,9 +20076,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9183,7 +9041,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19463,7 +20182,7 @@
+@@ -19465,7 +20184,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9192,7 +9050,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19473,7 +20192,20 @@
+@@ -19475,7 +20194,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9214,7 +9072,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19538,7 +20270,7 @@
+@@ -19540,7 +20272,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9223,7 +9081,7 @@
;;
beos*)
-@@ -19547,7 +20279,7 @@
+@@ -19549,7 +20281,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9232,7 +9090,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19563,7 +20295,7 @@
+@@ -19565,7 +20297,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9241,7 +9099,7 @@
need_version=no
need_lib_prefix=no
-@@ -19575,7 +20307,8 @@
+@@ -19577,7 +20309,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9251,7 +9109,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19605,7 +20338,7 @@
+@@ -19607,7 +20340,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9260,7 +9118,7 @@
;;
esac
;;
-@@ -19628,7 +20361,7 @@
+@@ -19630,7 +20363,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9269,7 +9127,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"`
-@@ -19651,7 +20384,7 @@
+@@ -19653,7 +20386,7 @@
dynamic_linker=no
;;
@@ -9278,7 +9136,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19663,8 +20396,17 @@
+@@ -19665,8 +20398,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9298,7 +9156,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19682,7 +20424,7 @@
+@@ -19684,7 +20426,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9307,7 +9165,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19709,9 +20451,9 @@
+@@ -19711,9 +20453,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9319,7 +9177,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19726,7 +20468,7 @@
+@@ -19728,7 +20470,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9328,7 +9186,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19737,7 +20479,7 @@
+@@ -19739,7 +20481,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9337,7 +9195,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19799,22 +20541,19 @@
+@@ -19801,22 +20543,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'
@@ -9366,7 +9224,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,
-@@ -19824,6 +20563,30 @@
+@@ -19826,6 +20565,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9397,7 +9255,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19833,7 +20596,7 @@
+@@ -19835,7 +20598,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9406,7 +9264,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19862,7 +20625,11 @@
+@@ -19864,7 +20627,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9419,7 +9277,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
-@@ -19882,7 +20649,7 @@
+@@ -19884,7 +20651,7 @@
os2*)
libname_spec='$name'
@@ -9428,7 +9286,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19984,8 +20751,8 @@
+@@ -19986,8 +20753,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" || \
@@ -9439,7 +9297,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20111,8 +20878,7 @@
+@@ -20113,8 +20880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9449,7 +9307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20215,8 +20981,7 @@
+@@ -20217,8 +20983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9459,7 +9317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20281,8 +21046,7 @@
+@@ -20283,8 +21048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9469,7 +9327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20375,8 +21139,7 @@
+@@ -20377,8 +21141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9479,7 +9337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20441,8 +21204,7 @@
+@@ -20443,8 +21206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9489,7 +9347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20508,8 +21270,7 @@
+@@ -20510,8 +21272,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9499,7 +9357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20575,8 +21336,7 @@
+@@ -20577,8 +21338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9509,16 +9367,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20651,7 +21411,7 @@
+@@ -20653,7 +21413,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20654 "configure"
-+#line 21414 "configure"
+-#line 20656 "configure"
++#line 21416 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20717,7 +21477,7 @@
+@@ -20719,7 +21479,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9527,16 +9385,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20749,7 +21509,7 @@
+@@ -20751,7 +21511,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20752 "configure"
-+#line 21512 "configure"
+-#line 20754 "configure"
++#line 21514 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20815,7 +21575,7 @@
+@@ -20817,7 +21577,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9545,7 +9403,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20866,7 +21626,8 @@
+@@ -20868,7 +21628,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.
@@ -9555,7 +9413,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 \
-@@ -20966,6 +21727,12 @@
+@@ -20968,6 +21729,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9568,7 +9426,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20996,7 +21763,7 @@
+@@ -20998,7 +21765,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9577,7 +9435,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21027,7 +21794,7 @@
+@@ -21029,7 +21796,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9586,7 +9444,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21042,7 +21809,7 @@
+@@ -21044,7 +21811,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9595,7 +9453,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21244,7 +22011,10 @@
+@@ -21246,7 +22013,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.
@@ -9607,7 +9465,7 @@
fi
-@@ -21287,11 +22057,35 @@
+@@ -21289,11 +22059,35 @@
compiler=$CC
@@ -9643,7 +9501,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21307,7 +22101,8 @@
+@@ -21309,7 +22103,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.
@@ -9653,7 +9511,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 \
-@@ -21407,6 +22202,12 @@
+@@ -21409,6 +22204,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9666,7 +9524,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21437,7 +22238,7 @@
+@@ -21439,7 +22240,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9675,7 +9533,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21468,7 +22269,7 @@
+@@ -21470,7 +22271,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9684,7 +9542,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21483,7 +22284,7 @@
+@@ -21485,7 +22286,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9693,7 +9551,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21685,7 +22486,10 @@
+@@ -21687,7 +22488,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.
@@ -9705,7 +9563,7 @@
fi
-@@ -21732,7 +22536,7 @@
+@@ -21734,7 +22538,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9714,7 +9572,7 @@
# Prevent multiple expansion
-@@ -22057,8 +22861,7 @@
+@@ -22059,8 +22863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9724,7 +9582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22132,9 +22935,6 @@
+@@ -22134,9 +22937,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9734,7 +9592,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22168,8 +22968,7 @@
+@@ -22170,8 +22970,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9744,7 +9602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22273,8 +23072,7 @@
+@@ -22275,8 +23074,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9754,7 +9612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22353,9 +23151,6 @@
+@@ -22355,9 +23153,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9764,7 +9622,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22388,8 +23183,7 @@
+@@ -22390,8 +23185,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9774,7 +9632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22492,8 +23286,7 @@
+@@ -22494,8 +23288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9784,7 +9642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22583,8 +23376,7 @@
+@@ -22585,8 +23378,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9794,7 +9652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22645,8 +23437,7 @@
+@@ -22647,8 +23439,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9804,7 +9662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22714,8 +23505,7 @@
+@@ -22716,8 +23507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9814,7 +9672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22781,8 +23571,7 @@
+@@ -22783,8 +23573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9824,7 +9682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22875,8 +23664,7 @@
+@@ -22877,8 +23666,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9834,7 +9692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22954,8 +23742,7 @@
+@@ -22956,8 +23744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9844,7 +9702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23039,8 +23826,7 @@
+@@ -23041,8 +23828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9854,7 +9712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23108,8 +23894,7 @@
+@@ -23110,8 +23896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9864,7 +9722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23204,8 +23989,7 @@
+@@ -23206,8 +23991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9874,7 +9732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23269,8 +24053,7 @@
+@@ -23271,8 +24055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9884,7 +9742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23365,8 +24148,7 @@
+@@ -23367,8 +24150,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9894,7 +9752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23430,8 +24212,7 @@
+@@ -23432,8 +24214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9904,7 +9762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23527,8 +24308,7 @@
+@@ -23529,8 +24310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9914,7 +9772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23592,8 +24372,7 @@
+@@ -23594,8 +24374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9924,7 +9782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23690,8 +24469,7 @@
+@@ -23692,8 +24471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9934,7 +9792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23756,8 +24534,7 @@
+@@ -23758,8 +24536,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9944,7 +9802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23825,8 +24602,7 @@
+@@ -23827,8 +24604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9954,7 +9812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23977,8 +24753,7 @@
+@@ -23979,8 +24755,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9964,7 +9822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24133,8 +24908,7 @@
+@@ -24135,8 +24910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9974,7 +9832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24199,8 +24973,7 @@
+@@ -24201,8 +24975,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9984,7 +9842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24347,8 +25120,7 @@
+@@ -24349,8 +25122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9994,7 +9852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24503,8 +25275,7 @@
+@@ -24505,8 +25277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10004,7 +9862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24560,9 +25331,6 @@
+@@ -24562,9 +25333,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10014,7 +9872,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24596,8 +25364,7 @@
+@@ -24598,8 +25366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10024,7 +9882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24701,8 +25468,7 @@
+@@ -24703,8 +25470,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10034,7 +9892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24802,8 +25568,7 @@
+@@ -24804,8 +25570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10044,7 +9902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24877,8 +25642,7 @@
+@@ -24879,8 +25644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10054,7 +9912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24941,8 +25705,7 @@
+@@ -24943,8 +25707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10064,7 +9922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25004,8 +25767,7 @@
+@@ -25006,8 +25769,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10074,7 +9932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25045,8 +25807,7 @@
+@@ -25047,8 +25809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10084,7 +9942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25102,8 +25863,7 @@
+@@ -25104,8 +25865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10094,7 +9952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25143,8 +25903,7 @@
+@@ -25145,8 +25905,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10104,7 +9962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25208,8 +25967,7 @@
+@@ -25210,8 +25969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10114,7 +9972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25240,10 +25998,8 @@
+@@ -25242,10 +26000,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10127,7 +9985,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25354,8 +26110,7 @@
+@@ -25356,8 +26112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10137,7 +9995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25417,8 +26172,7 @@
+@@ -25419,8 +26174,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10147,7 +10005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25458,8 +26212,7 @@
+@@ -25460,8 +26214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10157,7 +10015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25515,8 +26268,7 @@
+@@ -25517,8 +26270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10167,7 +10025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25556,8 +26308,7 @@
+@@ -25558,8 +26310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10177,7 +10035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25621,8 +26372,7 @@
+@@ -25623,8 +26374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10187,7 +10045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25653,10 +26403,8 @@
+@@ -25655,10 +26405,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10200,7 +10058,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25767,8 +26515,7 @@
+@@ -25769,8 +26517,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10210,7 +10068,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25830,8 +26577,7 @@
+@@ -25832,8 +26579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10220,7 +10078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25871,8 +26617,7 @@
+@@ -25873,8 +26619,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10230,7 +10088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25928,8 +26673,7 @@
+@@ -25930,8 +26675,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10240,7 +10098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25969,8 +26713,7 @@
+@@ -25971,8 +26715,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10250,7 +10108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26034,8 +26777,7 @@
+@@ -26036,8 +26779,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10260,7 +10118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26066,10 +26808,8 @@
+@@ -26068,10 +26810,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10273,7 +10131,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26180,8 +26920,7 @@
+@@ -26182,8 +26922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10283,7 +10141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26243,8 +26982,7 @@
+@@ -26245,8 +26984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10293,7 +10151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26284,8 +27022,7 @@
+@@ -26286,8 +27024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10303,7 +10161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26341,8 +27078,7 @@
+@@ -26343,8 +27080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10313,7 +10171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26382,8 +27118,7 @@
+@@ -26384,8 +27120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10323,7 +10181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26447,8 +27182,7 @@
+@@ -26449,8 +27184,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10333,7 +10191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26479,10 +27213,8 @@
+@@ -26481,10 +27215,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10346,7 +10204,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26601,8 +27333,7 @@
+@@ -26603,8 +27335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10356,7 +10214,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26673,8 +27404,7 @@
+@@ -26675,8 +27406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10366,7 +10224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26744,8 +27474,7 @@
+@@ -26746,8 +27476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10376,7 +10234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26807,8 +27536,7 @@
+@@ -26809,8 +27538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10386,7 +10244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26848,8 +27576,7 @@
+@@ -26850,8 +27578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10396,7 +10254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26905,8 +27632,7 @@
+@@ -26907,8 +27634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10406,7 +10264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26946,8 +27672,7 @@
+@@ -26948,8 +27674,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10416,7 +10274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27011,8 +27736,7 @@
+@@ -27013,8 +27738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10426,7 +10284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27043,10 +27767,8 @@
+@@ -27045,10 +27769,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10439,7 +10297,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27158,8 +27880,7 @@
+@@ -27160,8 +27882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10449,7 +10307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27221,8 +27942,7 @@
+@@ -27223,8 +27944,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10459,7 +10317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27262,8 +27982,7 @@
+@@ -27264,8 +27984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10469,7 +10327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27319,8 +28038,7 @@
+@@ -27321,8 +28040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10479,7 +10337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27360,8 +28078,7 @@
+@@ -27362,8 +28080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10489,7 +10347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27425,8 +28142,7 @@
+@@ -27427,8 +28144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10499,7 +10357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27457,10 +28173,8 @@
+@@ -27459,10 +28175,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10512,7 +10370,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27571,8 +28285,7 @@
+@@ -27573,8 +28287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10522,7 +10380,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27653,8 +28366,7 @@
+@@ -27655,8 +28368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10532,7 +10390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27754,8 +28466,7 @@
+@@ -27756,8 +28468,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10542,7 +10400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27935,8 +28646,7 @@
+@@ -27937,8 +28648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10552,7 +10410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28045,8 +28755,7 @@
+@@ -28047,8 +28757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10562,7 +10420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28270,8 +28979,7 @@
+@@ -28272,8 +28981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10572,7 +10430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28494,8 +29202,7 @@
+@@ -28496,8 +29204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10582,7 +10440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28571,8 +29278,7 @@
+@@ -28573,8 +29280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10592,7 +10450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28714,8 +29420,7 @@
+@@ -28716,8 +29422,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10602,7 +10460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28790,8 +29495,7 @@
+@@ -28792,8 +29497,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10612,7 +10470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28851,8 +29555,7 @@
+@@ -28853,8 +29557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10622,7 +10480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28935,8 +29638,7 @@
+@@ -28937,8 +29640,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10632,7 +10490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29029,8 +29731,7 @@
+@@ -29031,8 +29733,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10642,7 +10500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29204,8 +29905,7 @@
+@@ -29206,8 +29907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10652,7 +10510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29303,8 +30003,7 @@
+@@ -29305,8 +30005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10662,7 +10520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29391,8 +30090,7 @@
+@@ -29393,8 +30092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10672,7 +10530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29469,8 +30167,7 @@
+@@ -29471,8 +30169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10682,25 +10540,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29523,7 +30220,7 @@
+@@ -29525,7 +30222,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29526: $i/$j" >&5
-+ echo "configure: 30223: $i/$j" >&5
+- echo "configure: 29528: $i/$j" >&5
++ echo "configure: 30225: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29821,7 +30518,7 @@
+@@ -29823,7 +30520,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29824: $i/$j" >&5
-+ echo "configure: 30521: $i/$j" >&5
+- echo "configure: 29826: $i/$j" >&5
++ echo "configure: 30523: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30498,8 +31195,7 @@
+@@ -30500,8 +31197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10710,412 +10568,105 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30658,7 +31354,7 @@
+@@ -30660,7 +31356,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30661: $i/$j" >&5
-+ echo "configure: 31357: $i/$j" >&5
+- echo "configure: 30663: $i/$j" >&5
++ echo "configure: 31359: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30688,7 +31384,7 @@
+@@ -30690,7 +31386,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30691: $i/$j" >&5
-+ echo "configure: 31387: $i/$j" >&5
+- echo "configure: 30693: $i/$j" >&5
++ echo "configure: 31389: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30706,7 +31402,7 @@
+@@ -30708,7 +31404,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30709: $i/$j" >&5
-+ echo "configure: 31405: $i/$j" >&5
+- echo "configure: 30711: $i/$j" >&5
++ echo "configure: 31407: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32229,7 +32925,7 @@
+@@ -32231,7 +32927,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32232: $i/$j" >&5
-+ echo "configure: 32928: $i/$j" >&5
+- echo "configure: 32234: $i/$j" >&5
++ echo "configure: 32930: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32406,7 +33102,7 @@
-
-
- # Define the identity of the package.
-- PACKAGE=kdewebdev
-+ PACKAGE=kdewebdev-rc1
- VERSION="3.5"
-
-
-@@ -32758,343 +33454,29 @@
-
-
-
--
-- 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); } &&
+@@ -32858,8 +33554,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=$?
+@@ -32954,8 +33649,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
++ { 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=$?
+@@ -33048,8 +33742,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'
++ { 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=$?
+@@ -33108,6 +33801,31 @@
+ fi
+
+
+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.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
- else
++else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
--
-- 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=$?
-- 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
++
++
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
- 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
--
--
--
++else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
- 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
++
+ MAINT=$MAINTAINER_MODE_TRUE
-
-- fi
-
-
++
++
++
quanta_datadir='${kde_datadir}/quanta'
-@@ -33153,8 +33535,7 @@
+ package="quanta"
+
+@@ -33164,8 +33882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11125,7 +10676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33226,8 +33607,7 @@
+@@ -33237,8 +33954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11135,7 +10686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33281,8 +33661,7 @@
+@@ -33292,8 +34008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11145,7 +10696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33353,8 +33732,7 @@
+@@ -33364,8 +34079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11155,7 +10706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33408,8 +33786,7 @@
+@@ -33419,8 +34133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11165,7 +10716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33476,8 +33853,7 @@
+@@ -33487,8 +34200,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11175,7 +10726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33642,8 +34018,7 @@
+@@ -33653,8 +34365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11185,7 +10736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33718,8 +34093,7 @@
+@@ -33729,8 +34440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11195,7 +10746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33903,8 +34277,7 @@
+@@ -33914,8 +34624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11205,7 +10756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34005,8 +34378,7 @@
+@@ -34016,8 +34725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11215,7 +10766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34255,8 +34627,7 @@
+@@ -34266,8 +34974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11225,15 +10776,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34320,6 +34691,7 @@
-
-
-
-+
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
-
-@@ -34363,8 +34735,7 @@
+@@ -34374,8 +35081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11243,7 +10786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34546,8 +34917,7 @@
+@@ -34557,8 +35263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11253,7 +10796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34744,8 +35114,7 @@
+@@ -34755,8 +35460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11263,7 +10806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34817,8 +35186,7 @@
+@@ -34828,8 +35532,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11273,7 +10816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34872,8 +35240,7 @@
+@@ -34883,8 +35586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11283,7 +10826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34944,8 +35311,7 @@
+@@ -34955,8 +35657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11293,7 +10836,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34999,8 +35365,7 @@
+@@ -35010,8 +35711,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11303,7 +10846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35067,8 +35432,7 @@
+@@ -35078,8 +35778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11313,7 +10856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35233,8 +35597,7 @@
+@@ -35244,8 +35943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11323,7 +10866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35303,8 +35666,7 @@
+@@ -35314,8 +36012,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11333,7 +10876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35488,8 +35850,7 @@
+@@ -35499,8 +36196,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11343,7 +10886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35559,8 +35920,7 @@
+@@ -35570,8 +36266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11353,7 +10896,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35602,8 +35962,7 @@
+@@ -35613,8 +36308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11363,7 +10906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35660,8 +36019,7 @@
+@@ -35671,8 +36365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11373,7 +10916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35839,8 +36197,7 @@
+@@ -35850,8 +36543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11383,7 +10926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35882,8 +36239,7 @@
+@@ -35893,8 +36585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11393,7 +10936,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35940,8 +36296,7 @@
+@@ -35951,8 +36642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11403,7 +10946,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36140,8 +36495,7 @@
+@@ -36151,8 +36841,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11413,7 +10956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36295,8 +36649,7 @@
+@@ -36306,8 +36995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11423,7 +10966,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36447,8 +36800,7 @@
+@@ -36458,8 +37146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11433,7 +10976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36633,8 +36985,7 @@
+@@ -36644,8 +37331,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11443,7 +10986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36732,8 +37083,7 @@
+@@ -36743,8 +37429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11453,7 +10996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36798,8 +37148,7 @@
+@@ -36809,8 +37494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11463,7 +11006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36899,8 +37248,7 @@
+@@ -36910,8 +37594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11473,7 +11016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36965,8 +37313,7 @@
+@@ -36976,8 +37659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11483,7 +11026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37066,8 +37413,7 @@
+@@ -37077,8 +37759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11493,7 +11036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37132,8 +37478,7 @@
+@@ -37143,8 +37824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11503,7 +11046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37233,8 +37578,7 @@
+@@ -37244,8 +37924,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11513,7 +11056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37299,8 +37643,7 @@
+@@ -37310,8 +37989,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11523,7 +11066,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37400,8 +37743,7 @@
+@@ -37411,8 +38089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11533,7 +11076,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37466,8 +37808,7 @@
+@@ -37477,8 +38154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11543,7 +11086,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37570,8 +37911,7 @@
+@@ -37581,8 +38257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11553,7 +11096,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37674,8 +38014,7 @@
+@@ -37685,8 +38360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11563,7 +11106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37795,8 +38134,7 @@
+@@ -37806,8 +38480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11573,7 +11116,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37915,8 +38253,7 @@
+@@ -37926,8 +38599,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11583,7 +11126,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38642,6 +38979,13 @@
+@@ -38653,6 +39325,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11597,7 +11140,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
-@@ -38698,6 +39042,13 @@
+@@ -38709,6 +39388,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11611,7 +11154,7 @@
if test -z "${QUANTAUIRC_HOOK_TRUE}" && test -z "${QUANTAUIRC_HOOK_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"QUANTAUIRC_HOOK\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -39499,6 +39850,9 @@
+@@ -39510,6 +40196,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -11621,7 +11164,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
-@@ -39893,11 +40247,6 @@
+@@ -39904,11 +40593,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11633,7 +11176,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. */
-@@ -39936,6 +40285,12 @@
+@@ -39947,6 +40631,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11648,23 +11191,17 @@
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(kdewebdev, "3.5") dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kdewebdev-rc1, "3.5") dnl searches for some needed programs
-+
-+AM_MAINTAINER_MODE
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.0") dnl searches for some needed programs
++AM_MAINTAINER_MODE
++
KDE_SET_PREFIX
-@@ -75,9 +77,11 @@
- dnl - change the bin_PROGRAMS and the _SOURCES, _LDADD, _METASOURCES, _LDFLAGS
- dnl below it in the quanta/src/Makefile.am, so it reflects the new executable name
-
--AM_INIT_AUTOMAKE(kdewebdev, "3.5")
-+AM_INIT_AUTOMAKE(kdewebdev-rc1, "3.5")
+ dnl generate the config header
+@@ -78,6 +80,8 @@
+ AM_INIT_AUTOMAKE(kdewebdev, "3.5.0")
KDE_ENABLE_HIDDEN_VISIBILITY
+AM_MAINTAINER_MODE
More information about the pkg-kde-commits
mailing list