rev 4605 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Oct 5 01:28:45 UTC 2006
Author: chrsmrtn
Date: 2006-10-05 01:28:40 +0000 (Thu, 05 Oct 2006)
New Revision: 4605
Modified:
trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-10-05 01:00:41 UTC (rev 4604)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-10-05 01:28:40 UTC (rev 4605)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -119,7 +119,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -176,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -195,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -220,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -243,7 +243,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,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 \
@@ -252,7 +252,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,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
@@ -265,7 +265,7 @@
$2=yes
fi
fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,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
@@ -283,7 +283,7 @@
else
$2=yes
fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -292,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -369,7 +369,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,7 @@
# _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -467,7 +467,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -490,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,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)" || \
@@ -501,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
;;
beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -559,7 +559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
;;
esac
;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
dynamic_linker=no
;;
@@ -628,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +650,7 @@
esac
;;
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -662,7 +662,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -671,7 +671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -680,7 +680,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,26 @@
;;
# This must be Linux ELF.
@@ -736,7 +736,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -764,7 +764,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,13 @@
openbsd*)
version_type=sunos
@@ -779,7 +779,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,7 @@
os2*)
libname_spec='$name'
@@ -788,7 +788,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,7 @@
need_version=yes
;;
@@ -811,7 +811,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,29 @@
fi
;;
@@ -841,7 +841,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -863,7 +863,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
case $tagname in
CXX)
@@ -874,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -883,7 +883,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +892,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -901,7 +901,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,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,
@@ -910,7 +910,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,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,
@@ -919,7 +919,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -991,7 +991,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,27 @@
esac
;;
@@ -1057,7 +1057,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,22 @@
;;
openbsd*)
@@ -1093,7 +1093,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1176,7 +1176,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,7 @@
# AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1311,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
fi
;;
@@ -1362,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1427,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,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
@@ -1438,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,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.
@@ -1447,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1473,7 +1473,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1482,7 +1482,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1495,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1532,7 +1532,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,32 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
esac
;;
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +1591,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1725,7 +1725,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,14 @@
;;
esac
;;
@@ -1742,7 +1742,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,12 @@
# location of the library.
case $cc_basename in
@@ -1758,7 +1758,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,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.
@@ -1772,7 +1772,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1841,7 +1841,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,25 @@
;;
esac
;;
@@ -1889,7 +1889,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1922,7 +1922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1973,7 +1973,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
;;
mvs*)
case $cc_basename in
@@ -1982,7 +1982,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
;;
esac
;;
@@ -1991,7 +1991,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,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::"'
;;
@@ -2025,7 +2025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2043,7 +2043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2068,7 +2068,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2090,7 +2090,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2129,7 +2129,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,33 @@
;;
solaris*)
case $cc_basename in
@@ -2178,7 +2178,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2190,7 +2190,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,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
@@ -2202,7 +2202,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2214,7 +2214,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
;;
esac
;;
@@ -2280,7 +2280,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,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.
@@ -2307,7 +2307,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,7 @@
fi
;;
@@ -2316,7 +2316,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,37 @@
$rm -f confest.$objext
@@ -2355,7 +2355,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2373,7 +2373,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2382,7 +2382,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2395,7 +2395,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2404,7 +2404,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2442,7 +2442,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2477,7 +2477,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2492,7 +2492,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2528,7 +2528,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2538,7 +2538,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2547,7 +2547,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2565,7 +2565,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,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.
@@ -2577,7 +2577,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2587,7 +2587,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2620,7 +2620,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2651,7 +2651,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2660,7 +2660,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2692,7 +2692,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
@@ -2721,7 +2721,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,13 @@
;;
esac
;;
@@ -2736,7 +2736,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,26 @@
;;
esac
;;
@@ -2768,7 +2768,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,25 @@
;;
mvs*)
case $cc_basename in
@@ -2799,7 +2799,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
;;
psos*)
;;
@@ -2826,7 +2826,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2841,7 +2841,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2850,7 +2850,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
;;
esac
;;
@@ -2866,7 +2866,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2878,7 +2878,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2887,7 +2887,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2904,7 +2904,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,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.
@@ -2913,7 +2913,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2936,7 +2936,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2958,7 +2958,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2967,7 +2967,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,17 @@
fi
;;
@@ -2985,7 +2985,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2994,7 +2994,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,7 +3011,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
with_gnu_ld=no
fi
;;
@@ -3053,7 +3053,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3081,7 +3081,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,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
@@ -3090,7 +3090,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,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'
@@ -3107,7 +3107,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3184,7 +3184,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3292,7 +3292,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3301,7 +3301,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3314,7 +3314,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3356,7 +3356,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3382,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3518,7 +3518,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3605,7 +3605,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3614,7 +3614,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3623,7 +3623,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,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
@@ -3633,7 +3633,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3642,7 +3642,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,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
@@ -3659,7 +3659,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,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}\*'
@@ -3675,7 +3675,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3701,7 +3701,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,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.
@@ -3731,7 +3731,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
fi
;;
@@ -3798,7 +3798,7 @@
;;
uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3810,7 +3810,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,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
@@ -4341,7 +4341,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5031,19 +5031,53 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,352 @@
+@@ -430,42 +720,377 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
#endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -5588,9 +5622,15 @@
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
- eval ac_val=$`echo $ac_var`
-- case $ac_val in
++ eval ac_val=\$$ac_var
+ case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5600,15 +5640,9 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -6003,7 +6037,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6022,7 +6056,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -6910,9 +6944,9 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2267,16 +2988,16 @@
+@@ -2266,16 +2987,16 @@
+ fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
- echo "$as_me:$LINENO: checking where to install" >&5
-echo $ECHO_N "checking where to install... $ECHO_C" >&6
@@ -6933,7 +6967,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2289,13 +3010,13 @@
+@@ -2288,13 +3009,13 @@
@@ -6951,7 +6985,7 @@
val=
-@@ -2312,11 +3033,11 @@
+@@ -2311,11 +3032,11 @@
@@ -6965,7 +6999,7 @@
am_make=${MAKE-make}
-@@ -2326,8 +3047,8 @@
+@@ -2325,8 +3046,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6976,7 +7010,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2354,15 +3075,15 @@
+@@ -2353,15 +3074,15 @@
fi
@@ -6997,7 +7031,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2382,10 +3103,9 @@
+@@ -2381,10 +3102,9 @@
@@ -7010,7 +7044,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2405,18 +3125,18 @@
+@@ -2404,18 +3124,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -7036,7 +7070,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2425,12 +3145,12 @@
+@@ -2424,12 +3144,12 @@
else
kde_use_strict_options="no"
@@ -7053,7 +7087,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2439,20 +3159,21 @@
+@@ -2438,20 +3158,21 @@
else
kde_use_warnings="yes"
@@ -7080,7 +7114,7 @@
CFLAGS=" $CFLAGS"
-@@ -2464,8 +3185,8 @@
+@@ -2463,8 +3184,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7091,7 +7125,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2478,32 +3199,34 @@
+@@ -2477,32 +3198,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7133,7 +7167,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2516,36 +3239,51 @@
+@@ -2515,36 +3238,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7195,7 +7229,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2558,74 +3296,34 @@
+@@ -2557,74 +3295,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7279,7 +7313,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2639,7 +3337,7 @@
+@@ -2638,7 +3336,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7288,7 +7322,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2650,6 +3348,7 @@
+@@ -2649,6 +3347,7 @@
fi
done
done
@@ -7296,7 +7330,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2667,22 +3366,23 @@
+@@ -2666,22 +3365,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7327,7 +7361,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2695,36 +3395,38 @@
+@@ -2694,36 +3394,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7374,7 +7408,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2737,29 +3439,45 @@
+@@ -2736,29 +3438,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7426,7 +7460,7 @@
fi
fi
-@@ -2772,21 +3490,35 @@
+@@ -2771,21 +3489,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7470,7 +7504,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2811,46 +3543,70 @@
+@@ -2810,47 +3542,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -7524,7 +7558,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -7561,16 +7595,21 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2863,19 +3619,23 @@
+
+@@ -2862,19 +3624,21 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
@@ -7594,7 +7633,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2894,22 +3654,27 @@
+@@ -2893,22 +3657,27 @@
fi
fi
fi
@@ -7634,7 +7673,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2920,9 +3685,8 @@
+@@ -2919,9 +3688,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7645,7 +7684,7 @@
break;;
* ) break;;
esac
-@@ -2936,14 +3700,14 @@
+@@ -2935,14 +3703,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7664,7 +7703,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2963,14 +3727,20 @@
+@@ -2962,14 +3730,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7689,7 +7728,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2988,12 +3758,12 @@
+@@ -2987,12 +3761,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7706,7 +7745,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3016,24 +3786,36 @@
+@@ -3015,24 +3789,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7751,7 +7790,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3042,24 +3824,28 @@
+@@ -3041,24 +3827,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7788,7 +7827,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3075,24 +3861,36 @@
+@@ -3074,24 +3864,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7833,7 +7872,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3101,285 +3899,278 @@
+@@ -3100,285 +3902,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8296,7 +8335,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3388,8 +4179,8 @@
+@@ -3387,8 +4182,8 @@
depcc="$CC" am_compiler_list=
@@ -8307,7 +8346,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3478,8 +4269,8 @@
+@@ -3477,8 +4272,8 @@
fi
fi
@@ -8318,7 +8357,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3501,8 +4292,8 @@
+@@ -3500,8 +4295,8 @@
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
@@ -8329,7 +8368,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3536,8 +4327,13 @@
+@@ -3535,8 +4330,13 @@
#endif
Syntax error
_ACEOF
@@ -8345,7 +8384,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3562,9 +4358,10 @@
+@@ -3561,9 +4361,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8357,7 +8396,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3574,8 +4371,13 @@
+@@ -3573,8 +4374,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8373,7 +8412,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3602,6 +4404,7 @@
+@@ -3601,6 +4407,7 @@
ac_preproc_ok=:
break
fi
@@ -8381,7 +8420,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3619,8 +4422,8 @@
+@@ -3618,8 +4425,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8392,7 +8431,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3643,8 +4446,13 @@
+@@ -3642,8 +4449,13 @@
#endif
Syntax error
_ACEOF
@@ -8408,7 +8447,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3669,9 +4477,10 @@
+@@ -3668,9 +4480,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8420,7 +8459,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3681,8 +4490,13 @@
+@@ -3680,8 +4493,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8436,7 +8475,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3709,6 +4523,7 @@
+@@ -3708,6 +4526,7 @@
ac_preproc_ok=:
break
fi
@@ -8444,7 +8483,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3759,18 +4574,22 @@
+@@ -3758,18 +4577,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8472,7 +8511,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3783,36 +4602,38 @@
+@@ -3782,36 +4605,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8519,7 +8558,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3825,55 +4646,85 @@
+@@ -3824,55 +4649,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8623,7 +8662,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3896,24 +4747,36 @@
+@@ -3895,24 +4750,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8668,7 +8707,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3922,24 +4785,28 @@
+@@ -3921,24 +4788,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8705,7 +8744,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3955,24 +4822,36 @@
+@@ -3954,24 +4825,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8750,7 +8789,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3981,70 +4860,53 @@
+@@ -3980,70 +4863,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8845,7 +8884,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4053,61 +4915,91 @@
+@@ -4052,61 +4918,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8931,12 +8970,12 @@
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8959,7 +8998,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4116,8 +5008,8 @@
+@@ -4115,8 +5011,8 @@
depcc="$CXX" am_compiler_list=
@@ -8970,7 +9009,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4206,8 +5098,8 @@
+@@ -4205,8 +5101,8 @@
fi
fi
@@ -8981,7 +9020,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4225,8 +5117,8 @@
+@@ -4224,8 +5120,8 @@
@@ -8992,7 +9031,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4251,24 +5143,36 @@
+@@ -4250,24 +5146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9037,7 +9076,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4277,13 +5181,14 @@
+@@ -4276,13 +5184,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9056,7 +9095,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4325,17 +5230,16 @@
+@@ -4324,17 +5233,16 @@
fi
fi
@@ -9078,7 +9117,7 @@
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'
-@@ -4363,24 +5267,36 @@
+@@ -4362,24 +5270,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9123,7 +9162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4389,8 +5305,10 @@
+@@ -4388,8 +5308,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9131,11 +9170,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4403,29 +5321,28 @@
+@@ -4402,29 +5324,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9173,7 +9212,7 @@
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'
-@@ -4452,24 +5369,36 @@
+@@ -4451,24 +5372,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9218,7 +9257,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4478,8 +5407,10 @@
+@@ -4477,8 +5410,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9226,11 +9265,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4492,13 +5423,13 @@
+@@ -4491,13 +5426,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9248,7 +9287,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4519,16 +5450,15 @@
+@@ -4518,16 +5453,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9269,7 +9308,7 @@
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'
-@@ -4555,24 +5485,36 @@
+@@ -4554,24 +5488,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9314,7 +9353,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4581,8 +5523,10 @@
+@@ -4580,8 +5526,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9322,11 +9361,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4595,16 +5539,16 @@
+@@ -4594,16 +5542,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9347,7 +9386,7 @@
:
fi
-@@ -4619,16 +5563,15 @@
+@@ -4618,16 +5566,15 @@
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
@@ -9368,7 +9407,7 @@
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'
-@@ -4655,24 +5598,36 @@
+@@ -4654,24 +5601,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9413,7 +9452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4681,8 +5636,10 @@
+@@ -4680,8 +5639,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9421,11 +9460,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4695,27 +5652,26 @@
+@@ -4694,27 +5655,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9460,7 +9499,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4740,24 +5696,36 @@
+@@ -4739,24 +5699,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9505,7 +9544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4766,8 +5734,10 @@
+@@ -4765,8 +5737,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9513,11 +9552,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4780,13 +5750,13 @@
+@@ -4779,13 +5753,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9535,7 +9574,7 @@
:
fi
-@@ -4794,16 +5764,15 @@
+@@ -4793,16 +5767,15 @@
;;
esac
@@ -9556,7 +9595,7 @@
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'
-@@ -4830,24 +5799,36 @@
+@@ -4829,24 +5802,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9601,7 +9640,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4856,8 +5837,10 @@
+@@ -4855,8 +5840,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9609,11 +9648,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4870,28 +5853,27 @@
+@@ -4869,28 +5856,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9650,7 +9689,7 @@
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'
-@@ -4918,24 +5900,36 @@
+@@ -4917,24 +5903,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9695,7 +9734,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4944,8 +5938,10 @@
+@@ -4943,8 +5941,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9703,11 +9742,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4958,28 +5954,27 @@
+@@ -4957,28 +5957,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9744,7 +9783,7 @@
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'
-@@ -5006,24 +6001,36 @@
+@@ -5005,24 +6004,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9789,7 +9828,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5032,8 +6039,10 @@
+@@ -5031,8 +6042,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9797,11 +9836,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5046,13 +6055,13 @@
+@@ -5045,13 +6058,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9819,7 +9858,7 @@
:
fi
-@@ -5064,13 +6073,13 @@
+@@ -5063,13 +6076,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9837,7 +9876,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5078,16 +6087,15 @@
+@@ -5077,16 +6090,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9858,7 +9897,7 @@
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'
-@@ -5114,24 +6122,36 @@
+@@ -5113,24 +6125,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9903,7 +9942,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5140,8 +6160,10 @@
+@@ -5139,8 +6163,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9911,11 +9950,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5154,13 +6176,13 @@
+@@ -5153,13 +6179,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9933,7 +9972,7 @@
:
fi
-@@ -5172,16 +6194,15 @@
+@@ -5171,16 +6197,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9954,7 +9993,7 @@
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'
-@@ -5208,24 +6229,36 @@
+@@ -5207,24 +6232,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9999,7 +10038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5234,8 +6267,10 @@
+@@ -5233,8 +6270,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10007,11 +10046,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5248,28 +6283,27 @@
+@@ -5247,28 +6286,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10048,7 +10087,7 @@
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'
-@@ -5296,24 +6330,36 @@
+@@ -5295,24 +6333,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10093,7 +10132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5322,8 +6368,10 @@
+@@ -5321,8 +6371,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10101,11 +10140,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5336,28 +6384,27 @@
+@@ -5335,28 +6387,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10142,7 +10181,7 @@
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'
-@@ -5384,24 +6431,36 @@
+@@ -5383,24 +6434,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10187,7 +10226,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5410,8 +6469,10 @@
+@@ -5409,8 +6472,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10195,11 +10234,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5424,28 +6485,27 @@
+@@ -5423,28 +6488,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10236,7 +10275,7 @@
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'
-@@ -5472,24 +6532,36 @@
+@@ -5471,24 +6535,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10281,7 +10320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5498,8 +6570,10 @@
+@@ -5497,8 +6573,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10289,11 +10328,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5512,13 +6586,13 @@
+@@ -5511,13 +6589,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10311,7 +10350,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5526,37 +6600,37 @@
+@@ -5525,37 +6603,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10363,7 +10402,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5588,24 +6662,36 @@
+@@ -5587,24 +6665,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10408,7 +10447,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5614,18 +6700,19 @@
+@@ -5613,18 +6703,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10418,7 +10457,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_cflags_save"
@@ -10432,7 +10471,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5645,16 +6732,15 @@
+@@ -5644,16 +6735,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10453,7 +10492,7 @@
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'
-@@ -5681,24 +6767,36 @@
+@@ -5680,24 +6770,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10498,7 +10537,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5707,8 +6805,10 @@
+@@ -5706,8 +6808,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10506,11 +10545,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5721,29 +6821,28 @@
+@@ -5720,29 +6824,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10548,7 +10587,7 @@
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'
-@@ -5770,24 +6869,36 @@
+@@ -5769,24 +6872,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10593,7 +10632,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5796,8 +6907,10 @@
+@@ -5795,8 +6910,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10601,11 +10640,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5810,28 +6923,27 @@
+@@ -5809,28 +6926,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10642,7 +10681,7 @@
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'
-@@ -5858,24 +6970,36 @@
+@@ -5857,24 +6973,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10687,7 +10726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5884,8 +7008,10 @@
+@@ -5883,8 +7011,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10695,11 +10734,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5898,28 +7024,27 @@
+@@ -5897,28 +7027,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10736,7 +10775,7 @@
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'
-@@ -5946,24 +7071,36 @@
+@@ -5945,24 +7074,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10781,7 +10820,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5972,8 +7109,10 @@
+@@ -5971,8 +7112,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10789,11 +10828,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5986,28 +7125,27 @@
+@@ -5985,28 +7128,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10830,7 +10869,7 @@
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'
-@@ -6034,24 +7172,36 @@
+@@ -6033,24 +7175,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10875,7 +10914,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6060,8 +7210,10 @@
+@@ -6059,8 +7213,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10883,11 +10922,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6074,28 +7226,27 @@
+@@ -6073,28 +7229,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10924,7 +10963,7 @@
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'
-@@ -6122,24 +7273,36 @@
+@@ -6121,24 +7276,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10969,7 +11008,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6148,8 +7311,10 @@
+@@ -6147,8 +7314,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10977,11 +11016,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6162,13 +7327,13 @@
+@@ -6161,13 +7330,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10999,7 +11038,7 @@
:
fi
-@@ -6275,13 +7440,13 @@
+@@ -6274,13 +7443,13 @@
fi
@@ -11016,7 +11055,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6311,8 +7476,13 @@
+@@ -6310,8 +7479,13 @@
#endif
Syntax error
_ACEOF
@@ -11032,7 +11071,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6337,9 +7507,10 @@
+@@ -6336,9 +7510,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11044,7 +11083,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6349,8 +7520,13 @@
+@@ -6348,8 +7523,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11060,7 +11099,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6377,6 +7553,7 @@
+@@ -6376,6 +7556,7 @@
ac_preproc_ok=:
break
fi
@@ -11068,7 +11107,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6394,8 +7571,8 @@
+@@ -6393,8 +7574,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11079,7 +11118,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6418,8 +7595,13 @@
+@@ -6417,8 +7598,13 @@
#endif
Syntax error
_ACEOF
@@ -11095,7 +11134,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6444,9 +7626,10 @@
+@@ -6443,9 +7629,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11107,7 +11146,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6456,8 +7639,13 @@
+@@ -6455,8 +7642,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11123,7 +11162,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6484,6 +7672,7 @@
+@@ -6483,6 +7675,7 @@
ac_preproc_ok=:
break
fi
@@ -11131,7 +11170,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6510,16 +7699,15 @@
+@@ -6509,16 +7702,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11152,7 +11191,7 @@
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'
-@@ -6546,24 +7734,36 @@
+@@ -6545,24 +7737,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11197,7 +11236,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6572,8 +7772,10 @@
+@@ -6571,8 +7775,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11205,11 +11244,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6586,22 +7788,21 @@
+@@ -6585,22 +7791,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11238,7 +11277,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6617,36 +7818,36 @@
+@@ -6616,36 +7821,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11285,7 +11324,7 @@
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'
-@@ -6673,24 +7874,36 @@
+@@ -6672,24 +7877,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11330,7 +11369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6699,8 +7912,10 @@
+@@ -6698,8 +7915,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11338,11 +11377,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6713,29 +7928,28 @@
+@@ -6712,29 +7931,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11380,7 +11419,7 @@
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'
-@@ -6762,24 +7976,36 @@
+@@ -6761,24 +7979,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11425,7 +11464,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6788,8 +8014,10 @@
+@@ -6787,8 +8017,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11433,11 +11472,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6802,13 +8030,13 @@
+@@ -6801,13 +8033,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11455,7 +11494,7 @@
:
fi
-@@ -6818,13 +8046,13 @@
+@@ -6817,13 +8049,13 @@
@@ -11473,7 +11512,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6837,13 +8065,13 @@
+@@ -6836,13 +8068,13 @@
@@ -11491,7 +11530,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6854,216 +8082,36 @@
+@@ -6853,216 +8085,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11504,9 +11543,25 @@
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
++
++
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
++ kde_use_nmcheck=no
++fi
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11515,14 +11570,8 @@
-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'
-+ # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
-+else
-+ kde_use_nmcheck=no
-+fi
-
-
+-
+-
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11531,14 +11580,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
-
+-
-int
-main ()
-{
@@ -11713,8 +11755,8 @@
-
-
+-
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11724,15 +11766,15 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7082,12 +8130,12 @@
+@@ -7081,12 +8133,12 @@
esac
else
enable_shared=yes
-fi;
+fi
++
-# Check whether --enable-static or --disable-static was given.
-+
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -11741,7 +11783,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7106,7 +8154,8 @@
+@@ -7105,18 +8157,19 @@
esac
else
enable_static=no
@@ -11751,23 +11793,22 @@
-@@ -7115,11 +8164,11 @@
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
+
- # Check whether --enable-libsuffix or --disable-libsuffix was given.
+ # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+ kdelibsuff="auto"
-fi;
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
+fi
+
if test "$kdelibsuff" = "auto"; then
-@@ -7140,8 +8189,8 @@
+@@ -7137,8 +8190,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11778,7 +11819,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7157,14 +8206,13 @@
+@@ -7154,14 +8207,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11797,22 +11838,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7183,10 +8231,11 @@
+@@ -7180,10 +8232,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7210,7 +8259,7 @@
+@@ -7207,7 +8260,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
@@ -11821,7 +11862,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7239,37 +8288,184 @@
+@@ -7236,37 +8289,184 @@
fi
SED=$lt_cv_path_SED
@@ -11897,10 +11938,7 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -11911,12 +11949,18 @@
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -11924,11 +11968,8 @@
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12023,7 +12064,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7298,11 +8494,11 @@
+@@ -7295,11 +8495,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12039,7 +12080,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7315,7 +8511,7 @@
+@@ -7312,7 +8512,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,
@@ -12048,7 +12089,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'*)
-@@ -7335,21 +8531,21 @@
+@@ -7332,21 +8532,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12077,7 +12118,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7359,29 +8555,38 @@
+@@ -7356,29 +8556,38 @@
;;
esac
fi
@@ -12124,7 +12165,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7389,56 +8594,63 @@
+@@ -7386,56 +8595,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12222,7 +12263,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7465,44 +8677,36 @@
+@@ -7462,44 +8678,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12277,7 +12318,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7518,7 +8722,7 @@
+@@ -7515,7 +8723,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12286,7 +12327,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
-@@ -7534,43 +8738,27 @@
+@@ -7531,43 +8739,27 @@
esac
;;
@@ -12343,7 +12384,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
-@@ -7589,32 +8777,22 @@
+@@ -7586,32 +8778,22 @@
;;
openbsd*)
@@ -12379,7 +12420,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7635,17 +8813,20 @@
+@@ -7632,17 +8814,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12403,7 +12444,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7654,14 +8835,17 @@
+@@ -7651,14 +8836,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12424,16 +12465,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7688,7 +8872,7 @@
+@@ -7685,7 +8873,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7691 "configure"' > conftest.$ac_ext
-+ echo '#line 8875 "configure"' > conftest.$ac_ext
+- echo '#line 7688 "configure"' > conftest.$ac_ext
++ echo '#line 8876 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7731,14 +8915,13 @@
+@@ -7728,14 +8916,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12450,7 +12491,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7750,7 +8933,6 @@
+@@ -7747,7 +8934,6 @@
esac
;;
*64-bit*)
@@ -12458,7 +12499,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7775,8 +8957,8 @@
+@@ -7772,8 +8958,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12469,7 +12510,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7802,24 +8984,36 @@
+@@ -7799,24 +8985,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12514,7 +12555,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7828,9 +9022,10 @@
+@@ -7825,9 +9023,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12523,11 +12564,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7839,13 +9034,33 @@
+@@ -7836,13 +9035,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12563,7 +12604,7 @@
esac
-@@ -7853,8 +9068,8 @@
+@@ -7850,8 +9069,8 @@
@@ -12574,7 +12615,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7878,24 +9093,36 @@
+@@ -7875,24 +9094,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12619,7 +12660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7904,9 +9131,10 @@
+@@ -7901,9 +9132,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12632,7 +12673,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7962,6 +9190,7 @@
+@@ -7959,6 +9191,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12640,7 +12681,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7981,18 +9210,27 @@
+@@ -7978,18 +9211,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12674,7 +12715,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8005,12 +9243,14 @@
+@@ -8002,12 +9244,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12692,7 +12733,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8033,9 +9273,9 @@
+@@ -8030,9 +9274,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12705,7 +12746,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8049,24 +9289,36 @@
+@@ -8046,24 +9290,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12750,7 +12791,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8075,12 +9327,14 @@
+@@ -8072,12 +9328,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12769,7 +12810,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8095,18 +9349,19 @@
+@@ -8092,18 +9350,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12797,7 +12838,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8117,24 +9372,36 @@
+@@ -8114,24 +9373,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12842,7 +12883,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8143,15 +9410,16 @@
+@@ -8140,15 +9411,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12865,7 +12906,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8160,8 +9428,13 @@
+@@ -8157,8 +9429,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12881,7 +12922,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8185,9 +9458,10 @@
+@@ -8182,9 +9459,10 @@
ac_header_preproc=no
fi
@@ -12894,7 +12935,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8211,25 +9485,19 @@
+@@ -8208,25 +9486,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -12927,7 +12968,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8241,226 +9509,545 @@
+@@ -8238,223 +9510,542 @@
done
@@ -13040,7 +13081,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8336:" \
+-echo "$as_me:8333:" \
- "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
@@ -13228,6 +13269,13 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+-if test "$ac_test_FFLAGS" = set; then
+- FFLAGS=$ac_save_FFLAGS
+-elif test $ac_cv_prog_f77_g = yes; then
+- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -13235,16 +13283,7 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
--if test "$ac_test_FFLAGS" = set; then
-- FFLAGS=$ac_save_FFLAGS
--elif test $ac_cv_prog_f77_g = yes; then
-- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-- FFLAGS="-g -O2"
-- else
-- FFLAGS="-g"
++fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -13654,13 +13693,10 @@
+ FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+ FFLAGS="-g -O2"
-+ else
-+ FFLAGS="-g"
- fi
- else
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-@@ -8482,13 +10069,13 @@
+ FFLAGS="-g -O2"
+ else
+ FFLAGS="-g"
+@@ -8479,13 +10070,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13677,7 +13713,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8517,20 +10104,70 @@
+@@ -8514,20 +10105,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13754,7 +13790,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.
-@@ -8541,19 +10178,19 @@
+@@ -8538,19 +10179,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13780,7 +13816,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8567,9 +10204,6 @@
+@@ -8564,9 +10205,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13790,7 +13826,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'"
-@@ -8591,14 +10225,30 @@
+@@ -8588,14 +10226,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -13823,7 +13859,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8616,14 +10266,17 @@
+@@ -8613,14 +10267,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13843,7 +13879,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8741,15 +10394,15 @@
+@@ -8738,15 +10395,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -13865,7 +13901,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8763,8 +10416,8 @@
+@@ -8760,8 +10417,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13876,7 +13912,7 @@
objdir=$lt_cv_objdir
-@@ -8785,7 +10438,7 @@
+@@ -8782,7 +10439,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13885,7 +13921,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8805,7 +10458,7 @@
+@@ -8802,7 +10459,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13894,7 +13930,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8815,8 +10468,8 @@
+@@ -8812,8 +10469,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -13905,7 +13941,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8829,32 +10482,34 @@
+@@ -8826,32 +10483,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13947,7 +13983,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8867,27 +10522,41 @@
+@@ -8864,27 +10523,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13996,7 +14032,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8895,8 +10564,8 @@
+@@ -8892,8 +10565,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -14007,7 +14043,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8909,32 +10578,34 @@
+@@ -8906,32 +10579,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14049,7 +14085,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8947,27 +10618,41 @@
+@@ -8944,27 +10619,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14098,7 +14134,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8975,8 +10660,8 @@
+@@ -8972,8 +10661,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -14109,7 +14145,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8989,32 +10674,34 @@
+@@ -8986,32 +10675,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14151,7 +14187,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9027,27 +10714,41 @@
+@@ -9024,27 +10715,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14200,7 +14236,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9062,6 +10763,7 @@
+@@ -9059,6 +10764,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14208,7 +14244,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9081,21 +10783,32 @@
+@@ -9078,21 +10784,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14245,7 +14281,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9115,7 +10828,7 @@
+@@ -9112,7 +10829,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14254,7 +14290,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
-@@ -9147,17 +10860,17 @@
+@@ -9144,17 +10861,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14278,7 +14314,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9177,7 +10890,7 @@
+@@ -9174,7 +10891,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14287,7 +14323,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
-@@ -9209,11 +10922,11 @@
+@@ -9206,11 +10923,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14303,7 +14339,7 @@
fi
else
-@@ -9228,21 +10941,21 @@
+@@ -9225,21 +10942,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14332,7 +14368,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9272,68 +10985,25 @@
+@@ -9269,68 +10986,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14416,7 +14452,7 @@
## CAVEAT EMPTOR:
-@@ -9347,8 +11017,8 @@
+@@ -9344,8 +11018,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14427,7 +14463,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9362,26 +11032,28 @@
+@@ -9359,26 +11033,28 @@
# 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 \
@@ -14435,13 +14471,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:9368: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11038: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9365: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11039: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9372: \$? = $ac_status" >&5
-+ echo "$as_me:11042: \$? = $ac_status" >&5
+- echo "$as_me:9369: \$? = $ac_status" >&5
++ echo "$as_me:11043: \$? = $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
@@ -14463,7 +14499,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9395,8 +11067,8 @@
+@@ -9392,8 +11068,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14474,7 +14510,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9434,6 +11106,11 @@
+@@ -9431,6 +11107,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14486,7 +14522,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9450,7 +11127,7 @@
+@@ -9447,7 +11128,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14495,7 +14531,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9476,6 +11153,16 @@
+@@ -9473,6 +11154,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14512,7 +14548,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9487,7 +11174,7 @@
+@@ -9484,7 +11175,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.
@@ -14521,7 +14557,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9510,13 +11197,20 @@
+@@ -9507,13 +11198,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14544,7 +14580,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9531,15 +11225,15 @@
+@@ -9528,15 +11226,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14566,7 +14602,7 @@
;;
sunos4*)
-@@ -9548,7 +11242,7 @@
+@@ -9545,7 +11243,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14575,7 +14611,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9561,6 +11255,17 @@
+@@ -9558,6 +11256,17 @@
fi
;;
@@ -14593,7 +14629,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9572,16 +11277,16 @@
+@@ -9569,16 +11278,16 @@
esac
fi
@@ -14614,7 +14650,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9595,26 +11300,28 @@
+@@ -9592,26 +11301,28 @@
# 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 \
@@ -14622,13 +14658,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:9601: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11306: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11307: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9605: \$? = $ac_status" >&5
-+ echo "$as_me:11310: \$? = $ac_status" >&5
+- echo "$as_me:9602: \$? = $ac_status" >&5
++ echo "$as_me:11311: \$? = $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
@@ -14650,7 +14686,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9627,7 +11334,7 @@
+@@ -9624,7 +11335,7 @@
fi
fi
@@ -14659,7 +14695,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9637,8 +11344,50 @@
+@@ -9634,8 +11345,50 @@
;;
esac
@@ -14712,7 +14748,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9649,60 +11398,58 @@
+@@ -9646,60 +11399,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14733,13 +14769,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:9668: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11410: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9665: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11411: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9672: \$? = $ac_status" >&5
-+ echo "$as_me:11414: \$? = $ac_status" >&5
+- echo "$as_me:9669: \$? = $ac_status" >&5
++ echo "$as_me:11415: \$? = $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
@@ -14791,7 +14827,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9712,8 +11459,8 @@
+@@ -9709,8 +11460,8 @@
need_locks=no
fi
@@ -14802,7 +14838,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9751,6 +11498,16 @@
+@@ -9748,6 +11499,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14819,7 +14855,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9761,6 +11518,10 @@
+@@ -9758,6 +11519,10 @@
with_gnu_ld=no
fi
;;
@@ -14830,7 +14866,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9771,6 +11532,27 @@
+@@ -9768,6 +11533,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14858,7 +14894,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9808,7 +11590,7 @@
+@@ -9805,7 +11591,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14867,7 +14903,7 @@
else
ld_shlibs=no
fi
-@@ -9818,13 +11600,13 @@
+@@ -9815,13 +11601,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'
@@ -14884,7 +14920,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
-@@ -9833,23 +11615,70 @@
+@@ -9830,23 +11616,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14960,7 +14996,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9863,13 +11692,40 @@
+@@ -9860,13 +11693,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15003,7 +15039,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9879,24 +11735,19 @@
+@@ -9876,24 +11736,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15035,7 +15071,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9908,7 +11759,7 @@
+@@ -9905,7 +11760,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -15044,7 +15080,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9930,9 +11781,21 @@
+@@ -9927,9 +11782,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -15068,7 +15104,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9949,7 +11812,7 @@
+@@ -9946,7 +11813,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15077,7 +15113,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`
-@@ -9968,8 +11831,12 @@
+@@ -9965,8 +11832,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15090,7 +15126,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9977,22 +11844,23 @@
+@@ -9974,22 +11845,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15121,7 +15157,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10008,24 +11876,36 @@
+@@ -10005,24 +11877,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15166,7 +15202,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10039,19 +11919,20 @@
+@@ -10036,19 +11920,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15174,7 +15210,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15192,7 +15228,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10070,24 +11951,36 @@
+@@ -10067,24 +11952,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15237,7 +15273,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10101,8 +11994,10 @@
+@@ -10098,8 +11995,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15245,11 +15281,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10111,13 +12006,11 @@
+@@ -10108,13 +12007,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15266,7 +15302,7 @@
fi
fi
;;
-@@ -10130,7 +12023,7 @@
+@@ -10127,7 +12024,7 @@
ld_shlibs=no
;;
@@ -15275,7 +15311,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10140,13 +12033,13 @@
+@@ -10137,13 +12034,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15292,7 +15328,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.
-@@ -10156,52 +12049,52 @@
+@@ -10153,52 +12050,52 @@
;;
darwin* | rhapsody*)
@@ -15385,7 +15421,7 @@
fi
;;
-@@ -10235,8 +12128,8 @@
+@@ -10232,8 +12129,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15396,7 +15432,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10244,7 +12137,7 @@
+@@ -10241,7 +12138,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15405,7 +15441,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
-@@ -10258,47 +12151,62 @@
+@@ -10255,47 +12152,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15492,7 +15528,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10312,7 +12220,7 @@
+@@ -10309,7 +12221,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15501,7 +15537,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'
-@@ -10322,7 +12230,7 @@
+@@ -10319,7 +12231,7 @@
link_all_deplibs=yes
;;
@@ -15510,7 +15546,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10345,7 +12253,8 @@
+@@ -10342,7 +12254,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
@@ -15520,7 +15556,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10355,7 +12264,7 @@
+@@ -10352,7 +12265,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15529,7 +15565,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10366,14 +12275,14 @@
+@@ -10363,14 +12276,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15546,7 +15582,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'
-@@ -10385,13 +12294,13 @@
+@@ -10382,13 +12295,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15562,7 +15598,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10399,21 +12308,15 @@
+@@ -10396,21 +12309,15 @@
hardcode_libdir_separator=:
;;
@@ -15588,7 +15624,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'
-@@ -10422,8 +12325,18 @@
+@@ -10419,8 +12326,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15609,7 +15645,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10432,7 +12345,7 @@
+@@ -10429,7 +12346,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.
@@ -15618,7 +15654,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10480,36 +12393,45 @@
+@@ -10477,36 +12394,45 @@
fi
;;
@@ -15685,7 +15721,7 @@
;;
uts4*)
-@@ -10524,15 +12446,10 @@
+@@ -10521,15 +12447,10 @@
esac
fi
@@ -15703,7 +15739,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10550,8 +12467,8 @@
+@@ -10547,8 +12468,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -15714,7 +15750,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10565,6 +12482,7 @@
+@@ -10562,6 +12483,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15722,7 +15758,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10587,20 +12505,20 @@
+@@ -10584,20 +12506,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15748,7 +15784,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10610,7 +12528,20 @@
+@@ -10607,7 +12529,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15770,7 +15806,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10675,7 +12606,7 @@
+@@ -10672,7 +12607,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15779,7 +15815,7 @@
;;
beos*)
-@@ -10684,7 +12615,7 @@
+@@ -10681,7 +12616,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15788,7 +15824,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10700,7 +12631,7 @@
+@@ -10697,7 +12632,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15797,7 +15833,7 @@
need_version=no
need_lib_prefix=no
-@@ -10712,7 +12643,8 @@
+@@ -10709,7 +12644,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15807,7 +15843,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10742,7 +12674,7 @@
+@@ -10739,7 +12675,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15816,7 +15852,7 @@
;;
esac
;;
-@@ -10765,7 +12697,7 @@
+@@ -10762,7 +12698,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15825,7 +15861,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"`
-@@ -10788,20 +12720,17 @@
+@@ -10785,20 +12721,17 @@
dynamic_linker=no
;;
@@ -15857,7 +15893,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10819,14 +12748,19 @@
+@@ -10816,14 +12749,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15879,7 +15915,7 @@
esac
;;
-@@ -10846,9 +12780,9 @@
+@@ -10843,9 +12781,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15891,7 +15927,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10863,7 +12797,7 @@
+@@ -10860,7 +12798,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15900,7 +15936,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10874,7 +12808,7 @@
+@@ -10871,7 +12809,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15909,7 +15945,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10886,6 +12820,18 @@
+@@ -10883,6 +12821,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15928,7 +15964,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10929,29 +12875,26 @@
+@@ -10926,29 +12876,26 @@
;;
# This must be Linux ELF.
@@ -15965,7 +16001,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,
-@@ -10961,6 +12904,18 @@
+@@ -10958,6 +12905,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15984,7 +16020,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10970,7 +12925,7 @@
+@@ -10967,7 +12926,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15993,7 +16029,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10998,8 +12953,13 @@
+@@ -10995,8 +12954,13 @@
openbsd*)
version_type=sunos
@@ -16008,7 +16044,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
-@@ -11019,7 +12979,7 @@
+@@ -11016,7 +12980,7 @@
os2*)
libname_spec='$name'
@@ -16017,7 +16053,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11037,13 +12997,6 @@
+@@ -11034,13 +12998,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16031,7 +16067,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11069,7 +13022,7 @@
+@@ -11066,7 +13023,7 @@
need_version=yes
;;
@@ -16040,7 +16076,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11102,6 +13055,29 @@
+@@ -11099,6 +13056,29 @@
fi
;;
@@ -16070,7 +16106,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11113,16 +13089,21 @@
+@@ -11110,16 +13090,21 @@
dynamic_linker=no
;;
esac
@@ -16098,7 +16134,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11142,8 +13123,8 @@
+@@ -11139,8 +13124,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16109,7 +16145,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11156,29 +13137,29 @@
+@@ -11153,29 +13138,29 @@
striplib=
old_striplib=
@@ -16149,7 +16185,7 @@
;;
esac
fi
-@@ -11210,8 +13191,8 @@
+@@ -11207,8 +13192,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16160,7 +16196,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11224,40 +13205,52 @@
+@@ -11221,40 +13206,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16225,7 +16261,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11266,14 +13259,15 @@
+@@ -11263,14 +13260,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16234,7 +16270,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16245,7 +16281,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11287,8 +13281,8 @@
+@@ -11284,8 +13282,8 @@
;;
*)
@@ -16256,7 +16292,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11315,53 +13309,59 @@
+@@ -11312,53 +13310,59 @@
#undef shl_load
@@ -16335,7 +16371,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11370,18 +13370,19 @@
+@@ -11367,18 +13371,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16344,7 +16380,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16361,7 +16397,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11394,40 +13395,52 @@
+@@ -11391,40 +13396,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16426,7 +16462,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11436,19 +13449,20 @@
+@@ -11433,19 +13450,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16435,7 +16471,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16453,7 +16489,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11475,53 +13489,59 @@
+@@ -11472,53 +13490,59 @@
#undef dlopen
@@ -16532,7 +16568,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11530,18 +13550,19 @@
+@@ -11527,18 +13551,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16541,7 +16577,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16558,7 +16594,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11554,40 +13575,52 @@
+@@ -11551,40 +13576,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16623,7 +16659,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11596,19 +13629,20 @@
+@@ -11593,19 +13630,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16632,7 +16668,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16650,7 +16686,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11621,40 +13655,52 @@
+@@ -11618,40 +13656,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16715,7 +16751,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11663,19 +13709,20 @@
+@@ -11660,19 +13710,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16724,7 +16760,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16742,7 +16778,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11688,40 +13735,52 @@
+@@ -11685,40 +13736,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16807,7 +16843,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11730,14 +13789,15 @@
+@@ -11727,14 +13790,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16816,7 +16852,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16827,7 +16863,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11772,13 +13832,13 @@
+@@ -11769,13 +13833,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16844,16 +16880,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11788,7 +13848,7 @@
+@@ -11785,7 +13849,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11791 "configure"
-+#line 13851 "configure"
+-#line 11788 "configure"
++#line 13852 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11845,6 +13905,8 @@
+@@ -11842,6 +13906,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16862,7 +16898,7 @@
exit (status);
}
-@@ -11854,12 +13916,12 @@
+@@ -11851,12 +13917,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16877,7 +16913,7 @@
esac
else :
# compilation failed
-@@ -11870,13 +13932,13 @@
+@@ -11867,13 +13933,13 @@
fi
@@ -16896,16 +16932,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11886,7 +13948,7 @@
+@@ -11883,7 +13949,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11889 "configure"
-+#line 13951 "configure"
+-#line 11886 "configure"
++#line 13952 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11943,6 +14005,8 @@
+@@ -11940,6 +14006,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16914,7 +16950,7 @@
exit (status);
}
-@@ -11952,12 +14016,12 @@
+@@ -11949,12 +14017,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16929,7 +16965,7 @@
esac
else :
# compilation failed
-@@ -11968,8 +14032,8 @@
+@@ -11965,8 +14033,8 @@
fi
@@ -16940,7 +16976,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11990,19 +14054,19 @@
+@@ -11987,19 +14055,19 @@
fi
@@ -16968,7 +17004,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12011,58 +14075,21 @@
+@@ -12008,58 +14076,21 @@
fi
;;
@@ -17034,7 +17070,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12077,7 +14104,8 @@
+@@ -12074,7 +14105,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.
@@ -17044,7 +17080,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 \
-@@ -12191,11 +14219,11 @@
+@@ -12188,11 +14220,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17058,7 +17094,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12225,6 +14253,12 @@
+@@ -12222,6 +14254,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17071,7 +17107,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12236,6 +14270,9 @@
+@@ -12233,6 +14271,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17081,7 +17117,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12255,7 +14292,7 @@
+@@ -12252,7 +14293,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17090,7 +17126,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12286,7 +14323,7 @@
+@@ -12283,7 +14324,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17099,7 +17135,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12301,7 +14338,7 @@
+@@ -12298,7 +14339,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17108,7 +17144,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12528,7 +14565,10 @@
+@@ -12525,7 +14566,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.
@@ -17120,7 +17156,7 @@
fi
-@@ -12541,11 +14581,11 @@
+@@ -12538,11 +14582,11 @@
CC="$lt_save_CC"
@@ -17136,7 +17172,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12563,6 +14603,9 @@
+@@ -12560,6 +14604,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17146,7 +17182,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12593,8 +14636,10 @@
+@@ -12590,8 +14637,10 @@
case $tagname in
CXX)
@@ -17159,7 +17195,7 @@
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'
-@@ -12613,6 +14658,7 @@
+@@ -12610,6 +14659,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17167,7 +17203,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12630,7 +14676,7 @@
+@@ -12627,7 +14677,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17176,7 +17212,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12640,17 +14686,34 @@
+@@ -12637,17 +14687,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17212,7 +17248,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12661,18 +14724,27 @@
+@@ -12658,18 +14725,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17243,7 +17279,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12686,18 +14758,18 @@
+@@ -12683,18 +14759,18 @@
# Set up default GNU C++ configuration
@@ -17268,7 +17304,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12726,11 +14798,11 @@
+@@ -12723,11 +14799,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17284,7 +17320,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12743,7 +14815,7 @@
+@@ -12740,7 +14816,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,
@@ -17293,7 +17329,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'*)
-@@ -12763,21 +14835,21 @@
+@@ -12760,21 +14836,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17322,7 +17358,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12787,8 +14859,8 @@
+@@ -12784,8 +14860,8 @@
;;
esac
fi
@@ -17333,7 +17369,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12796,8 +14868,8 @@
+@@ -12793,8 +14869,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
@@ -17344,7 +17380,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12823,7 +14895,7 @@
+@@ -12820,7 +14896,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.
@@ -17353,7 +17389,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12838,8 +14910,8 @@
+@@ -12835,8 +14911,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17364,7 +17400,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12854,8 +14926,23 @@
+@@ -12851,8 +14927,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17390,7 +17426,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12872,7 +14959,7 @@
+@@ -12869,7 +14960,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17399,7 +17435,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`
-@@ -12891,8 +14978,12 @@
+@@ -12888,8 +14979,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17412,7 +17448,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12901,15 +14992,16 @@
+@@ -12898,15 +14993,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17433,7 +17469,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.
-@@ -12931,24 +15023,36 @@
+@@ -12928,24 +15024,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17478,7 +17514,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12962,20 +15066,21 @@
+@@ -12959,20 +15067,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17486,7 +17522,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17504,7 +17540,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12994,24 +15099,36 @@
+@@ -12991,24 +15100,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17549,7 +17585,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13025,8 +15142,10 @@
+@@ -13022,8 +15143,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17557,11 +17593,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13035,16 +15154,26 @@
+@@ -13032,16 +15155,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17593,7 +17629,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13058,12 +15187,12 @@
+@@ -13055,12 +15188,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -17608,7 +17644,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
-@@ -13072,70 +15201,81 @@
+@@ -13069,70 +15202,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17742,7 +17778,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13146,14 +15286,14 @@
+@@ -13143,14 +15287,14 @@
;;
esac
;;
@@ -17759,7 +17795,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13170,12 +15310,12 @@
+@@ -13167,12 +15311,12 @@
# location of the library.
case $cc_basename in
@@ -17775,7 +17811,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13184,11 +15324,11 @@
+@@ -13181,11 +15325,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.
@@ -17789,7 +17825,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13198,33 +15338,22 @@
+@@ -13195,33 +15339,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17830,7 +17866,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13235,17 +15364,20 @@
+@@ -13232,17 +15365,20 @@
esac
case $cc_basename in
@@ -17857,7 +17893,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13261,12 +15393,15 @@
+@@ -13258,12 +15394,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17877,7 +17913,7 @@
;;
esac
fi
-@@ -13277,11 +15412,25 @@
+@@ -13274,11 +15413,25 @@
;;
esac
;;
@@ -17905,7 +17941,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13292,9 +15441,9 @@
+@@ -13289,9 +15442,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17917,7 +17953,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13303,16 +15452,16 @@
+@@ -13300,16 +15453,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17938,7 +17974,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13330,20 +15479,44 @@
+@@ -13327,20 +15480,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17989,7 +18025,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13371,7 +15544,7 @@
+@@ -13368,7 +15545,7 @@
;;
mvs*)
case $cc_basename in
@@ -17998,7 +18034,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13381,7 +15554,7 @@
+@@ -13378,7 +15555,7 @@
;;
esac
;;
@@ -18007,7 +18043,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=
-@@ -13392,15 +15565,31 @@
+@@ -13389,15 +15566,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::"'
;;
@@ -18041,7 +18077,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13410,14 +15599,14 @@
+@@ -13407,14 +15600,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18059,7 +18095,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13435,7 +15624,7 @@
+@@ -13432,7 +15625,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18068,7 +18104,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13454,13 +15643,13 @@
+@@ -13451,13 +15644,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18084,7 +18120,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13469,17 +15658,17 @@
+@@ -13466,17 +15659,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18106,7 +18142,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13498,7 +15687,7 @@
+@@ -13495,7 +15688,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18115,7 +18151,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13519,27 +15708,14 @@
+@@ -13516,27 +15709,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18145,7 +18181,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13552,36 +15728,33 @@
+@@ -13549,36 +15729,33 @@
;;
solaris*)
case $cc_basename in
@@ -18194,7 +18230,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13589,9 +15762,9 @@
+@@ -13586,9 +15763,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18206,7 +18242,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13601,9 +15774,9 @@
+@@ -13598,9 +15775,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
@@ -18218,7 +18254,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13612,9 +15785,9 @@
+@@ -13609,9 +15786,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18230,7 +18266,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13627,12 +15800,63 @@
+@@ -13624,12 +15801,63 @@
;;
esac
;;
@@ -18296,7 +18332,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13652,8 +15876,8 @@
+@@ -13649,8 +15877,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18307,7 +18343,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13689,7 +15913,7 @@
+@@ -13686,7 +15914,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.
@@ -18316,7 +18352,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13729,7 +15953,7 @@
+@@ -13726,7 +15954,7 @@
fi
;;
@@ -18325,7 +18361,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13765,6 +15989,29 @@
+@@ -13762,6 +15990,29 @@
$rm -f confest.$objext
@@ -18355,7 +18391,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13773,8 +16020,8 @@
+@@ -13770,8 +16021,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18366,7 +18402,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13812,6 +16059,10 @@
+@@ -13809,6 +16060,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18377,7 +18413,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13820,7 +16071,7 @@
+@@ -13817,7 +16072,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18386,7 +18422,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13845,18 +16096,28 @@
+@@ -13842,18 +16097,28 @@
;;
chorus*)
case $cc_basename in
@@ -18418,7 +18454,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13864,22 +16125,22 @@
+@@ -13861,22 +16126,22 @@
;;
esac
;;
@@ -18447,7 +18483,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13892,9 +16153,13 @@
+@@ -13889,9 +16154,13 @@
;;
esac
;;
@@ -18462,7 +18498,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13903,20 +16168,26 @@
+@@ -13900,20 +16169,26 @@
;;
esac
;;
@@ -18493,7 +18529,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13933,25 +16204,25 @@
+@@ -13930,25 +16205,25 @@
;;
mvs*)
case $cc_basename in
@@ -18524,7 +18560,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13965,24 +16236,15 @@
+@@ -13962,24 +16237,15 @@
;;
psos*)
;;
@@ -18551,7 +18587,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13992,12 +16254,12 @@
+@@ -13989,12 +16255,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18566,7 +18602,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14007,7 +16269,7 @@
+@@ -14004,7 +16270,7 @@
;;
tandem*)
case $cc_basename in
@@ -18575,7 +18611,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14015,7 +16277,14 @@
+@@ -14012,7 +16278,14 @@
;;
esac
;;
@@ -18591,7 +18627,7 @@
;;
vxworks*)
;;
-@@ -14025,16 +16294,16 @@
+@@ -14022,16 +16295,16 @@
esac
fi
@@ -18612,7 +18648,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14048,26 +16317,28 @@
+@@ -14045,26 +16318,28 @@
# 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 \
@@ -18620,13 +18656,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:14054: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16323: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14051: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16324: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14058: \$? = $ac_status" >&5
-+ echo "$as_me:16327: \$? = $ac_status" >&5
+- echo "$as_me:14055: \$? = $ac_status" >&5
++ echo "$as_me:16328: \$? = $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
@@ -18648,7 +18684,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14080,7 +16351,7 @@
+@@ -14077,7 +16352,7 @@
fi
fi
@@ -18657,7 +18693,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14090,8 +16361,50 @@
+@@ -14087,8 +16362,50 @@
;;
esac
@@ -18710,7 +18746,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14102,60 +16415,58 @@
+@@ -14099,60 +16416,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18731,13 +18767,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:14121: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16427: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14118: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16428: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14125: \$? = $ac_status" >&5
-+ echo "$as_me:16431: \$? = $ac_status" >&5
+- echo "$as_me:14122: \$? = $ac_status" >&5
++ echo "$as_me:16432: \$? = $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
@@ -18789,7 +18825,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14165,8 +16476,8 @@
+@@ -14162,8 +16477,8 @@
need_locks=no
fi
@@ -18800,7 +18836,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14183,22 +16494,20 @@
+@@ -14180,22 +16495,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18829,7 +18865,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14216,8 +16525,8 @@
+@@ -14213,8 +16526,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18840,7 +18876,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14231,6 +16540,7 @@
+@@ -14228,6 +16541,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18848,7 +18884,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14253,20 +16563,20 @@
+@@ -14250,20 +16564,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18874,7 +18910,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14276,7 +16586,20 @@
+@@ -14273,7 +16587,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18896,7 +18932,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14341,7 +16664,7 @@
+@@ -14338,7 +16665,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18905,7 +18941,7 @@
;;
beos*)
-@@ -14350,7 +16673,7 @@
+@@ -14347,7 +16674,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18914,7 +18950,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14366,7 +16689,7 @@
+@@ -14363,7 +16690,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18923,7 +18959,7 @@
need_version=no
need_lib_prefix=no
-@@ -14378,7 +16701,8 @@
+@@ -14375,7 +16702,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18933,7 +18969,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14408,7 +16732,7 @@
+@@ -14405,7 +16733,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18942,7 +18978,7 @@
;;
esac
;;
-@@ -14431,7 +16755,7 @@
+@@ -14428,7 +16756,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18951,7 +18987,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"`
-@@ -14454,20 +16778,17 @@
+@@ -14451,20 +16779,17 @@
dynamic_linker=no
;;
@@ -18983,7 +19019,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14485,14 +16806,19 @@
+@@ -14482,14 +16807,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19005,7 +19041,7 @@
esac
;;
-@@ -14512,9 +16838,9 @@
+@@ -14509,9 +16839,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19017,7 +19053,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14529,7 +16855,7 @@
+@@ -14526,7 +16856,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19026,7 +19062,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14540,7 +16866,7 @@
+@@ -14537,7 +16867,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19035,7 +19071,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14552,6 +16878,18 @@
+@@ -14549,6 +16879,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19054,7 +19090,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14595,29 +16933,26 @@
+@@ -14592,29 +16934,26 @@
;;
# This must be Linux ELF.
@@ -19091,7 +19127,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,
-@@ -14627,16 +16962,28 @@
+@@ -14624,8 +16963,20 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19099,14 +19135,8 @@
- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
- need_lib_prefix=no
- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++ need_lib_prefix=no
++ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
@@ -19117,18 +19147,19 @@
+
+netbsd*)
+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+@@ -14633,7 +16984,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14664,8 +17011,13 @@
+@@ -14661,8 +17012,13 @@
openbsd*)
version_type=sunos
@@ -19143,7 +19174,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
-@@ -14685,7 +17037,7 @@
+@@ -14682,7 +17038,7 @@
os2*)
libname_spec='$name'
@@ -19152,7 +19183,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14703,13 +17055,6 @@
+@@ -14700,13 +17056,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19166,7 +19197,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14735,7 +17080,7 @@
+@@ -14732,7 +17081,7 @@
need_version=yes
;;
@@ -19175,7 +19206,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14768,6 +17113,29 @@
+@@ -14765,6 +17114,29 @@
fi
;;
@@ -19205,7 +19236,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14779,16 +17147,21 @@
+@@ -14776,16 +17148,21 @@
dynamic_linker=no
;;
esac
@@ -19233,7 +19264,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14808,8 +17181,8 @@
+@@ -14805,8 +17182,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19244,7 +19275,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14820,998 +17193,173 @@
+@@ -14817,998 +17194,173 @@
enable_fast_install=needless
fi
@@ -20019,7 +20050,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15457 "configure"
+-#line 15454 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20117,7 +20148,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15555 "configure"
+-#line 15552 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20382,7 +20413,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -15830,7 +17378,7 @@
+@@ -15827,7 +17379,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20391,7 +20422,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15845,7 +17393,7 @@
+@@ -15842,7 +17394,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -20400,7 +20431,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16047,7 +17595,10 @@
+@@ -16044,7 +17596,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.
@@ -20412,7 +20443,7 @@
fi
-@@ -16119,29 +17670,55 @@
+@@ -16116,29 +17671,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20452,19 +20483,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -20476,7 +20507,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16149,21 +17726,21 @@
+@@ -16146,21 +17727,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20508,7 +20539,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16172,8 +17749,8 @@
+@@ -16169,8 +17750,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20519,7 +20550,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16211,6 +17788,11 @@
+@@ -16208,6 +17789,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20531,7 +20562,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16227,7 +17809,7 @@
+@@ -16224,7 +17810,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20540,7 +20571,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16253,6 +17835,16 @@
+@@ -16250,6 +17836,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20557,7 +20588,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16264,7 +17856,7 @@
+@@ -16261,7 +17857,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.
@@ -20566,7 +20597,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16287,13 +17879,20 @@
+@@ -16284,14 +17880,21 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20579,6 +20610,7 @@
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
+- ccc*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
@@ -20586,10 +20618,11 @@
+ lt_prog_compiler_pic_F77='-fpic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
- ccc*)
++ ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16308,15 +17907,15 @@
+ lt_prog_compiler_static_F77='-non_shared'
+@@ -16305,15 +17908,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20611,7 +20644,7 @@
;;
sunos4*)
-@@ -16325,7 +17924,7 @@
+@@ -16322,7 +17925,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20620,7 +20653,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16338,6 +17937,17 @@
+@@ -16335,6 +17938,17 @@
fi
;;
@@ -20638,7 +20671,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16349,16 +17959,16 @@
+@@ -16346,16 +17960,16 @@
esac
fi
@@ -20659,7 +20692,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16372,26 +17982,28 @@
+@@ -16369,26 +17983,28 @@
# 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 \
@@ -20667,13 +20700,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:16378: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17988: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17989: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16382: \$? = $ac_status" >&5
-+ echo "$as_me:17992: \$? = $ac_status" >&5
+- echo "$as_me:16379: \$? = $ac_status" >&5
++ echo "$as_me:17993: \$? = $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
@@ -20695,7 +20728,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16404,7 +18016,7 @@
+@@ -16401,7 +18017,7 @@
fi
fi
@@ -20704,7 +20737,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16414,8 +18026,50 @@
+@@ -16411,8 +18027,50 @@
;;
esac
@@ -20757,7 +20790,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16426,60 +18080,58 @@
+@@ -16423,60 +18081,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20778,13 +20811,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:16445: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18092: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16442: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18093: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16449: \$? = $ac_status" >&5
-+ echo "$as_me:18096: \$? = $ac_status" >&5
+- echo "$as_me:16446: \$? = $ac_status" >&5
++ echo "$as_me:18097: \$? = $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
@@ -20836,7 +20869,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16489,8 +18141,8 @@
+@@ -16486,8 +18142,8 @@
need_locks=no
fi
@@ -20847,7 +20880,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16528,6 +18180,16 @@
+@@ -16525,6 +18181,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20864,7 +20897,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16538,6 +18200,10 @@
+@@ -16535,6 +18201,10 @@
with_gnu_ld=no
fi
;;
@@ -20875,7 +20908,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16548,6 +18214,27 @@
+@@ -16545,6 +18215,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20903,7 +20936,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16585,7 +18272,7 @@
+@@ -16582,7 +18273,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20912,7 +20945,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16595,13 +18282,13 @@
+@@ -16592,13 +18283,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'
@@ -20929,7 +20962,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
-@@ -16610,23 +18297,70 @@
+@@ -16607,23 +18298,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21006,7 +21039,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16640,13 +18374,40 @@
+@@ -16637,13 +18375,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21049,7 +21082,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16656,24 +18417,19 @@
+@@ -16653,24 +18418,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21081,7 +21114,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16685,7 +18441,7 @@
+@@ -16682,7 +18442,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21090,7 +21123,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16707,9 +18463,21 @@
+@@ -16704,9 +18464,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -21114,7 +21147,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16726,7 +18494,7 @@
+@@ -16723,7 +18495,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21123,7 +21156,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`
-@@ -16745,8 +18513,12 @@
+@@ -16742,8 +18514,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21136,7 +21169,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16754,45 +18526,58 @@
+@@ -16751,45 +18527,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21210,7 +21243,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16806,19 +18591,20 @@
+@@ -16803,19 +18592,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21218,7 +21251,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -21236,7 +21269,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16827,24 +18613,36 @@
+@@ -16824,24 +18614,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21281,7 +21314,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16858,8 +18656,10 @@
+@@ -16855,8 +18657,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21289,11 +21322,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16868,13 +18668,11 @@
+@@ -16865,13 +18669,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21310,7 +21343,7 @@
fi
fi
;;
-@@ -16887,7 +18685,7 @@
+@@ -16884,7 +18686,7 @@
ld_shlibs_F77=no
;;
@@ -21319,7 +21352,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16897,68 +18695,68 @@
+@@ -16894,68 +18696,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21432,7 +21465,7 @@
fi
;;
-@@ -16992,8 +18790,8 @@
+@@ -16989,8 +18791,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21443,7 +21476,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17001,7 +18799,7 @@
+@@ -16998,7 +18800,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21452,7 +21485,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
-@@ -17015,47 +18813,62 @@
+@@ -17012,47 +18814,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21539,7 +21572,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17069,7 +18882,7 @@
+@@ -17066,7 +18883,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21548,7 +21581,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'
-@@ -17079,7 +18892,7 @@
+@@ -17076,7 +18893,7 @@
link_all_deplibs_F77=yes
;;
@@ -21557,7 +21590,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
-@@ -17102,7 +18915,8 @@
+@@ -17099,7 +18916,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
@@ -21567,7 +21600,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17112,7 +18926,7 @@
+@@ -17109,7 +18927,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21576,7 +21609,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17123,14 +18937,14 @@
+@@ -17120,14 +18938,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21593,7 +21626,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'
-@@ -17142,13 +18956,13 @@
+@@ -17139,13 +18957,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21609,7 +21642,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17156,21 +18970,15 @@
+@@ -17153,21 +18971,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21635,7 +21668,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'
-@@ -17179,8 +18987,18 @@
+@@ -17176,8 +18988,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21656,7 +21689,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17189,7 +19007,7 @@
+@@ -17186,7 +19008,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.
@@ -21665,7 +21698,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17237,36 +19055,45 @@
+@@ -17234,36 +19056,45 @@
fi
;;
@@ -21732,7 +21765,7 @@
;;
uts4*)
-@@ -17281,15 +19108,10 @@
+@@ -17278,15 +19109,10 @@
esac
fi
@@ -21750,7 +21783,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17307,8 +19129,8 @@
+@@ -17304,8 +19130,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -21761,7 +21794,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17322,6 +19144,7 @@
+@@ -17319,6 +19145,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21769,7 +21802,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17344,20 +19167,20 @@
+@@ -17341,20 +19168,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21795,7 +21828,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17367,7 +19190,20 @@
+@@ -17364,7 +19191,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21817,7 +21850,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17432,7 +19268,7 @@
+@@ -17429,7 +19269,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21826,7 +21859,7 @@
;;
beos*)
-@@ -17441,7 +19277,7 @@
+@@ -17438,7 +19278,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21835,7 +21868,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17457,7 +19293,7 @@
+@@ -17454,7 +19294,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21844,7 +21877,7 @@
need_version=no
need_lib_prefix=no
-@@ -17469,7 +19305,8 @@
+@@ -17466,7 +19306,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21854,7 +21887,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17499,7 +19336,7 @@
+@@ -17496,7 +19337,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21863,7 +21896,7 @@
;;
esac
;;
-@@ -17522,7 +19359,7 @@
+@@ -17519,7 +19360,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21872,7 +21905,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"`
-@@ -17545,20 +19382,17 @@
+@@ -17542,20 +19383,17 @@
dynamic_linker=no
;;
@@ -21904,7 +21937,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17576,14 +19410,19 @@
+@@ -17573,14 +19411,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21926,7 +21959,7 @@
esac
;;
-@@ -17603,9 +19442,9 @@
+@@ -17600,9 +19443,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21938,7 +21971,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17620,7 +19459,7 @@
+@@ -17617,7 +19460,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21947,7 +21980,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17631,7 +19470,7 @@
+@@ -17628,7 +19471,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21956,7 +21989,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17643,6 +19482,18 @@
+@@ -17640,6 +19483,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21975,7 +22008,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17686,29 +19537,26 @@
+@@ -17683,29 +19538,26 @@
;;
# This must be Linux ELF.
@@ -22012,7 +22045,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,
-@@ -17718,6 +19566,18 @@
+@@ -17715,6 +19567,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22031,7 +22064,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17727,7 +19587,7 @@
+@@ -17724,7 +19588,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22040,7 +22073,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17755,8 +19615,13 @@
+@@ -17752,8 +19616,13 @@
openbsd*)
version_type=sunos
@@ -22055,7 +22088,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
-@@ -17776,7 +19641,7 @@
+@@ -17773,7 +19642,7 @@
os2*)
libname_spec='$name'
@@ -22064,7 +22097,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17794,13 +19659,6 @@
+@@ -17791,13 +19660,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22078,7 +22111,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17826,7 +19684,7 @@
+@@ -17823,7 +19685,7 @@
need_version=yes
;;
@@ -22087,7 +22120,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17859,6 +19717,29 @@
+@@ -17856,6 +19718,29 @@
fi
;;
@@ -22117,7 +22150,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17870,16 +19751,21 @@
+@@ -17867,16 +19752,21 @@
dynamic_linker=no
;;
esac
@@ -22145,7 +22178,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17899,8 +19785,8 @@
+@@ -17896,8 +19786,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22156,7 +22189,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17911,36 +19797,6 @@
+@@ -17908,36 +19798,6 @@
enable_fast_install=needless
fi
@@ -22193,7 +22226,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17955,7 +19811,8 @@
+@@ -17952,7 +19812,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.
@@ -22203,7 +22236,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 \
-@@ -18055,6 +19912,12 @@
+@@ -18052,6 +19913,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22216,7 +22249,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18066,6 +19929,9 @@
+@@ -18063,6 +19930,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22226,7 +22259,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18085,7 +19951,7 @@
+@@ -18082,7 +19952,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22235,7 +22268,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18116,7 +19982,7 @@
+@@ -18113,7 +19983,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22244,7 +22277,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18131,7 +19997,7 @@
+@@ -18128,7 +19998,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22253,7 +22286,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18333,7 +20199,10 @@
+@@ -18330,7 +20200,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.
@@ -22265,7 +22298,7 @@
fi
-@@ -18354,7 +20223,6 @@
+@@ -18351,7 +20224,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22273,7 +22306,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18366,26 +20234,55 @@
+@@ -18363,26 +20235,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22330,7 +22363,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
-@@ -18397,8 +20294,8 @@
+@@ -18394,8 +20295,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22341,7 +22374,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18412,26 +20309,28 @@
+@@ -18409,26 +20310,28 @@
# 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 \
@@ -22349,13 +22382,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:18418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20315: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20316: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18422: \$? = $ac_status" >&5
-+ echo "$as_me:20319: \$? = $ac_status" >&5
+- echo "$as_me:18419: \$? = $ac_status" >&5
++ echo "$as_me:20320: \$? = $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
@@ -22377,7 +22410,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18445,8 +20344,8 @@
+@@ -18442,8 +20345,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22388,7 +22421,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18484,6 +20383,11 @@
+@@ -18481,6 +20384,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22400,7 +22433,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18500,7 +20404,7 @@
+@@ -18497,7 +20405,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22409,7 +22442,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18526,6 +20430,16 @@
+@@ -18523,6 +20431,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22426,7 +22459,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18537,7 +20451,7 @@
+@@ -18534,7 +20452,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.
@@ -22435,7 +22468,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18560,13 +20474,20 @@
+@@ -18557,13 +20475,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22458,7 +22491,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18581,15 +20502,15 @@
+@@ -18578,15 +20503,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22480,7 +22513,7 @@
;;
sunos4*)
-@@ -18598,7 +20519,7 @@
+@@ -18595,7 +20520,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22489,7 +22522,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18611,6 +20532,17 @@
+@@ -18608,6 +20533,17 @@
fi
;;
@@ -22507,7 +22540,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18622,16 +20554,16 @@
+@@ -18619,16 +20555,16 @@
esac
fi
@@ -22528,7 +22561,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18645,26 +20577,28 @@
+@@ -18642,26 +20578,28 @@
# 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 \
@@ -22536,13 +22569,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:18651: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20583: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20584: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18655: \$? = $ac_status" >&5
-+ echo "$as_me:20587: \$? = $ac_status" >&5
+- echo "$as_me:18652: \$? = $ac_status" >&5
++ echo "$as_me:20588: \$? = $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
@@ -22564,7 +22597,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18677,7 +20611,7 @@
+@@ -18674,7 +20612,7 @@
fi
fi
@@ -22573,7 +22606,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18687,8 +20621,50 @@
+@@ -18684,8 +20622,50 @@
;;
esac
@@ -22626,7 +22659,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18699,60 +20675,58 @@
+@@ -18696,60 +20676,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22647,13 +22680,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:18718: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20687: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18715: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18722: \$? = $ac_status" >&5
-+ echo "$as_me:20691: \$? = $ac_status" >&5
+- echo "$as_me:18719: \$? = $ac_status" >&5
++ echo "$as_me:20692: \$? = $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
@@ -22705,7 +22738,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18762,8 +20736,8 @@
+@@ -18759,8 +20737,8 @@
need_locks=no
fi
@@ -22716,7 +22749,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18801,6 +20775,16 @@
+@@ -18798,6 +20776,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22733,7 +22766,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18811,6 +20795,10 @@
+@@ -18808,6 +20796,10 @@
with_gnu_ld=no
fi
;;
@@ -22744,7 +22777,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18821,6 +20809,27 @@
+@@ -18818,6 +20810,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22772,7 +22805,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18858,7 +20867,7 @@
+@@ -18855,7 +20868,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22781,7 +22814,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18868,13 +20877,13 @@
+@@ -18865,13 +20878,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'
@@ -22798,7 +22831,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
-@@ -18883,23 +20892,70 @@
+@@ -18880,23 +20893,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22875,7 +22908,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18913,13 +20969,40 @@
+@@ -18910,13 +20970,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22918,7 +22951,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18929,24 +21012,19 @@
+@@ -18926,24 +21013,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22950,7 +22983,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18958,7 +21036,7 @@
+@@ -18955,7 +21037,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22959,7 +22992,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18980,9 +21058,21 @@
+@@ -18977,9 +21059,21 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -22983,7 +23016,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18999,7 +21089,7 @@
+@@ -18996,7 +21090,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22992,7 +23025,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`
-@@ -19018,8 +21108,12 @@
+@@ -19015,8 +21109,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23005,7 +23038,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19027,22 +21121,23 @@
+@@ -19024,22 +21122,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23036,7 +23069,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19058,24 +21153,36 @@
+@@ -19055,24 +21154,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23081,7 +23114,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19089,19 +21196,20 @@
+@@ -19086,19 +21197,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23089,7 +23122,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23107,7 +23140,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19120,24 +21228,36 @@
+@@ -19117,24 +21229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23152,7 +23185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19151,8 +21271,10 @@
+@@ -19148,8 +21272,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23160,11 +23193,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19161,13 +21283,11 @@
+@@ -19158,13 +21284,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23181,7 +23214,7 @@
fi
fi
;;
-@@ -19180,7 +21300,7 @@
+@@ -19177,7 +21301,7 @@
ld_shlibs_GCJ=no
;;
@@ -23190,7 +23223,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19190,68 +21310,68 @@
+@@ -19187,68 +21311,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23303,7 +23336,7 @@
fi
;;
-@@ -19285,8 +21405,8 @@
+@@ -19282,8 +21406,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23314,7 +23347,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19294,7 +21414,7 @@
+@@ -19291,7 +21415,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23323,7 +23356,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
-@@ -19308,47 +21428,62 @@
+@@ -19305,47 +21429,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23392,25 +23425,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
+- hardcode_direct_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-- hardcode_direct_GCJ=no
-- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19362,7 +21497,7 @@
+@@ -19359,7 +21498,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23419,7 +23452,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'
-@@ -19372,7 +21507,7 @@
+@@ -19369,7 +21508,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23428,7 +23461,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
-@@ -19395,7 +21530,8 @@
+@@ -19392,7 +21531,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
@@ -23438,7 +23471,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19405,7 +21541,7 @@
+@@ -19402,7 +21542,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23447,7 +23480,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19416,14 +21552,14 @@
+@@ -19413,14 +21553,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23464,7 +23497,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'
-@@ -19435,13 +21571,13 @@
+@@ -19432,13 +21572,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23480,7 +23513,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19449,21 +21585,15 @@
+@@ -19446,21 +21586,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23506,7 +23539,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'
-@@ -19472,8 +21602,18 @@
+@@ -19469,8 +21603,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23527,7 +23560,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19482,7 +21622,7 @@
+@@ -19479,7 +21623,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.
@@ -23536,7 +23569,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19530,36 +21670,45 @@
+@@ -19527,36 +21671,45 @@
fi
;;
@@ -23603,7 +23636,7 @@
;;
uts4*)
-@@ -19574,15 +21723,10 @@
+@@ -19571,15 +21724,10 @@
esac
fi
@@ -23621,7 +23654,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19600,8 +21744,8 @@
+@@ -19597,8 +21745,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -23632,7 +23665,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19615,6 +21759,7 @@
+@@ -19612,6 +21760,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23640,7 +23673,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19637,20 +21782,20 @@
+@@ -19634,20 +21783,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23666,7 +23699,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19660,7 +21805,20 @@
+@@ -19657,7 +21806,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23688,7 +23721,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19725,7 +21883,7 @@
+@@ -19722,7 +21884,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23697,7 +23730,7 @@
;;
beos*)
-@@ -19734,7 +21892,7 @@
+@@ -19731,7 +21893,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23706,7 +23739,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19750,7 +21908,7 @@
+@@ -19747,7 +21909,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23715,7 +23748,7 @@
need_version=no
need_lib_prefix=no
-@@ -19762,7 +21920,8 @@
+@@ -19759,7 +21921,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23725,7 +23758,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19792,7 +21951,7 @@
+@@ -19789,7 +21952,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23734,7 +23767,7 @@
;;
esac
;;
-@@ -19815,7 +21974,7 @@
+@@ -19812,7 +21975,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23743,7 +23776,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"`
-@@ -19838,20 +21997,17 @@
+@@ -19835,20 +21998,17 @@
dynamic_linker=no
;;
@@ -23775,7 +23808,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19869,14 +22025,19 @@
+@@ -19866,14 +22026,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23797,7 +23830,7 @@
esac
;;
-@@ -19896,9 +22057,9 @@
+@@ -19893,9 +22058,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23809,7 +23842,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19913,7 +22074,7 @@
+@@ -19910,7 +22075,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -23818,7 +23851,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19924,7 +22085,7 @@
+@@ -19921,7 +22086,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -23827,37 +23860,61 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19936,6 +22097,18 @@
+@@ -19933,1107 +22098,319 @@
postinstall_cmds='chmod 555 $lib'
;;
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
+- esac
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+- case $host_os in
+- irix5* | nonstopux*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+- libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+- libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+- libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- hardcode_into_libs=yes
+- ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
+-linux*)
+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -19979,29 +22152,26 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- 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'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -23865,80 +23922,100 @@
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
- # 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,
-@@ -20011,6 +22181,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -20020,7 +22202,7 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- # 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,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
+-
+-netbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
-@@ -20048,8 +22230,13 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+-
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-nto-qnx*)
+- version_type=linux
+- need_lib_prefix=no
- need_version=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
- 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
-@@ -20069,7 +22256,7 @@
-
- os2*)
- libname_spec='$name'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-openbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- 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
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- case $host_os in
+- openbsd2.[89] | openbsd2.[89].*)
+- shlibpath_overrides_runpath=no
+- ;;
+- *)
+- shlibpath_overrides_runpath=yes
+- ;;
+- esac
+- else
+- shlibpath_overrides_runpath=yes
+- fi
+- ;;
+-
+-os2*)
+- libname_spec='$name'
- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -20087,13 +22274,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
@@ -23946,87 +24023,111 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -20119,7 +22299,7 @@
- need_version=yes
- ;;
-
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -20152,6 +22332,29 @@
- fi
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -20163,16 +22366,21 @@
- dynamic_linker=no
- ;;
- esac
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
+-test "$dynamic_linker" = no && can_build_shared=no
+-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+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" || \
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
-+ test -n "$runpath_var_GCJ" || \
-+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
-@@ -20192,851 +22400,16 @@
- # directories.
- hardcode_action_GCJ=unsupported
- fi
+-
+- # We can hardcode non-existant directories.
+- if test "$hardcode_direct_GCJ" != no &&
+- # If the only mechanism to avoid hardcoding is shlibpath_var, we
+- # have to relink, otherwise we might link with an installed library
+- # when we should be linking with a yet-to-be-installed one
+- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+- test "$hardcode_minus_L_GCJ" != no; then
+- # Linking always hardcodes the temporary library directory.
+- hardcode_action_GCJ=relink
+- else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- hardcode_action_GCJ=immediate
+- fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- hardcode_action_GCJ=unsupported
+-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
- if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
+-
+-if test "$hardcode_action_GCJ" = relink; then
+- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
@@ -24622,30 +24723,165 @@
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
--
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
-fi
--
--
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
++ esac
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
++ ;;
++ esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
++ ;;
+
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
-fi
--
--
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
-fi
--
--
++ # 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,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
++ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
+
-fi
--
--
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
-fi
--
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
- ;;
-- esac
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
+ esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-- else
++ 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
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
+ else
- enable_dlopen=no
-- fi
--
++ shlibpath_overrides_runpath=yes
+ fi
++ ;;
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -24668,7 +24904,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20841 "configure"
+-#line 20838 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -24676,7 +24912,15 @@
-#endif
-
-#include <stdio.h>
--
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -24686,7 +24930,17 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -24708,24 +24962,78 @@
-# endif
-# endif
-#endif
--
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
- exit (status);
-}
-EOF
@@ -24740,11 +25048,29 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
+ esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
-- fi
+ fi
-fi
-rm -fr conftest*
-
@@ -24766,7 +25092,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20939 "configure"
+-#line 20936 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -24810,20 +25136,35 @@
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++*)
++ dynamic_linker=no
++ ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+
- exit (status);
-}
-EOF
@@ -24843,11 +25184,37 @@
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
--fi
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
-rm -fr conftest*
--
--
--fi
+
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++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" || \
++ test -n "$runpath_var_GCJ" || \
++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+
++ # We can hardcode non-existant directories.
++ if test "$hardcode_direct_GCJ" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++ test "$hardcode_minus_L_GCJ" != no; then
++ # Linking always hardcodes the temporary library directory.
++ hardcode_action_GCJ=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ hardcode_action_GCJ=immediate
++ fi
++else
++ # We cannot hardcode anything, or else we can only hardcode existing
++ # directories.
++ hardcode_action_GCJ=unsupported
+ fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
@@ -24862,11 +25229,15 @@
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
--
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
++if test "$hardcode_action_GCJ" = relink; then
++ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
@@ -24875,7 +25246,7 @@
fi
-@@ -21053,7 +22426,8 @@
+@@ -21050,7 +22427,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.
@@ -24885,7 +25256,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 \
-@@ -21153,6 +22527,12 @@
+@@ -21150,6 +22528,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24898,7 +25269,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21164,6 +22544,9 @@
+@@ -21161,6 +22545,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24908,7 +25279,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21183,7 +22566,7 @@
+@@ -21180,7 +22567,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24917,7 +25288,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21214,7 +22597,7 @@
+@@ -21211,7 +22598,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24926,7 +25297,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21229,7 +22612,7 @@
+@@ -21226,7 +22613,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24935,7 +25306,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21431,7 +22814,10 @@
+@@ -21428,7 +22815,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.
@@ -24947,7 +25318,7 @@
fi
-@@ -21451,7 +22837,6 @@
+@@ -21448,7 +22838,6 @@
RC)
@@ -24955,7 +25326,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21470,15 +22855,42 @@
+@@ -21467,15 +22856,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -24998,7 +25369,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21494,7 +22906,8 @@
+@@ -21491,7 +22907,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.
@@ -25008,7 +25379,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 \
-@@ -21594,6 +23007,12 @@
+@@ -21591,6 +23008,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25021,7 +25392,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21605,6 +23024,9 @@
+@@ -21602,6 +23025,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25031,7 +25402,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21624,7 +23046,7 @@
+@@ -21621,7 +23047,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25040,7 +25411,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21655,7 +23077,7 @@
+@@ -21652,7 +23078,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25049,7 +25420,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21670,7 +23092,7 @@
+@@ -21667,7 +23093,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25058,7 +25429,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21872,7 +23294,10 @@
+@@ -21869,7 +23295,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.
@@ -25070,7 +25441,7 @@
fi
-@@ -21919,7 +23344,7 @@
+@@ -21916,7 +23345,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25079,7 +25450,7 @@
# Prevent multiple expansion
-@@ -21974,8 +23399,8 @@
+@@ -21971,8 +23400,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25090,7 +25461,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22001,17 +23426,17 @@
+@@ -21998,17 +23427,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -25114,7 +25485,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22026,32 +23451,33 @@
+@@ -22023,32 +23452,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25156,7 +25527,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22060,8 +23486,8 @@
+@@ -22057,8 +23487,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -25167,7 +25538,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22087,11 +23513,11 @@
+@@ -22084,11 +23514,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -25183,7 +25554,7 @@
fi
-@@ -22099,8 +23525,8 @@
+@@ -22096,8 +23526,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25194,7 +25565,7 @@
XGETTEXT=":"
fi
fi
-@@ -22110,8 +23536,7 @@
+@@ -22107,8 +23537,7 @@
@@ -25204,7 +25575,7 @@
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'
-@@ -22123,8 +23548,8 @@
+@@ -22120,8 +23549,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25215,7 +25586,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22152,24 +23577,36 @@
+@@ -22149,24 +23578,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25260,7 +25631,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22178,15 +23615,16 @@
+@@ -22175,15 +23616,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25281,7 +25652,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22215,15 +23653,14 @@
+@@ -22212,15 +23654,14 @@
@@ -25300,7 +25671,7 @@
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'
-@@ -22235,9 +23672,6 @@
+@@ -22232,9 +23673,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25310,7 +25681,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22263,24 +23697,36 @@
+@@ -22260,24 +23698,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25355,7 +25726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22289,9 +23735,10 @@
+@@ -22286,9 +23736,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25368,7 +25739,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22304,11 +23751,11 @@
+@@ -22301,11 +23752,11 @@
fi
@@ -25384,7 +25755,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22329,8 +23776,7 @@
+@@ -22326,8 +23777,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -25394,7 +25765,7 @@
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'
-@@ -22368,24 +23814,36 @@
+@@ -22365,24 +23815,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25439,7 +25810,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22395,10 +23853,11 @@
+@@ -22392,10 +23854,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25449,11 +25820,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22411,8 +23870,8 @@
+@@ -22408,8 +23871,8 @@
fi
@@ -25464,7 +25835,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22436,15 +23895,14 @@
+@@ -22433,15 +23896,14 @@
@@ -25483,7 +25854,7 @@
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'
-@@ -22456,9 +23914,6 @@
+@@ -22453,9 +23915,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25493,7 +25864,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22483,24 +23938,36 @@
+@@ -22480,24 +23939,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25538,7 +25909,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22509,9 +23976,10 @@
+@@ -22506,9 +23977,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25551,7 +25922,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22524,11 +23992,11 @@
+@@ -22521,11 +23993,11 @@
fi
@@ -25567,7 +25938,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22549,8 +24017,7 @@
+@@ -22546,8 +24018,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -25577,7 +25948,7 @@
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'
-@@ -22587,24 +24054,36 @@
+@@ -22584,24 +24055,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25622,7 +25993,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22614,10 +24093,11 @@
+@@ -22611,10 +24094,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25632,11 +26003,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22630,8 +24110,8 @@
+@@ -22627,8 +24111,8 @@
fi
@@ -25647,7 +26018,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22654,8 +24134,8 @@
+@@ -22651,8 +24135,8 @@
@@ -25658,7 +26029,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22672,30 +24152,42 @@
+@@ -22669,30 +24153,42 @@
int
main ()
{
@@ -25710,7 +26081,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22704,20 +24196,21 @@
+@@ -22701,20 +24197,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25719,7 +26090,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25738,7 +26109,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22734,30 +24227,42 @@
+@@ -22731,30 +24228,42 @@
int
main ()
{
@@ -25790,7 +26161,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22766,21 +24271,22 @@
+@@ -22763,21 +24272,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25799,7 +26170,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25819,7 +26190,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22793,40 +24299,52 @@
+@@ -22790,40 +24300,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25884,7 +26255,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22835,19 +24353,20 @@
+@@ -22832,19 +24354,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25893,7 +26264,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25911,7 +26282,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22860,40 +24379,52 @@
+@@ -22857,40 +24380,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25976,7 +26347,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22902,14 +24433,15 @@
+@@ -22899,14 +24434,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25985,7 +26356,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25996,7 +26367,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22935,13 +24467,13 @@
+@@ -22932,13 +24468,13 @@
fi
@@ -26013,7 +26384,7 @@
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'
-@@ -22970,24 +24502,36 @@
+@@ -22967,24 +24503,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26058,7 +26429,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22999,8 +24543,10 @@
+@@ -22996,8 +24544,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26070,7 +26441,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23010,17 +24556,17 @@
+@@ -23007,17 +24557,17 @@
fi
@@ -26093,7 +26464,7 @@
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'
-@@ -23049,24 +24595,36 @@
+@@ -23046,24 +24596,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26138,7 +26509,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23078,8 +24636,10 @@
+@@ -23075,8 +24637,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26150,7 +26521,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23090,8 +24650,8 @@
+@@ -23087,8 +24651,8 @@
fi
@@ -26161,7 +26532,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23104,8 +24664,8 @@
+@@ -23101,8 +24665,8 @@
_ACEOF
@@ -26172,7 +26543,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23118,40 +24678,52 @@
+@@ -23115,40 +24679,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26237,7 +26608,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23160,21 +24732,22 @@
+@@ -23157,21 +24733,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26246,7 +26617,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26266,7 +26637,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23187,40 +24760,52 @@
+@@ -23184,40 +24761,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26331,7 +26702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23229,21 +24814,22 @@
+@@ -23226,21 +24815,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26340,7 +26711,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26360,7 +26731,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23270,53 +24856,59 @@
+@@ -23267,53 +24857,59 @@
#undef inet_ntoa
@@ -26439,7 +26810,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23325,17 +24917,18 @@
+@@ -23322,17 +24918,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26448,7 +26819,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -26464,7 +26835,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23348,40 +24941,52 @@
+@@ -23345,40 +24942,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26529,7 +26900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23390,21 +24995,22 @@
+@@ -23387,21 +24996,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26538,7 +26909,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26558,7 +26929,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23431,53 +25037,59 @@
+@@ -23428,53 +25038,59 @@
#undef connect
@@ -26637,7 +27008,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23486,17 +25098,18 @@
+@@ -23483,17 +25099,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26646,7 +27017,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -26662,7 +27033,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23509,40 +25122,52 @@
+@@ -23506,40 +25123,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26727,7 +27098,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23551,22 +25176,23 @@
+@@ -23548,22 +25177,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26736,7 +27107,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26757,7 +27128,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23593,53 +25219,59 @@
+@@ -23590,53 +25220,59 @@
#undef remove
@@ -26836,7 +27207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23648,17 +25280,18 @@
+@@ -23645,17 +25281,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26845,7 +27216,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -26861,7 +27232,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23671,40 +25304,52 @@
+@@ -23668,40 +25305,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26926,7 +27297,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23713,14 +25358,15 @@
+@@ -23710,14 +25359,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26935,7 +27306,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26946,7 +27317,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23728,8 +25374,8 @@
+@@ -23725,8 +25375,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -26957,7 +27328,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23756,53 +25402,59 @@
+@@ -23753,53 +25403,59 @@
#undef shmat
@@ -27036,7 +27407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23811,18 +25463,19 @@
+@@ -23808,18 +25464,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27045,7 +27416,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -27062,7 +27433,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23835,40 +25488,52 @@
+@@ -23832,40 +25489,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27127,7 +27498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23877,14 +25542,15 @@
+@@ -23874,14 +25543,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27136,7 +27507,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27147,7 +27518,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23898,18 +25564,19 @@
+@@ -23895,18 +25565,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27175,7 +27546,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23920,24 +25587,36 @@
+@@ -23917,24 +25588,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27220,7 +27591,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23946,15 +25625,16 @@
+@@ -23943,15 +25626,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27243,7 +27614,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23963,8 +25643,13 @@
+@@ -23960,8 +25644,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27259,7 +27630,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23988,9 +25673,10 @@
+@@ -23985,9 +25674,10 @@
ac_header_preproc=no
fi
@@ -27272,7 +27643,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24014,25 +25700,19 @@
+@@ -24011,25 +25701,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -27305,7 +27676,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24050,18 +25730,19 @@
+@@ -24047,18 +25731,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27333,7 +27704,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24072,24 +25753,36 @@
+@@ -24069,24 +25754,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27378,7 +27749,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24098,15 +25791,16 @@
+@@ -24095,15 +25792,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27401,7 +27772,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24115,8 +25809,13 @@
+@@ -24112,8 +25810,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27417,7 +27788,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24140,9 +25839,10 @@
+@@ -24137,9 +25840,10 @@
ac_header_preproc=no
fi
@@ -27430,7 +27801,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24166,25 +25866,19 @@
+@@ -24163,25 +25867,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -27463,7 +27834,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24198,8 +25892,8 @@
+@@ -24195,8 +25893,8 @@
# darwin requires a poll emulation library
@@ -27474,7 +27845,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24212,40 +25906,52 @@
+@@ -24209,40 +25907,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27539,7 +27910,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24254,14 +25960,15 @@
+@@ -24251,14 +25961,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27548,7 +27919,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27559,7 +27930,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24272,18 +25979,19 @@
+@@ -24269,18 +25980,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27587,7 +27958,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24294,24 +26002,36 @@
+@@ -24291,24 +26003,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27632,7 +28003,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24320,15 +26040,16 @@
+@@ -24317,15 +26041,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27655,7 +28026,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24337,8 +26058,13 @@
+@@ -24334,8 +26059,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27671,7 +28042,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24362,9 +26088,10 @@
+@@ -24359,9 +26089,10 @@
ac_header_preproc=no
fi
@@ -27684,7 +28055,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24388,25 +26115,19 @@
+@@ -24385,25 +26116,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -27717,7 +28088,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24421,17 +26142,17 @@
+@@ -24418,17 +26143,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27741,7 +28112,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24442,24 +26163,36 @@
+@@ -24439,24 +26164,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -27786,7 +28157,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24468,15 +26201,16 @@
+@@ -24465,15 +26202,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27809,7 +28180,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24485,8 +26219,13 @@
+@@ -24482,8 +26220,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -27825,7 +28196,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24510,9 +26249,10 @@
+@@ -24507,9 +26250,10 @@
ac_header_preproc=no
fi
@@ -27838,7 +28209,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24536,25 +26276,18 @@
+@@ -24533,25 +26277,18 @@
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -27869,7 +28240,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24571,8 +26304,8 @@
+@@ -24568,8 +26305,8 @@
@@ -27880,7 +28251,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24598,31 +26331,43 @@
+@@ -24595,31 +26332,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27934,7 +28305,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24633,25 +26378,25 @@
+@@ -24630,25 +26379,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27946,7 +28317,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -27967,7 +28338,7 @@
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'
-@@ -24663,9 +26408,6 @@
+@@ -24660,9 +26409,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27977,7 +28348,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24691,24 +26433,36 @@
+@@ -24688,24 +26434,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28022,7 +28393,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24717,9 +26471,10 @@
+@@ -24714,9 +26472,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28035,7 +28406,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24732,11 +26487,11 @@
+@@ -24729,11 +26488,11 @@
fi
@@ -28051,7 +28422,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24757,8 +26512,7 @@
+@@ -24754,8 +26513,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -28061,7 +28432,7 @@
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'
-@@ -24796,24 +26550,36 @@
+@@ -24793,24 +26551,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28106,7 +28477,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24823,10 +26589,11 @@
+@@ -24820,10 +26590,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28116,11 +28487,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24839,8 +26606,8 @@
+@@ -24836,8 +26607,8 @@
fi
@@ -28131,7 +28502,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24867,8 +26634,8 @@
+@@ -24864,8 +26635,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -28142,7 +28513,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24881,40 +26648,52 @@
+@@ -24878,40 +26649,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28207,7 +28578,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24923,27 +26702,28 @@
+@@ -24920,27 +26703,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28216,7 +28587,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28246,7 +28617,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24956,40 +26736,52 @@
+@@ -24953,40 +26737,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28311,7 +28682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24998,22 +26790,23 @@
+@@ -24995,22 +26791,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28320,7 +28691,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28341,7 +28712,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25024,36 +26817,49 @@
+@@ -25021,36 +26818,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28401,7 +28772,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25062,20 +26868,21 @@
+@@ -25059,23 +26869,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28419,22 +28790,29 @@
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_int" = yes; then
+- if test "$ac_cv_type_int" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25088,10 +26895,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25085,10 +26895,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28443,7 +28821,7 @@
test_array [0] = 0
;
-@@ -25099,24 +26907,36 @@
+@@ -25096,24 +26908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28488,11 +28866,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25129,10 +26949,11 @@
+@@ -25126,10 +26950,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28501,7 +28880,7 @@
test_array [0] = 0
;
-@@ -25140,24 +26961,36 @@
+@@ -25137,24 +26963,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28546,7 +28925,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25166,30 +26999,32 @@
+@@ -25163,30 +27001,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28579,7 +28958,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28588,7 +28968,7 @@
test_array [0] = 0
;
-@@ -25197,24 +27032,36 @@
+@@ -25194,24 +27035,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28633,11 +29013,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25227,10 +27074,11 @@
+@@ -25224,10 +27077,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28646,7 +29027,7 @@
test_array [0] = 0
;
-@@ -25238,24 +27086,36 @@
+@@ -25235,24 +27090,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28691,7 +29072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25264,24 +27124,27 @@
+@@ -25261,24 +27128,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28729,11 +29110,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25292,10 +27155,11 @@
+@@ -25289,10 +27159,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28742,7 +29124,7 @@
test_array [0] = 0
;
-@@ -25303,24 +27167,36 @@
+@@ -25300,24 +27172,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28787,7 +29169,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25329,26 +27205,20 @@
+@@ -25326,26 +27210,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28801,13 +29183,17 @@
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -28820,19 +29206,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25356,8 +27226,9 @@
+@@ -25353,8 +27235,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25366,35 +27237,44 @@
+@@ -25363,35 +27247,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28890,12 +29277,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25405,28 +27285,27 @@
+@@ -25402,28 +27295,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
@@ -28904,18 +29292,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_int=0
+-else
+- ac_cv_sizeof_int=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
@@ -28927,7 +29321,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25437,36 +27316,49 @@
+@@ -25434,36 +27330,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28987,7 +29381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25475,20 +27367,21 @@
+@@ -25472,23 +27381,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29005,22 +29399,29 @@
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_short" = yes; then
+- if test "$ac_cv_type_short" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25501,10 +27394,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25498,10 +27407,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29029,7 +29430,7 @@
test_array [0] = 0
;
-@@ -25512,24 +27406,36 @@
+@@ -25509,24 +27420,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29074,11 +29475,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25542,10 +27448,11 @@
+@@ -25539,10 +27462,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29087,7 +29489,7 @@
test_array [0] = 0
;
-@@ -25553,24 +27460,36 @@
+@@ -25550,24 +27475,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29132,7 +29534,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25579,30 +27498,32 @@
+@@ -25576,30 +27513,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29165,7 +29567,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29174,7 +29577,7 @@
test_array [0] = 0
;
-@@ -25610,24 +27531,36 @@
+@@ -25607,24 +27547,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29219,11 +29622,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25640,10 +27573,11 @@
+@@ -25637,10 +27589,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29232,7 +29636,7 @@
test_array [0] = 0
;
-@@ -25651,24 +27585,36 @@
+@@ -25648,24 +27602,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29277,7 +29681,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25677,24 +27623,27 @@
+@@ -25674,24 +27640,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29315,11 +29719,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25705,10 +27654,11 @@
+@@ -25702,10 +27671,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29328,7 +29733,7 @@
test_array [0] = 0
;
-@@ -25716,24 +27666,36 @@
+@@ -25713,24 +27684,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29373,7 +29778,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25742,26 +27704,20 @@
+@@ -25739,26 +27722,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29387,13 +29792,17 @@
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -29406,19 +29815,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25769,8 +27725,9 @@
+@@ -25766,8 +27747,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25779,35 +27736,44 @@
+@@ -25776,35 +27759,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29476,12 +29886,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25818,28 +27784,27 @@
+@@ -25815,28 +27807,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
@@ -29490,18 +29901,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_short=0
+-else
+- ac_cv_sizeof_short=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
@@ -29513,7 +29930,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25850,36 +27815,49 @@
+@@ -25847,36 +27842,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29573,7 +29990,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25888,20 +27866,21 @@
+@@ -25885,23 +27893,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29591,22 +30008,29 @@
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
+- if test "$ac_cv_type_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25914,10 +27893,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25911,10 +27919,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29615,7 +30039,7 @@
test_array [0] = 0
;
-@@ -25925,24 +27905,36 @@
+@@ -25922,24 +27932,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29660,11 +30084,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25955,10 +27947,11 @@
+@@ -25952,10 +27974,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29673,7 +30098,7 @@
test_array [0] = 0
;
-@@ -25966,24 +27959,36 @@
+@@ -25963,24 +27987,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29718,7 +30143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25992,30 +27997,32 @@
+@@ -25989,30 +28025,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29751,7 +30176,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29760,7 +30186,7 @@
test_array [0] = 0
;
-@@ -26023,24 +28030,36 @@
+@@ -26020,24 +28059,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29805,11 +30231,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26053,10 +28072,11 @@
+@@ -26050,10 +28101,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29818,7 +30245,7 @@
test_array [0] = 0
;
-@@ -26064,24 +28084,36 @@
+@@ -26061,24 +28114,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29863,7 +30290,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26090,24 +28122,27 @@
+@@ -26087,24 +28152,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29901,11 +30328,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26118,10 +28153,11 @@
+@@ -26115,10 +28183,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29914,7 +30342,7 @@
test_array [0] = 0
;
-@@ -26129,24 +28165,36 @@
+@@ -26126,24 +28196,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29959,7 +30387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26155,26 +28203,20 @@
+@@ -26152,26 +28234,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29973,13 +30401,17 @@
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -29992,19 +30424,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26182,8 +28224,9 @@
+@@ -26179,8 +28259,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26192,35 +28235,44 @@
+@@ -26189,35 +28271,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30062,12 +30495,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26231,28 +28283,27 @@
+@@ -26228,28 +28319,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -30076,18 +30510,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_long=0
+-else
+- ac_cv_sizeof_long=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
@@ -30099,7 +30539,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26263,36 +28314,49 @@
+@@ -26260,36 +28354,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30159,7 +30599,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26301,20 +28365,21 @@
+@@ -26298,23 +28405,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30177,22 +30617,29 @@
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char_p" = yes; then
+- if test "$ac_cv_type_char_p" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -26327,10 +28392,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26324,10 +28431,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30201,7 +30648,7 @@
test_array [0] = 0
;
-@@ -26338,24 +28404,36 @@
+@@ -26335,24 +28444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30246,11 +30693,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26368,10 +28446,11 @@
+@@ -26365,10 +28486,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30259,7 +30707,7 @@
test_array [0] = 0
;
-@@ -26379,24 +28458,36 @@
+@@ -26376,24 +28499,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30304,7 +30752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26405,30 +28496,32 @@
+@@ -26402,30 +28537,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30337,7 +30785,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30346,7 +30795,7 @@
test_array [0] = 0
;
-@@ -26436,24 +28529,36 @@
+@@ -26433,24 +28571,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30391,11 +30840,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26466,10 +28571,11 @@
+@@ -26463,10 +28613,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30404,7 +30854,7 @@
test_array [0] = 0
;
-@@ -26477,24 +28583,36 @@
+@@ -26474,24 +28626,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30449,7 +30899,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26503,24 +28621,27 @@
+@@ -26500,24 +28664,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30487,11 +30937,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26531,10 +28652,11 @@
+@@ -26528,10 +28695,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30500,7 +30951,7 @@
test_array [0] = 0
;
-@@ -26542,24 +28664,36 @@
+@@ -26539,24 +28708,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30545,7 +30996,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26568,26 +28702,20 @@
+@@ -26565,25 +28746,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30557,40 +31008,46 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
- ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
- See \`config.log' for more details." >&5
+-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
-+echo "$as_me: error: cannot compute sizeof (char *)
- See \`config.log' for more details." >&2;}
+-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
- esac
- else
+-esac
+-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
++?*) ac_cv_sizeof_char_p=$ac_lo;;
++'') if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--else
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi ;;
++esac
+ else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
-@@ -26595,8 +28723,9 @@
+@@ -26592,8 +28771,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (char *)); }
-unsigned long ulongval () { return (long) (sizeof (char *)); }
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26605,35 +28734,44 @@
+@@ -26602,35 +28783,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30648,12 +31105,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26644,30 +28782,29 @@
+@@ -26641,30 +28831,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
@@ -30662,18 +31120,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_char_p=0
+-else
+- ac_cv_sizeof_char_p=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
_ACEOF
@@ -30687,7 +31151,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26680,40 +28817,52 @@
+@@ -26677,40 +28870,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30752,7 +31216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26722,14 +28871,15 @@
+@@ -26719,14 +28924,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30761,7 +31225,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30772,7 +31236,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26738,8 +28888,8 @@
+@@ -26735,8 +28941,8 @@
fi
@@ -30783,7 +31247,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26752,40 +28902,52 @@
+@@ -26749,40 +28955,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30848,7 +31312,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26794,14 +28956,15 @@
+@@ -26791,14 +29009,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30857,7 +31321,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30868,7 +31332,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26815,8 +28978,8 @@
+@@ -26812,8 +29031,8 @@
@@ -30879,7 +31343,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26827,36 +28990,49 @@
+@@ -26824,36 +29043,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30939,7 +31403,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26865,20 +29041,21 @@
+@@ -26862,23 +29094,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30957,22 +31421,29 @@
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_size_t" = yes; then
+- if test "$ac_cv_type_size_t" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -26891,10 +29068,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26888,10 +29120,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30981,7 +31452,7 @@
test_array [0] = 0
;
-@@ -26902,24 +29080,36 @@
+@@ -26899,24 +29133,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31026,11 +31497,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26932,10 +29122,11 @@
+@@ -26929,10 +29175,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -31039,7 +31511,7 @@
test_array [0] = 0
;
-@@ -26943,24 +29134,36 @@
+@@ -26940,24 +29188,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31084,7 +31556,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26969,30 +29172,32 @@
+@@ -26966,30 +29226,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31117,7 +31589,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -31126,7 +31599,7 @@
test_array [0] = 0
;
-@@ -27000,24 +29205,36 @@
+@@ -26997,24 +29260,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31171,11 +31644,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27030,10 +29247,11 @@
+@@ -27027,10 +29302,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -31184,7 +31658,7 @@
test_array [0] = 0
;
-@@ -27041,24 +29259,36 @@
+@@ -27038,24 +29315,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31229,7 +31703,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27067,24 +29297,27 @@
+@@ -27064,24 +29353,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31267,11 +31741,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27095,10 +29328,11 @@
+@@ -27092,10 +29384,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -31280,7 +31755,7 @@
test_array [0] = 0
;
-@@ -27106,24 +29340,36 @@
+@@ -27103,24 +29397,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31325,7 +31800,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27132,26 +29378,20 @@
+@@ -27129,26 +29435,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31339,13 +31814,17 @@
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31358,19 +31837,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27159,8 +29399,9 @@
+@@ -27156,8 +29460,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27169,35 +29410,44 @@
+@@ -27166,35 +29472,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31428,12 +31908,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27208,29 +29458,28 @@
+@@ -27205,29 +29520,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
@@ -31442,18 +31923,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_size_t=0
+-else
+- ac_cv_sizeof_size_t=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
_ACEOF
@@ -31466,7 +31953,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27241,36 +29490,49 @@
+@@ -27238,36 +29556,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31526,7 +32013,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27279,20 +29541,21 @@
+@@ -27276,23 +29607,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31544,22 +32031,29 @@
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_unsigned_long" = yes; then
+- if test "$ac_cv_type_unsigned_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -27305,10 +29568,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27302,10 +29633,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31568,7 +32062,7 @@
test_array [0] = 0
;
-@@ -27316,24 +29580,36 @@
+@@ -27313,24 +29646,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31613,11 +32107,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27346,10 +29622,11 @@
+@@ -27343,10 +29688,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31626,7 +32121,7 @@
test_array [0] = 0
;
-@@ -27357,24 +29634,36 @@
+@@ -27354,24 +29701,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31671,7 +32166,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27383,30 +29672,32 @@
+@@ -27380,30 +29739,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31704,7 +32199,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31713,7 +32209,7 @@
test_array [0] = 0
;
-@@ -27414,24 +29705,36 @@
+@@ -27411,24 +29773,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31758,11 +32254,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27444,10 +29747,11 @@
+@@ -27441,10 +29815,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31771,7 +32268,7 @@
test_array [0] = 0
;
-@@ -27455,24 +29759,36 @@
+@@ -27452,24 +29828,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31816,7 +32313,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27481,24 +29797,27 @@
+@@ -27478,24 +29866,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31854,11 +32351,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27509,10 +29828,11 @@
+@@ -27506,10 +29897,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31867,7 +32365,7 @@
test_array [0] = 0
;
-@@ -27520,24 +29840,36 @@
+@@ -27517,24 +29910,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31912,7 +32410,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27546,26 +29878,20 @@
+@@ -27543,26 +29948,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31926,13 +32424,17 @@
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31945,19 +32447,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27573,8 +29899,9 @@
+@@ -27570,8 +29973,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27583,35 +29910,44 @@
+@@ -27580,35 +29985,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32015,12 +32518,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27622,30 +29958,29 @@
+@@ -27619,30 +30033,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -32029,18 +32533,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_unsigned_long=0
+-else
+- ac_cv_sizeof_unsigned_long=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
_ACEOF
@@ -32054,7 +32564,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27666,36 +30001,48 @@
+@@ -27663,36 +30080,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32115,17 +32625,17 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27707,18 +30054,18 @@
+@@ -27704,18 +30133,18 @@
{ (exit 1); exit 1; }; }
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- echo "$as_me:$LINENO: checking for PIE support" >&5
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking for PIE support" >&5
+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
if test "${kde_cv_val_pie_support+set}" = set; then
@@ -32139,7 +32649,7 @@
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'
-@@ -27748,24 +30095,36 @@
+@@ -27745,24 +30174,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32184,7 +32694,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27774,9 +30133,10 @@
+@@ -27771,9 +30212,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32193,11 +32703,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27789,26 +30149,26 @@
+@@ -27786,26 +30228,26 @@
fi
@@ -32234,7 +32744,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27827,18 +30187,19 @@
+@@ -27824,18 +30266,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32262,7 +32772,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27849,24 +30210,36 @@
+@@ -27846,24 +30289,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32307,7 +32817,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27875,15 +30248,16 @@
+@@ -27872,15 +30327,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32330,7 +32840,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27892,8 +30266,13 @@
+@@ -27889,8 +30345,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -32346,7 +32856,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27917,9 +30296,10 @@
+@@ -27914,9 +30375,10 @@
ac_header_preproc=no
fi
@@ -32359,7 +32869,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27943,25 +30323,19 @@
+@@ -27940,25 +30402,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -32392,7 +32902,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27973,8 +30347,8 @@
+@@ -27970,8 +30426,8 @@
done
@@ -32403,7 +32913,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28001,53 +30375,59 @@
+@@ -27998,53 +30454,59 @@
#undef _NSGetEnviron
@@ -32482,7 +32992,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28056,13 +30436,14 @@
+@@ -28053,13 +30515,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32491,7 +33001,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -32501,7 +33011,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28083,9 +30464,9 @@
+@@ -28080,9 +30543,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32514,7 +33024,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28111,53 +30492,59 @@
+@@ -28108,53 +30571,59 @@
#undef $ac_func
@@ -32593,7 +33103,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28166,13 +30553,15 @@
+@@ -28163,13 +30632,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32602,7 +33112,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32613,7 +33123,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28189,32 +30578,32 @@
+@@ -28186,32 +30657,32 @@
@@ -32658,7 +33168,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28230,8 +30619,8 @@
+@@ -28227,8 +30698,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -32669,7 +33179,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28268,8 +30657,13 @@
+@@ -28265,8 +30736,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -32685,7 +33195,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28336,6 +30730,7 @@
+@@ -28333,6 +30809,7 @@
fi
done
fi
@@ -32693,7 +33203,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28365,24 +30760,36 @@
+@@ -28362,24 +30839,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32738,7 +33248,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28393,7 +30800,7 @@
+@@ -28390,7 +30879,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32747,17 +33257,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28441,7 +30848,8 @@
+@@ -28438,7 +30927,8 @@
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28451,21 +30859,26 @@
+@@ -28448,21 +30938,26 @@
*-*-solaris*)
;;
*)
@@ -32792,7 +33302,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28473,7 +30886,7 @@
+@@ -28470,7 +30965,7 @@
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
@@ -32801,7 +33311,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28482,7 +30895,7 @@
+@@ -28479,7 +30974,7 @@
esac
fi
cd ..
@@ -32810,7 +33320,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28526,12 +30939,12 @@
+@@ -28523,12 +31018,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -32827,7 +33337,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28559,8 +30972,8 @@
+@@ -28556,8 +31051,8 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -32838,7 +33348,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28573,40 +30986,52 @@
+@@ -28570,40 +31065,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32903,7 +33413,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28615,14 +31040,15 @@
+@@ -28612,14 +31119,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32912,7 +33422,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32923,7 +33433,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28631,8 +31057,8 @@
+@@ -28628,8 +31136,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -32934,7 +33444,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28666,24 +31092,36 @@
+@@ -28663,24 +31171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32979,7 +33489,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28692,10 +31130,11 @@
+@@ -28689,10 +31209,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32989,11 +33499,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28704,8 +31143,8 @@
+@@ -28701,8 +31222,8 @@
fi
@@ -33004,7 +33514,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28851,8 +31290,8 @@
+@@ -28848,8 +31369,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33015,7 +33525,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28863,9 +31302,9 @@
+@@ -28860,9 +31381,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33028,7 +33538,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28877,40 +31316,52 @@
+@@ -28874,40 +31395,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33093,7 +33603,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28919,14 +31370,16 @@
+@@ -28916,14 +31449,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33102,7 +33612,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33114,7 +33624,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28939,8 +31392,8 @@
+@@ -28936,8 +31471,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -33125,7 +33635,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28953,40 +31406,52 @@
+@@ -28950,40 +31485,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33190,7 +33700,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28995,14 +31460,15 @@
+@@ -28992,14 +31539,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33199,7 +33709,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33210,7 +33720,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29010,8 +31476,8 @@
+@@ -29007,8 +31555,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -33221,7 +33731,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29030,40 +31496,53 @@
+@@ -29027,40 +31575,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33284,11 +33794,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29078,16 +31557,15 @@
+@@ -29075,16 +31636,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33309,7 +33819,7 @@
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'
-@@ -29114,24 +31592,36 @@
+@@ -29111,24 +31671,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33354,7 +33864,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29140,8 +31630,10 @@
+@@ -29137,8 +31709,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33362,11 +33872,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29154,13 +31646,13 @@
+@@ -29151,13 +31725,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33384,7 +33894,7 @@
:
fi
-@@ -29172,16 +31664,15 @@
+@@ -29169,16 +31743,15 @@
case $host_os in
solaris*)
@@ -33405,7 +33915,7 @@
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'
-@@ -29208,24 +31699,36 @@
+@@ -29205,24 +31778,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33450,7 +33960,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29234,8 +31737,10 @@
+@@ -29231,8 +31816,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33458,11 +33968,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29248,13 +31753,13 @@
+@@ -29245,13 +31832,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33480,7 +33990,7 @@
:
fi
-@@ -29281,17 +31786,17 @@
+@@ -29278,17 +31865,17 @@
@@ -33504,7 +34014,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29309,21 +31814,21 @@
+@@ -29306,21 +31893,21 @@
fi
@@ -33534,7 +34044,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29342,14 +31847,14 @@
+@@ -29339,14 +31926,14 @@
@@ -33553,7 +34063,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29383,24 +31888,36 @@
+@@ -29380,24 +31967,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33598,7 +34108,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29409,9 +31926,10 @@
+@@ -29406,9 +32005,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33607,11 +34117,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29424,8 +31942,8 @@
+@@ -29421,8 +32021,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -33622,7 +34132,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29445,8 +31963,8 @@
+@@ -29442,8 +32042,8 @@
@@ -33633,7 +34143,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29482,24 +32000,36 @@
+@@ -29479,24 +32079,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33678,7 +34188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29508,10 +32038,11 @@
+@@ -29505,10 +32117,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33688,11 +34198,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29525,19 +32056,19 @@
+@@ -29522,19 +32135,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -33718,7 +34228,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29570,24 +32101,36 @@
+@@ -29567,24 +32180,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33763,7 +34273,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29596,9 +32139,10 @@
+@@ -29593,9 +32218,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33772,11 +34282,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29608,14 +32152,14 @@
+@@ -29605,14 +32231,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33797,7 +34307,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29648,24 +32192,36 @@
+@@ -29645,24 +32271,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33842,7 +34352,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29674,9 +32230,10 @@
+@@ -29671,9 +32309,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33851,11 +34361,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29686,11 +32243,11 @@
+@@ -29683,11 +32322,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -33871,16 +34381,16 @@
LIBJPEG=
-@@ -29710,7 +32267,7 @@
+@@ -29707,7 +32346,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29713: $i/$j" >&5
-+ echo "configure: 32270: $i/$j" >&5
+- echo "configure: 29710: $i/$j" >&5
++ echo "configure: 32349: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29757,14 +32314,14 @@
+@@ -29754,14 +32393,14 @@
@@ -33898,7 +34408,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29807,8 +32364,8 @@
+@@ -29804,8 +32443,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33909,7 +34419,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29817,8 +32374,8 @@
+@@ -29814,8 +32453,8 @@
{ (exit 1); exit 1; }; }
else
@@ -33920,7 +34430,7 @@
PERL=$kde_cv_path
fi
-@@ -29832,10 +32389,9 @@
+@@ -29829,10 +32468,9 @@
@@ -33933,7 +34443,7 @@
else
if test $kde_qtver = 3; then
-@@ -29845,7 +32401,8 @@
+@@ -29842,7 +32480,8 @@
fi
@@ -33943,7 +34453,7 @@
USING_QT_MT=""
-@@ -29865,13 +32422,13 @@
+@@ -29862,13 +32501,13 @@
else
kde_check_threading_default=yes
fi
@@ -33961,7 +34471,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29943,8 +32500,8 @@
+@@ -29940,8 +32579,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -33972,7 +34482,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29953,34 +32510,34 @@
+@@ -29950,34 +32589,34 @@
qt_libraries=""
qt_includes=""
@@ -33987,14 +34497,14 @@
-fi;
+fi
++
-# Check whether --with-qt-includes or --without-qt-includes was given.
--if test "${with_qt_includes+set}" = set; then
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
- withval="$with_qt_includes"
-
-+# Check whether --with-qt-includes was given.
-+if test "${with_qt_includes+set}" = set; then
+-
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -34019,16 +34529,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30008,7 +32565,7 @@
+@@ -30005,7 +32644,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30011: $i/$j" >&5
-+ echo "configure: 32568: $i/$j" >&5
+- echo "configure: 30008: $i/$j" >&5
++ echo "configure: 32647: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30045,8 +32602,7 @@
+@@ -30042,8 +32681,7 @@
ac_qt_libraries="$qt_libdir"
@@ -34038,7 +34548,7 @@
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'
-@@ -30183,13 +32739,13 @@
+@@ -30180,13 +32818,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -34056,7 +34566,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30198,15 +32754,14 @@
+@@ -30195,15 +32833,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -34075,7 +34585,7 @@
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'
-@@ -30327,12 +32882,12 @@
+@@ -30324,12 +32961,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34092,7 +34602,7 @@
fi
-@@ -30370,14 +32925,14 @@
+@@ -30367,14 +33004,14 @@
fi
@@ -34110,7 +34620,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30420,8 +32975,8 @@
+@@ -30417,8 +33054,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34121,7 +34631,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30442,22 +32997,22 @@
+@@ -30439,22 +33076,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34149,7 +34659,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30500,12 +33055,12 @@
+@@ -30497,12 +33134,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34166,7 +34676,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30535,10 +33090,10 @@
+@@ -30532,10 +33169,10 @@
if test $kde_qtver = 3; then
@@ -34180,7 +34690,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30561,22 +33116,22 @@
+@@ -30558,22 +33195,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34210,7 +34720,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30599,13 +33154,13 @@
+@@ -30596,13 +33233,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34228,7 +34738,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30636,15 +33191,14 @@
+@@ -30633,15 +33270,14 @@
if test -n "$LIBJPEG"; then
@@ -34247,7 +34757,7 @@
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'
-@@ -30677,24 +33231,36 @@
+@@ -30674,24 +33310,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34292,7 +34802,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30703,9 +33269,10 @@
+@@ -30700,9 +33348,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34301,11 +34811,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30721,12 +33288,12 @@
+@@ -30718,12 +33367,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34322,7 +34832,7 @@
LIBJPEG_QT=
fi
-@@ -30757,15 +33324,15 @@
+@@ -30754,15 +33403,15 @@
@@ -34344,7 +34854,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30789,11 +33356,11 @@
+@@ -30786,11 +33435,11 @@
@@ -34360,34 +34870,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30845,7 +33412,7 @@
+@@ -30842,7 +33491,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30848: $i/$j" >&5
-+ echo "configure: 33415: $i/$j" >&5
+- echo "configure: 30845: $i/$j" >&5
++ echo "configure: 33494: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30875,7 +33442,7 @@
+@@ -30872,7 +33521,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30878: $i/$j" >&5
-+ echo "configure: 33445: $i/$j" >&5
+- echo "configure: 30875: $i/$j" >&5
++ echo "configure: 33524: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30893,7 +33460,7 @@
+@@ -30890,7 +33539,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30896: $i/$j" >&5
-+ echo "configure: 33463: $i/$j" >&5
+- echo "configure: 30893: $i/$j" >&5
++ echo "configure: 33542: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30952,12 +33519,12 @@
+@@ -30949,12 +33598,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34404,7 +34914,7 @@
fi
kde_libraries="${libdir}"
-@@ -30966,8 +33533,8 @@
+@@ -30963,8 +33612,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34415,7 +34925,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31005,8 +33572,8 @@
+@@ -31002,8 +33651,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -34426,7 +34936,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31049,8 +33616,8 @@
+@@ -31046,8 +33695,8 @@
fi
@@ -34437,7 +34947,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31082,10 +33649,9 @@
+@@ -31079,10 +33728,9 @@
@@ -34450,7 +34960,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31099,13 +33665,14 @@
+@@ -31096,13 +33744,14 @@
fi
@@ -34468,28 +34978,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31216,15 +33783,14 @@
+@@ -31213,15 +33862,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
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'
-@@ -31276,8 +33842,8 @@
+@@ -31273,8 +33921,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34500,7 +35010,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31316,8 +33882,8 @@
+@@ -31313,8 +33961,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34511,7 +35021,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31325,8 +33891,8 @@
+@@ -31322,8 +33970,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34522,28 +35032,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31519,15 +34085,14 @@
+@@ -31516,15 +34164,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
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'
-@@ -31579,8 +34144,8 @@
+@@ -31576,8 +34223,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34554,7 +35064,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31619,8 +34184,8 @@
+@@ -31616,8 +34263,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34565,7 +35075,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31628,8 +34193,8 @@
+@@ -31625,8 +34272,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34576,7 +35086,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31721,22 +34286,22 @@
+@@ -31718,22 +34365,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -34605,7 +35115,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31769,14 +34334,14 @@
+@@ -31766,14 +34413,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -34623,7 +35133,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31819,8 +34384,8 @@
+@@ -31816,8 +34463,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34634,7 +35144,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31831,21 +34396,21 @@
+@@ -31828,21 +34475,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34661,7 +35171,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31888,8 +34453,8 @@
+@@ -31885,8 +34532,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34672,7 +35182,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31900,22 +34465,22 @@
+@@ -31897,22 +34544,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34700,7 +35210,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31958,8 +34523,8 @@
+@@ -31955,8 +34602,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34711,7 +35221,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31972,21 +34537,21 @@
+@@ -31969,21 +34616,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34738,7 +35248,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32029,8 +34594,8 @@
+@@ -32026,8 +34673,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34749,7 +35259,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32043,22 +34608,22 @@
+@@ -32040,22 +34687,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34777,7 +35287,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32101,12 +34666,12 @@
+@@ -32098,12 +34745,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34794,7 +35304,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32135,14 +34700,14 @@
+@@ -32132,14 +34779,14 @@
if test -n "$kde32ornewer"; then
@@ -34812,7 +35322,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32185,8 +34750,8 @@
+@@ -32182,8 +34829,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34823,7 +35333,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32197,21 +34762,21 @@
+@@ -32194,21 +34841,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34850,7 +35360,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32254,8 +34819,8 @@
+@@ -32251,8 +34898,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34861,7 +35371,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32266,8 +34831,8 @@
+@@ -32263,8 +34910,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34872,7 +35382,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32275,14 +34840,14 @@
+@@ -32272,14 +34919,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -34890,7 +35400,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32325,8 +34890,8 @@
+@@ -32322,8 +34969,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34901,7 +35411,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32337,8 +34902,8 @@
+@@ -32334,8 +34981,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34912,7 +35422,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32346,14 +34911,14 @@
+@@ -32343,14 +34990,14 @@
fi
@@ -34930,7 +35440,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32396,12 +34961,12 @@
+@@ -32393,12 +35040,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34947,16 +35457,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32416,7 +34981,7 @@
+@@ -32413,7 +35060,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32419: $i/$j" >&5
-+ echo "configure: 34984: $i/$j" >&5
+- echo "configure: 32416: $i/$j" >&5
++ echo "configure: 35063: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32577,13 +35142,12 @@
+@@ -32574,13 +35221,12 @@
@@ -34973,7 +35483,7 @@
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'
-@@ -32604,13 +35168,13 @@
+@@ -32601,13 +35247,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -34991,7 +35501,7 @@
{ 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
-@@ -32630,16 +35194,15 @@
+@@ -32627,16 +35273,15 @@
kde_have_gcc_visibility=no
@@ -35012,7 +35522,7 @@
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'
-@@ -32666,24 +35229,36 @@
+@@ -32663,24 +35308,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35057,7 +35567,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32692,8 +35267,10 @@
+@@ -32689,8 +35346,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35065,11 +35575,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -32706,28 +35283,27 @@
+@@ -32703,28 +35362,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35090,10 +35600,10 @@
kde_have_gcc_visibility=no
-fi;
+fi
-+
- 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
++
+ { 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
@@ -35107,7 +35617,7 @@
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'
-@@ -32762,24 +35338,36 @@
+@@ -32759,24 +35417,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35152,7 +35662,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32788,9 +35376,10 @@
+@@ -32785,9 +35455,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35165,7 +35675,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -32802,21 +35391,20 @@
+@@ -32799,21 +35470,20 @@
fi
@@ -35192,7 +35702,7 @@
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'
-@@ -32856,24 +35444,36 @@
+@@ -32853,24 +35523,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35237,7 +35747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32882,9 +35482,10 @@
+@@ -32879,9 +35561,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35246,11 +35756,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32898,8 +35499,8 @@
+@@ -32895,8 +35578,8 @@
fi
@@ -35261,7 +35771,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32915,8 +35516,8 @@
+@@ -32912,8 +35595,8 @@
fi
else
@@ -35272,7 +35782,7 @@
:
fi
-@@ -32924,8 +35525,8 @@
+@@ -32921,8 +35604,8 @@
fi
@@ -35283,16 +35793,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -32937,7 +35538,7 @@
+@@ -32934,7 +35617,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32940: $i/$j" >&5
-+ echo "configure: 35541: $i/$j" >&5
+- echo "configure: 32937: $i/$j" >&5
++ echo "configure: 35620: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32946,20 +35547,20 @@
+@@ -32943,20 +35626,20 @@
done
done
@@ -35318,7 +35828,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33002,12 +35603,12 @@
+@@ -32999,12 +35682,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35335,7 +35845,7 @@
DOT=$kde_cv_path
fi
-@@ -33019,14 +35620,14 @@
+@@ -33016,14 +35699,14 @@
fi
@@ -35353,7 +35863,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33069,12 +35670,12 @@
+@@ -33066,12 +35749,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35370,208 +35880,25 @@
DOXYGEN=$kde_cv_path
fi
-@@ -33085,224 +35686,110 @@
- DOXYGEN_PROJECT_NUMBER="Version $VERSION"
-
-
--
--KDE_HAS_DOXYGEN=no
--if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-- KDE_HAS_DOXYGEN=yes
--fi
--
--
--
--
--
--
--
--
--
--ac_header_dirent=no
--for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+@@ -33099,9 +35782,9 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/types.h>
--#include <$ac_hdr>
--
--int
--main ()
--{
--if ((DIR *) 0)
--return 0;
-- ;
-- 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_c_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
-- eval "$as_ac_Header=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--eval "$as_ac_Header=no"
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
--_ACEOF
--
--ac_header_dirent=$ac_hdr; break
--fi
--
--done
--# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
--if test $ac_header_dirent = dirent.h; then
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- 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_c_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
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+ KDE_HAS_DOXYGEN=yes
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <sys/types.h>
-+#include <$ac_hdr>
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
- int
- main ()
- {
--opendir ();
-+if ((DIR *) 0)
-+return 0;
- ;
- return 0;
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -33123,24 +35806,36 @@
}
_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -35599,10 +35926,9 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
@@ -35612,44 +35938,31 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
-+ eval "$as_ac_Header=yes"
- else
+@@ -33149,12 +35844,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
--fi
--LIBS=$ac_func_search_save_LIBS
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
-
-+ac_header_dirent=$ac_hdr; break
- fi
-
--else
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -33166,13 +35863,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
@@ -35660,7 +35973,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33310,122 +35797,196 @@
+@@ -33180,249 +35876,196 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35739,44 +36052,158 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
+- for ac_lib in dir; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+
-+rm -f core conftest.err conftest.$ac_objext \
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- 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_c_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
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
+else
+ ac_cv_search_opendir=no
-+fi
+ fi
+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+else
+
+ fi
+
+ else
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- 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_c_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
+- ac_cv_search_opendir="none required"
+-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
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -35866,7 +36293,7 @@
- conftest$ac_exeext conftest.$ac_ext
- done
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -35901,7 +36328,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33449,24 +36010,36 @@
+@@ -33446,24 +36089,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35946,7 +36373,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33475,9 +36048,10 @@
+@@ -33472,9 +36127,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35959,7 +36386,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -33533,6 +36107,7 @@
+@@ -33530,6 +36186,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -35967,7 +36394,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33552,18 +36127,27 @@
+@@ -33549,18 +36206,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -36001,7 +36428,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33576,12 +36160,14 @@
+@@ -33573,12 +36239,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -36019,7 +36446,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33603,18 +36189,19 @@
+@@ -33600,18 +36268,19 @@
for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h sys/user.h sys/vmmeter.h sys/resource.h vm/vmparam.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36047,7 +36474,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33625,24 +36212,36 @@
+@@ -33622,24 +36291,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36092,7 +36519,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33651,15 +36250,16 @@
+@@ -33648,15 +36329,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36115,7 +36542,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33668,8 +36268,13 @@
+@@ -33665,8 +36347,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36131,7 +36558,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33693,9 +36298,10 @@
+@@ -33690,9 +36377,10 @@
ac_header_preproc=no
fi
@@ -36144,7 +36571,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33719,25 +36325,19 @@
+@@ -33716,25 +36404,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -36177,7 +36604,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33752,15 +36352,14 @@
+@@ -33749,15 +36431,14 @@
@@ -36196,7 +36623,7 @@
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'
-@@ -33772,9 +36371,6 @@
+@@ -33769,9 +36450,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36206,7 +36633,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33797,24 +36393,36 @@
+@@ -33794,24 +36472,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36251,7 +36678,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33823,9 +36431,10 @@
+@@ -33820,9 +36510,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36264,7 +36691,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -33838,11 +36447,11 @@
+@@ -33835,11 +36526,11 @@
fi
@@ -36280,7 +36707,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33863,8 +36472,7 @@
+@@ -33860,8 +36551,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -36290,7 +36717,7 @@
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'
-@@ -33899,24 +36507,36 @@
+@@ -33896,24 +36586,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36335,7 +36762,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33926,10 +36546,11 @@
+@@ -33923,10 +36625,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36345,11 +36772,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -33942,8 +36563,8 @@
+@@ -33939,8 +36642,8 @@
fi
@@ -36360,7 +36787,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -33967,15 +36588,14 @@
+@@ -33964,15 +36667,14 @@
@@ -36379,7 +36806,7 @@
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'
-@@ -33987,9 +36607,6 @@
+@@ -33984,9 +36686,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36389,7 +36816,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34012,24 +36629,36 @@
+@@ -34009,24 +36708,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36434,7 +36861,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34038,9 +36667,10 @@
+@@ -34035,9 +36746,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36447,7 +36874,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -34053,11 +36683,11 @@
+@@ -34050,11 +36762,11 @@
fi
@@ -36463,7 +36890,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34078,8 +36708,7 @@
+@@ -34075,8 +36787,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -36473,7 +36900,7 @@
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'
-@@ -34114,24 +36743,36 @@
+@@ -34111,24 +36822,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36518,7 +36945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34141,10 +36782,11 @@
+@@ -34138,10 +36861,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36528,11 +36955,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -34157,8 +36799,8 @@
+@@ -34154,8 +36878,8 @@
fi
@@ -36543,7 +36970,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -34184,8 +36826,8 @@
+@@ -34181,8 +36905,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -36554,7 +36981,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34221,8 +36863,8 @@
+@@ -34218,8 +36942,8 @@
fi
@@ -36565,7 +36992,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34231,15 +36873,14 @@
+@@ -34228,15 +36952,14 @@
@@ -36584,7 +37011,7 @@
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'
-@@ -34251,9 +36892,6 @@
+@@ -34248,9 +36971,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36594,7 +37021,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34280,24 +36918,36 @@
+@@ -34277,24 +36997,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36639,7 +37066,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34306,9 +36956,10 @@
+@@ -34303,9 +37035,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36652,7 +37079,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -34321,11 +36972,11 @@
+@@ -34318,11 +37051,11 @@
fi
@@ -36668,7 +37095,7 @@
if test "${kde_cv_proto_statfs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34346,8 +36997,7 @@
+@@ -34343,8 +37076,7 @@
if test "x$kde_cv_proto_statfs" = xunknown; then
@@ -36678,7 +37105,7 @@
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'
-@@ -34388,24 +37038,36 @@
+@@ -34385,24 +37117,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36723,7 +37150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34415,10 +37077,11 @@
+@@ -34412,10 +37156,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36733,11 +37160,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -34431,8 +37094,8 @@
+@@ -34428,8 +37173,8 @@
fi
@@ -36748,7 +37175,7 @@
if test "x$kde_cv_func_statfs" = xyes; then
-@@ -34458,18 +37121,19 @@
+@@ -34455,18 +37200,19 @@
for ac_header in ieeefp.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36776,7 +37203,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34480,24 +37144,36 @@
+@@ -34477,24 +37223,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36821,7 +37248,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34506,15 +37182,16 @@
+@@ -34503,15 +37261,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36844,7 +37271,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34523,8 +37200,13 @@
+@@ -34520,8 +37279,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36860,7 +37287,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34548,9 +37230,10 @@
+@@ -34545,9 +37309,10 @@
ac_header_preproc=no
fi
@@ -36873,7 +37300,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34574,25 +37257,19 @@
+@@ -34571,25 +37336,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -36906,7 +37333,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34609,9 +37286,9 @@
+@@ -34606,9 +37365,9 @@
for ac_func in fabsl
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36919,7 +37346,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34637,53 +37314,59 @@
+@@ -34634,53 +37393,59 @@
#undef $ac_func
@@ -36998,7 +37425,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34692,13 +37375,15 @@
+@@ -34689,13 +37454,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37007,7 +37434,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -37018,7 +37445,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34710,8 +37395,8 @@
+@@ -34707,8 +37474,8 @@
@@ -37029,7 +37456,7 @@
if test "${ac_cv_c_long_double+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34754,13 +37439,22 @@
+@@ -34751,13 +37518,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -37056,7 +37483,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34773,13 +37467,15 @@
+@@ -34770,13 +37546,15 @@
( exit $ac_status )
ac_cv_c_long_double=no
fi
@@ -37075,7 +37502,7 @@
if test $ac_cv_c_long_double = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34791,8 +37487,8 @@
+@@ -34788,8 +37566,8 @@
have_l_funcs=yes
@@ -37086,7 +37513,7 @@
if test "${ac_cv_lib_m_asinl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34805,40 +37501,52 @@
+@@ -34802,40 +37580,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37151,7 +37578,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34847,14 +37555,15 @@
+@@ -34844,14 +37634,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37160,7 +37587,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37171,7 +37598,7 @@
if test $ac_cv_lib_m_asinl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -34867,8 +37576,8 @@
+@@ -34864,8 +37655,8 @@
fi
@@ -37182,7 +37609,7 @@
if test "${ac_cv_lib_m_sqrtl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34881,40 +37590,52 @@
+@@ -34878,40 +37669,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37247,7 +37674,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34923,14 +37644,15 @@
+@@ -34920,14 +37723,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37256,7 +37683,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37267,7 +37694,7 @@
if test $ac_cv_lib_m_sqrtl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -34957,8 +37679,8 @@
+@@ -34954,8 +37758,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -37278,7 +37705,7 @@
if test "${ac_cv_lib_m_isinf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34971,40 +37693,52 @@
+@@ -34968,40 +37772,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37343,7 +37770,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35013,14 +37747,15 @@
+@@ -35010,14 +37826,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37352,7 +37779,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37363,7 +37790,7 @@
if test $ac_cv_lib_m_isinf = yes; then
-@@ -35031,8 +37766,8 @@
+@@ -35028,8 +37845,8 @@
fi
@@ -37374,7 +37801,7 @@
if test "${ac_cv_lib_m_round+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35045,40 +37780,52 @@
+@@ -35042,40 +37859,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37439,7 +37866,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35087,14 +37834,15 @@
+@@ -35084,14 +37913,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37448,7 +37875,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37459,7 +37886,7 @@
if test $ac_cv_lib_m_round = yes; then
-@@ -35105,8 +37853,8 @@
+@@ -35102,8 +37932,8 @@
fi
@@ -37470,7 +37897,7 @@
if test "${ac_cv_lib_m_roundl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35119,40 +37867,52 @@
+@@ -35116,40 +37946,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37535,7 +37962,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35161,14 +37921,15 @@
+@@ -35158,14 +38000,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37544,7 +37971,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37555,7 +37982,7 @@
if test $ac_cv_lib_m_roundl = yes; then
-@@ -35186,8 +37947,7 @@
+@@ -35183,8 +38026,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37565,7 +37992,7 @@
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'
-@@ -35197,17 +37957,17 @@
+@@ -35194,17 +38036,17 @@
if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -37589,7 +38016,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35218,24 +37978,36 @@
+@@ -35215,24 +38057,36 @@
#include <gmp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37634,7 +38061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35244,15 +38016,16 @@
+@@ -35241,15 +38095,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37657,7 +38084,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35261,8 +38034,13 @@
+@@ -35258,8 +38113,13 @@
/* end confdefs.h. */
#include <gmp.h>
_ACEOF
@@ -37673,7 +38100,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35286,9 +38064,10 @@
+@@ -35283,9 +38143,10 @@
ac_header_preproc=no
fi
@@ -37686,7 +38113,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35312,25 +38091,18 @@
+@@ -35309,25 +38170,18 @@
echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -37717,7 +38144,7 @@
fi
if test $ac_cv_header_gmp_h = yes; then
-@@ -35344,8 +38116,8 @@
+@@ -35341,8 +38195,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -37728,7 +38155,7 @@
if test "${ac_cv_lib_gmp_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35362,30 +38134,42 @@
+@@ -35359,30 +38213,42 @@
int
main ()
{
@@ -37780,7 +38207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35394,14 +38178,15 @@
+@@ -35391,14 +38257,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37789,7 +38216,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37800,7 +38227,7 @@
if test $ac_cv_lib_gmp_main = yes; then
LIBGMP="-lgmp"
-@@ -35437,8 +38222,8 @@
+@@ -35434,8 +38301,8 @@
@@ -37811,7 +38238,7 @@
if test "${ac_cv_c_long_double+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35481,13 +38266,22 @@
+@@ -35478,13 +38345,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -37838,7 +38265,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35500,13 +38294,15 @@
+@@ -35497,13 +38373,15 @@
( exit $ac_status )
ac_cv_c_long_double=no
fi
@@ -37857,7 +38284,7 @@
if test $ac_cv_c_long_double = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35518,8 +38314,8 @@
+@@ -35515,8 +38393,8 @@
have_l_funcs=yes
@@ -37868,7 +38295,7 @@
if test "${ac_cv_lib_m_sqrtl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35532,40 +38328,52 @@
+@@ -35529,40 +38407,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37933,7 +38360,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35574,14 +38382,15 @@
+@@ -35571,14 +38461,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37942,7 +38369,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37953,7 +38380,7 @@
if test $ac_cv_lib_m_sqrtl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -35607,8 +38416,7 @@
+@@ -35604,8 +38495,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37963,7 +38390,7 @@
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'
-@@ -35618,17 +38426,17 @@
+@@ -35615,17 +38505,17 @@
if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -37987,7 +38414,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35639,24 +38447,36 @@
+@@ -35636,24 +38526,36 @@
#include <gmp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38032,7 +38459,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35665,15 +38485,16 @@
+@@ -35662,15 +38564,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38055,7 +38482,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35682,8 +38503,13 @@
+@@ -35679,8 +38582,13 @@
/* end confdefs.h. */
#include <gmp.h>
_ACEOF
@@ -38071,7 +38498,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35707,9 +38533,10 @@
+@@ -35704,9 +38612,10 @@
ac_header_preproc=no
fi
@@ -38084,7 +38511,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35733,32 +38560,24 @@
+@@ -35730,32 +38639,24 @@
echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -38123,7 +38550,7 @@
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'
-@@ -35791,24 +38610,36 @@
+@@ -35788,24 +38689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38168,13 +38595,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35821,10 +38652,11 @@
+@@ -35818,10 +38731,11 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE kcalc"
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_save_LIBS
- ac_ext=cc
@@ -38182,7 +38609,7 @@
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'
-@@ -35847,15 +38679,14 @@
+@@ -35844,15 +38758,14 @@
# kossebau: copied from kdelibs/configure.in.in for khexedit
@@ -38200,7 +38627,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35881,24 +38712,36 @@
+@@ -35869,7 +38782,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -35878,24 +38792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38245,7 +38682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35924,24 +38767,36 @@
+@@ -35921,24 +38847,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38290,7 +38727,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35950,14 +38805,15 @@
+@@ -35947,14 +38885,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38309,7 +38746,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -35967,11 +38823,11 @@
+@@ -35964,11 +38903,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38325,7 +38762,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -35982,24 +38838,36 @@
+@@ -35979,24 +38918,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38370,7 +38807,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36018,8 +38886,10 @@
+@@ -36015,8 +38966,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38382,7 +38819,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -36027,27 +38897,41 @@
+@@ -36024,27 +38977,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38431,7 +38868,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36060,13 +38944,16 @@
+@@ -36057,13 +39024,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -38452,7 +38889,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -36093,14 +38980,14 @@
+@@ -36090,14 +39060,14 @@
# kossebau end
@@ -38470,7 +38907,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36143,12 +39030,12 @@
+@@ -36140,12 +39110,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38487,7 +38924,7 @@
TPCTL=$kde_cv_path
fi
-@@ -36163,18 +39050,19 @@
+@@ -36160,18 +39130,19 @@
for ac_header in machine/apm_bios.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38515,7 +38952,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36185,24 +39073,36 @@
+@@ -36182,24 +39153,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38560,7 +38997,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36211,15 +39111,16 @@
+@@ -36208,15 +39191,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38583,7 +39020,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36228,8 +39129,13 @@
+@@ -36225,8 +39209,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38599,7 +39036,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36253,9 +39159,10 @@
+@@ -36250,9 +39239,10 @@
ac_header_preproc=no
fi
@@ -38612,7 +39049,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36279,25 +39186,19 @@
+@@ -36276,25 +39266,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38645,7 +39082,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36324,13 +39225,13 @@
+@@ -36321,13 +39305,13 @@
@@ -38663,7 +39100,7 @@
have_pbbipc=""
have_pbb=""
-@@ -36345,8 +39246,8 @@
+@@ -36342,8 +39326,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38674,7 +39111,7 @@
if test "${ac_cv_lib_pbbipc_create_msgport+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36359,40 +39260,52 @@
+@@ -36356,40 +39340,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38739,7 +39176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36401,14 +39314,15 @@
+@@ -36398,14 +39394,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38748,7 +39185,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38759,7 +39196,7 @@
if test $ac_cv_lib_pbbipc_create_msgport = yes; then
KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
-@@ -36433,8 +39347,8 @@
+@@ -36430,8 +39427,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38770,7 +39207,7 @@
if test "${ac_cv_lib_pbb_init_libpbb+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36447,40 +39361,52 @@
+@@ -36444,40 +39441,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38835,7 +39272,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36489,14 +39415,15 @@
+@@ -36486,14 +39495,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38844,7 +39281,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38855,7 +39292,7 @@
if test $ac_cv_lib_pbb_init_libpbb = yes; then
KEYBOARD_LIBS="-lpbb $KEYBOARD_LIBS"
-@@ -36540,15 +39467,15 @@
+@@ -36537,15 +39547,15 @@
fi
@@ -38875,7 +39312,7 @@
if test x$kmilo_delli8k_compile = xyes; then
-@@ -36563,17 +39490,17 @@
+@@ -36560,17 +39570,17 @@
if test "${ac_cv_header_linux_sonypi_h+set}" = set; then
@@ -38899,7 +39336,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36584,24 +39511,36 @@
+@@ -36581,24 +39591,36 @@
#include <linux/sonypi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38944,7 +39381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36610,15 +39549,16 @@
+@@ -36607,15 +39629,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38967,7 +39404,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36627,8 +39567,13 @@
+@@ -36624,8 +39647,13 @@
/* end confdefs.h. */
#include <linux/sonypi.h>
_ACEOF
@@ -38983,7 +39420,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36652,9 +39597,10 @@
+@@ -36649,9 +39677,10 @@
ac_header_preproc=no
fi
@@ -38996,7 +39433,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36678,25 +39624,18 @@
+@@ -36675,25 +39704,18 @@
echo "$as_me: WARNING: linux/sonypi.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&2;}
@@ -39027,7 +39464,7 @@
fi
if test $ac_cv_header_linux_sonypi_h = yes; then
-@@ -36721,9 +39660,9 @@
+@@ -36718,9 +39740,9 @@
for ac_func in getloadavg
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39040,7 +39477,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36749,53 +39688,59 @@
+@@ -36746,53 +39768,59 @@
#undef $ac_func
@@ -39119,7 +39556,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36804,13 +39749,15 @@
+@@ -36801,13 +39829,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39128,7 +39565,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -39139,7 +39576,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -36829,8 +39776,8 @@
+@@ -36826,8 +39856,8 @@
if test x$sysinfo_check = xyes; then
sysinfo_ok=no
@@ -39150,7 +39587,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36856,24 +39803,36 @@
+@@ -36853,24 +39883,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39195,7 +39632,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36889,11 +39848,13 @@
+@@ -36886,11 +39928,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39212,7 +39649,7 @@
fi
-@@ -36911,8 +39872,7 @@
+@@ -36908,8 +39952,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -39222,7 +39659,7 @@
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'
-@@ -36922,17 +39882,17 @@
+@@ -36919,17 +39962,17 @@
if test "${ac_cv_header_X11_extensions_extutil_h+set}" = set; then
@@ -39246,7 +39683,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36943,24 +39903,36 @@
+@@ -36940,24 +39983,36 @@
#include <X11/extensions/extutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -39291,7 +39728,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36969,15 +39941,16 @@
+@@ -36966,15 +40021,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39314,7 +39751,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36986,8 +39959,13 @@
+@@ -36983,8 +40039,13 @@
/* end confdefs.h. */
#include <X11/extensions/extutil.h>
_ACEOF
@@ -39330,7 +39767,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37011,9 +39989,10 @@
+@@ -37008,9 +40069,10 @@
ac_header_preproc=no
fi
@@ -39343,7 +39780,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37037,25 +40016,18 @@
+@@ -37034,25 +40096,18 @@
echo "$as_me: WARNING: X11/extensions/extutil.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&2;}
@@ -39374,7 +39811,7 @@
fi
if test $ac_cv_header_X11_extensions_extutil_h = yes; then
-@@ -37086,8 +40058,8 @@
+@@ -37083,8 +40138,8 @@
fi
@@ -39385,7 +39822,7 @@
if test "${ac_cv_lib_devstat_selectdevs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37100,40 +40072,52 @@
+@@ -37097,40 +40152,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39450,7 +39887,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37142,22 +40126,23 @@
+@@ -37139,22 +40206,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39459,7 +39896,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39480,7 +39917,7 @@
if test "${ac_cv_lib_devstat_devstat_selectdevs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37170,40 +40155,52 @@
+@@ -37167,40 +40235,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39545,7 +39982,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37212,14 +40209,15 @@
+@@ -37209,14 +40289,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39554,7 +39991,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39565,7 +40002,7 @@
if test $ac_cv_lib_devstat_devstat_selectdevs = yes; then
LIB_DEVSTAT="-ldevstat"
-@@ -37244,18 +40242,19 @@
+@@ -37241,18 +40322,19 @@
for ac_header in sys/mnttab.h mntent.h sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h sys/ucred.h sys/loadavg.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39593,7 +40030,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37266,24 +40265,36 @@
+@@ -37263,24 +40345,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39638,7 +40075,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37292,15 +40303,16 @@
+@@ -37289,15 +40383,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39661,7 +40098,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37309,8 +40321,13 @@
+@@ -37306,8 +40401,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39677,7 +40114,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37334,9 +40351,10 @@
+@@ -37331,9 +40431,10 @@
ac_header_preproc=no
fi
@@ -39690,7 +40127,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37360,25 +40378,19 @@
+@@ -37357,25 +40458,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39723,7 +40160,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -37394,9 +40406,9 @@
+@@ -37391,9 +40486,9 @@
for ac_func in statvfs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39736,7 +40173,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37422,53 +40434,59 @@
+@@ -37419,53 +40514,59 @@
#undef $ac_func
@@ -39815,7 +40252,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37477,13 +40495,15 @@
+@@ -37474,13 +40575,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39824,7 +40261,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -39835,7 +40272,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37494,13 +40514,13 @@
+@@ -37491,13 +40594,13 @@
@@ -39853,7 +40290,7 @@
enable_snmp=no
if test "x$with_snmp" != xno; then
-@@ -37508,8 +40528,7 @@
+@@ -37505,8 +40608,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -39863,7 +40300,7 @@
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'
-@@ -37518,8 +40537,8 @@
+@@ -37515,8 +40617,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -39874,7 +40311,7 @@
if test "${ac_cv_header_net_snmp_library_snmp_api_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37537,24 +40556,36 @@
+@@ -37534,24 +40636,36 @@
#include <net-snmp/library/snmp_api.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -39919,7 +40356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37563,12 +40594,13 @@
+@@ -37560,12 +40674,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39937,7 +40374,7 @@
if test $ac_cv_header_net_snmp_library_snmp_api_h = yes; then
have_netsnmp_h=yes
else
-@@ -37595,8 +40627,8 @@
+@@ -37592,8 +40707,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39948,7 +40385,7 @@
if test "${ac_cv_lib_netsnmp_snmp_sess_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37609,40 +40641,52 @@
+@@ -37606,40 +40721,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40013,7 +40450,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37651,14 +40695,15 @@
+@@ -37648,14 +40775,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40022,7 +40459,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40033,7 +40470,7 @@
if test $ac_cv_lib_netsnmp_snmp_sess_init = yes; then
LIBSNMP="-lnetsnmp"
-@@ -37672,8 +40717,8 @@
+@@ -37669,8 +40797,8 @@
fi
if test "$enable_snmp" != yes; then
@@ -40044,7 +40481,7 @@
kde_save_LDFLAGS="$LDFLAGS"
-@@ -37684,8 +40729,8 @@
+@@ -37681,8 +40809,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40055,7 +40492,7 @@
if test "${ac_cv_lib_netsnmp_snmp_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37698,40 +40743,52 @@
+@@ -37695,40 +40823,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40120,7 +40557,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37740,24 +40797,25 @@
+@@ -37737,24 +40877,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40129,7 +40566,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40154,7 +40591,7 @@
fi
-@@ -37786,8 +40844,8 @@
+@@ -37783,8 +40924,8 @@
#MIN_CONFIG
@@ -40165,7 +40602,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37813,24 +40871,36 @@
+@@ -37801,7 +40942,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -37810,24 +40952,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40210,7 +40657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37856,24 +40926,36 @@
+@@ -37853,24 +41007,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40255,7 +40702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37882,14 +40964,15 @@
+@@ -37879,14 +41045,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40274,7 +40721,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -37899,11 +40982,11 @@
+@@ -37896,11 +41063,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40290,7 +40737,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -37914,24 +40997,36 @@
+@@ -37911,24 +41078,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40335,7 +40782,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37950,8 +41045,10 @@
+@@ -37947,8 +41126,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40347,7 +40794,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -37959,27 +41056,41 @@
+@@ -37956,27 +41137,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40396,7 +40843,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37992,13 +41103,16 @@
+@@ -37989,13 +41184,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -40417,7 +40864,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -38017,8 +41131,8 @@
+@@ -38014,8 +41212,8 @@
esac
@@ -40428,7 +40875,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38054,8 +41168,8 @@
+@@ -38051,8 +41249,8 @@
fi
@@ -40439,7 +40886,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -38065,8 +41179,8 @@
+@@ -38062,8 +41260,8 @@
@@ -40450,7 +40897,7 @@
if test "${kde_cv_pythondir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -38082,19 +41196,19 @@
+@@ -38079,19 +41277,19 @@
@@ -40476,7 +40923,83 @@
-@@ -38108,8 +41222,8 @@
+@@ -38105,8 +41303,8 @@
+ version=""2.5""
+ fi
+
+-echo "$as_me:$LINENO: checking for Python$version" >&5
+-echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Python$version" >&5
++echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
+
+ python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
+
+@@ -38115,7 +41313,7 @@
+ do
+ for j in Python.h;
+ do
+- echo "configure: 38118: $i/$j" >&5
++ echo "configure: 41316: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38131,7 +41329,7 @@
+ do
+ for j in python$version/Python.h;
+ do
+- echo "configure: 38134: $i/$j" >&5
++ echo "configure: 41332: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_incdir=$i
+@@ -38155,7 +41353,7 @@
+ do
+ for j in libpython$version.so;
+ do
+- echo "configure: 38158: $i/$j" >&5
++ echo "configure: 41356: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38171,7 +41369,7 @@
+ do
+ for j in libpython$version.a;
+ do
+- echo "configure: 38174: $i/$j" >&5
++ echo "configure: 41372: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38187,7 +41385,7 @@
+ do
+ for j in python$version/config/libpython$version.a;
+ do
+- echo "configure: 38190: $i/$j" >&5
++ echo "configure: 41388: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_libdir=$i
+@@ -38215,7 +41413,7 @@
+ do
+ for j in python$version/copy.py;
+ do
+- echo "configure: 38218: $i/$j" >&5
++ echo "configure: 41416: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ python_moddir=$i
+@@ -38231,8 +41429,8 @@
+
+ PYTHONMODDIR=$python_moddir
+
+-echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
+-echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
++{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
++echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
+
+ if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
+ LIBPYTHON=$kde_orig_LIBPYTHON
+@@ -38249,8 +41447,8 @@
version=""2.4""
fi
@@ -40487,61 +41010,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38118,7 +41232,7 @@
+@@ -38259,7 +41457,7 @@
do
for j in Python.h;
do
-- echo "configure: 38121: $i/$j" >&5
-+ echo "configure: 41235: $i/$j" >&5
+- echo "configure: 38262: $i/$j" >&5
++ echo "configure: 41460: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38134,7 +41248,7 @@
+@@ -38275,7 +41473,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38137: $i/$j" >&5
-+ echo "configure: 41251: $i/$j" >&5
+- echo "configure: 38278: $i/$j" >&5
++ echo "configure: 41476: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38158,7 +41272,7 @@
+@@ -38299,7 +41497,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38161: $i/$j" >&5
-+ echo "configure: 41275: $i/$j" >&5
+- echo "configure: 38302: $i/$j" >&5
++ echo "configure: 41500: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38174,7 +41288,7 @@
+@@ -38315,7 +41513,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38177: $i/$j" >&5
-+ echo "configure: 41291: $i/$j" >&5
+- echo "configure: 38318: $i/$j" >&5
++ echo "configure: 41516: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38190,7 +41304,7 @@
+@@ -38331,7 +41529,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38193: $i/$j" >&5
-+ echo "configure: 41307: $i/$j" >&5
+- echo "configure: 38334: $i/$j" >&5
++ echo "configure: 41532: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38218,7 +41332,7 @@
+@@ -38359,7 +41557,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38221: $i/$j" >&5
-+ echo "configure: 41335: $i/$j" >&5
+- echo "configure: 38362: $i/$j" >&5
++ echo "configure: 41560: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38234,8 +41348,8 @@
+@@ -38375,8 +41573,8 @@
PYTHONMODDIR=$python_moddir
@@ -40552,7 +41075,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38252,8 +41366,8 @@
+@@ -38393,8 +41591,8 @@
version=""2.3""
fi
@@ -40563,61 +41086,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38262,7 +41376,7 @@
+@@ -38403,7 +41601,7 @@
do
for j in Python.h;
do
-- echo "configure: 38265: $i/$j" >&5
-+ echo "configure: 41379: $i/$j" >&5
+- echo "configure: 38406: $i/$j" >&5
++ echo "configure: 41604: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38278,7 +41392,7 @@
+@@ -38419,7 +41617,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38281: $i/$j" >&5
-+ echo "configure: 41395: $i/$j" >&5
+- echo "configure: 38422: $i/$j" >&5
++ echo "configure: 41620: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38302,7 +41416,7 @@
+@@ -38443,7 +41641,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38305: $i/$j" >&5
-+ echo "configure: 41419: $i/$j" >&5
+- echo "configure: 38446: $i/$j" >&5
++ echo "configure: 41644: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38318,7 +41432,7 @@
+@@ -38459,7 +41657,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38321: $i/$j" >&5
-+ echo "configure: 41435: $i/$j" >&5
+- echo "configure: 38462: $i/$j" >&5
++ echo "configure: 41660: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38334,7 +41448,7 @@
+@@ -38475,7 +41673,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38337: $i/$j" >&5
-+ echo "configure: 41451: $i/$j" >&5
+- echo "configure: 38478: $i/$j" >&5
++ echo "configure: 41676: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38362,7 +41476,7 @@
+@@ -38503,7 +41701,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38365: $i/$j" >&5
-+ echo "configure: 41479: $i/$j" >&5
+- echo "configure: 38506: $i/$j" >&5
++ echo "configure: 41704: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38378,8 +41492,8 @@
+@@ -38519,8 +41717,8 @@
PYTHONMODDIR=$python_moddir
@@ -40628,7 +41151,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38396,8 +41510,8 @@
+@@ -38537,8 +41735,8 @@
version=""2.2""
fi
@@ -40639,61 +41162,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38406,7 +41520,7 @@
+@@ -38547,7 +41745,7 @@
do
for j in Python.h;
do
-- echo "configure: 38409: $i/$j" >&5
-+ echo "configure: 41523: $i/$j" >&5
+- echo "configure: 38550: $i/$j" >&5
++ echo "configure: 41748: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38422,7 +41536,7 @@
+@@ -38563,7 +41761,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38425: $i/$j" >&5
-+ echo "configure: 41539: $i/$j" >&5
+- echo "configure: 38566: $i/$j" >&5
++ echo "configure: 41764: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38446,7 +41560,7 @@
+@@ -38587,7 +41785,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38449: $i/$j" >&5
-+ echo "configure: 41563: $i/$j" >&5
+- echo "configure: 38590: $i/$j" >&5
++ echo "configure: 41788: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38462,7 +41576,7 @@
+@@ -38603,7 +41801,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38465: $i/$j" >&5
-+ echo "configure: 41579: $i/$j" >&5
+- echo "configure: 38606: $i/$j" >&5
++ echo "configure: 41804: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38478,7 +41592,7 @@
+@@ -38619,7 +41817,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38481: $i/$j" >&5
-+ echo "configure: 41595: $i/$j" >&5
+- echo "configure: 38622: $i/$j" >&5
++ echo "configure: 41820: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38506,7 +41620,7 @@
+@@ -38647,7 +41845,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38509: $i/$j" >&5
-+ echo "configure: 41623: $i/$j" >&5
+- echo "configure: 38650: $i/$j" >&5
++ echo "configure: 41848: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38522,8 +41636,8 @@
+@@ -38663,8 +41861,8 @@
PYTHONMODDIR=$python_moddir
@@ -40704,7 +41227,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38540,8 +41654,8 @@
+@@ -38681,8 +41879,8 @@
version=""2.1""
fi
@@ -40715,61 +41238,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38550,7 +41664,7 @@
+@@ -38691,7 +41889,7 @@
do
for j in Python.h;
do
-- echo "configure: 38553: $i/$j" >&5
-+ echo "configure: 41667: $i/$j" >&5
+- echo "configure: 38694: $i/$j" >&5
++ echo "configure: 41892: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38566,7 +41680,7 @@
+@@ -38707,7 +41905,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38569: $i/$j" >&5
-+ echo "configure: 41683: $i/$j" >&5
+- echo "configure: 38710: $i/$j" >&5
++ echo "configure: 41908: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38590,7 +41704,7 @@
+@@ -38731,7 +41929,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38593: $i/$j" >&5
-+ echo "configure: 41707: $i/$j" >&5
+- echo "configure: 38734: $i/$j" >&5
++ echo "configure: 41932: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38606,7 +41720,7 @@
+@@ -38747,7 +41945,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38609: $i/$j" >&5
-+ echo "configure: 41723: $i/$j" >&5
+- echo "configure: 38750: $i/$j" >&5
++ echo "configure: 41948: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38622,7 +41736,7 @@
+@@ -38763,7 +41961,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38625: $i/$j" >&5
-+ echo "configure: 41739: $i/$j" >&5
+- echo "configure: 38766: $i/$j" >&5
++ echo "configure: 41964: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38650,7 +41764,7 @@
+@@ -38791,7 +41989,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38653: $i/$j" >&5
-+ echo "configure: 41767: $i/$j" >&5
+- echo "configure: 38794: $i/$j" >&5
++ echo "configure: 41992: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38666,8 +41780,8 @@
+@@ -38807,8 +42005,8 @@
PYTHONMODDIR=$python_moddir
@@ -40780,7 +41303,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38684,8 +41798,8 @@
+@@ -38825,8 +42023,8 @@
version=""2.0""
fi
@@ -40791,61 +41314,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38694,7 +41808,7 @@
+@@ -38835,7 +42033,7 @@
do
for j in Python.h;
do
-- echo "configure: 38697: $i/$j" >&5
-+ echo "configure: 41811: $i/$j" >&5
+- echo "configure: 38838: $i/$j" >&5
++ echo "configure: 42036: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38710,7 +41824,7 @@
+@@ -38851,7 +42049,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38713: $i/$j" >&5
-+ echo "configure: 41827: $i/$j" >&5
+- echo "configure: 38854: $i/$j" >&5
++ echo "configure: 42052: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38734,7 +41848,7 @@
+@@ -38875,7 +42073,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38737: $i/$j" >&5
-+ echo "configure: 41851: $i/$j" >&5
+- echo "configure: 38878: $i/$j" >&5
++ echo "configure: 42076: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38750,7 +41864,7 @@
+@@ -38891,7 +42089,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38753: $i/$j" >&5
-+ echo "configure: 41867: $i/$j" >&5
+- echo "configure: 38894: $i/$j" >&5
++ echo "configure: 42092: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38766,7 +41880,7 @@
+@@ -38907,7 +42105,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38769: $i/$j" >&5
-+ echo "configure: 41883: $i/$j" >&5
+- echo "configure: 38910: $i/$j" >&5
++ echo "configure: 42108: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38794,7 +41908,7 @@
+@@ -38935,7 +42133,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38797: $i/$j" >&5
-+ echo "configure: 41911: $i/$j" >&5
+- echo "configure: 38938: $i/$j" >&5
++ echo "configure: 42136: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38810,8 +41924,8 @@
+@@ -38951,8 +42149,8 @@
PYTHONMODDIR=$python_moddir
@@ -40856,7 +41379,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38828,8 +41942,8 @@
+@@ -38969,8 +42167,8 @@
version=""
fi
@@ -40867,61 +41390,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38838,7 +41952,7 @@
+@@ -38979,7 +42177,7 @@
do
for j in Python.h;
do
-- echo "configure: 38841: $i/$j" >&5
-+ echo "configure: 41955: $i/$j" >&5
+- echo "configure: 38982: $i/$j" >&5
++ echo "configure: 42180: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38854,7 +41968,7 @@
+@@ -38995,7 +42193,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38857: $i/$j" >&5
-+ echo "configure: 41971: $i/$j" >&5
+- echo "configure: 38998: $i/$j" >&5
++ echo "configure: 42196: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38878,7 +41992,7 @@
+@@ -39019,7 +42217,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38881: $i/$j" >&5
-+ echo "configure: 41995: $i/$j" >&5
+- echo "configure: 39022: $i/$j" >&5
++ echo "configure: 42220: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38894,7 +42008,7 @@
+@@ -39035,7 +42233,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38897: $i/$j" >&5
-+ echo "configure: 42011: $i/$j" >&5
+- echo "configure: 39038: $i/$j" >&5
++ echo "configure: 42236: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38910,7 +42024,7 @@
+@@ -39051,7 +42249,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38913: $i/$j" >&5
-+ echo "configure: 42027: $i/$j" >&5
+- echo "configure: 39054: $i/$j" >&5
++ echo "configure: 42252: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38938,7 +42052,7 @@
+@@ -39079,7 +42277,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38941: $i/$j" >&5
-+ echo "configure: 42055: $i/$j" >&5
+- echo "configure: 39082: $i/$j" >&5
++ echo "configure: 42280: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38954,8 +42068,8 @@
+@@ -39095,8 +42293,8 @@
PYTHONMODDIR=$python_moddir
@@ -40932,7 +41455,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38968,11 +42082,11 @@
+@@ -39109,11 +42307,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -40948,7 +41471,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -39006,24 +42120,36 @@
+@@ -39147,24 +42345,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40993,7 +41516,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39032,10 +42158,11 @@
+@@ -39173,10 +42383,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41003,11 +41526,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39045,16 +42172,16 @@
+@@ -39186,16 +42397,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -41028,7 +41551,7 @@
fi
-@@ -39065,11 +42192,11 @@
+@@ -39206,11 +42417,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -41044,7 +41567,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -39103,24 +42230,36 @@
+@@ -39244,24 +42455,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41089,7 +41612,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39129,10 +42268,11 @@
+@@ -39270,10 +42493,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41099,11 +41622,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39142,16 +42282,16 @@
+@@ -39283,16 +42507,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -41124,7 +41647,7 @@
fi
-@@ -39162,11 +42302,11 @@
+@@ -39303,11 +42527,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -41140,7 +41663,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -39200,24 +42340,36 @@
+@@ -39341,24 +42565,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41185,7 +41708,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39226,10 +42378,11 @@
+@@ -39367,10 +42603,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41195,11 +41718,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39239,16 +42392,16 @@
+@@ -39380,16 +42617,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -41220,7 +41743,7 @@
fi
-@@ -39259,11 +42412,11 @@
+@@ -39400,11 +42637,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -41236,7 +41759,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -39297,24 +42450,36 @@
+@@ -39438,24 +42675,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41281,7 +41804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39323,10 +42488,11 @@
+@@ -39464,10 +42713,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41291,11 +41814,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39336,16 +42502,16 @@
+@@ -39477,16 +42727,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -41316,7 +41839,7 @@
fi
-@@ -39356,11 +42522,11 @@
+@@ -39497,11 +42747,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -41332,7 +41855,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -39394,24 +42560,36 @@
+@@ -39535,24 +42785,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41377,7 +41900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39420,10 +42598,11 @@
+@@ -39561,10 +42823,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41387,11 +41910,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39433,16 +42612,16 @@
+@@ -39574,16 +42837,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -41412,7 +41935,7 @@
fi
-@@ -39453,11 +42632,11 @@
+@@ -39594,11 +42857,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -41428,7 +41951,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -39491,24 +42670,36 @@
+@@ -39632,24 +42895,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41473,7 +41996,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39517,10 +42708,11 @@
+@@ -39658,10 +42933,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41483,11 +42006,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39530,16 +42722,16 @@
+@@ -39671,16 +42947,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -41508,7 +42031,7 @@
fi
-@@ -39550,11 +42742,11 @@
+@@ -39691,11 +42967,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -41524,7 +42047,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -39588,24 +42780,36 @@
+@@ -39729,24 +43005,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41569,7 +42092,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39614,10 +42818,11 @@
+@@ -39755,10 +43043,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41579,11 +42102,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39627,16 +42832,16 @@
+@@ -39768,16 +43057,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -41604,7 +42127,7 @@
fi
-@@ -39647,11 +42852,11 @@
+@@ -39788,11 +43077,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -41620,7 +42143,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -39685,24 +42890,36 @@
+@@ -39826,24 +43115,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41665,7 +42188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39711,10 +42928,11 @@
+@@ -39852,10 +43153,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41675,11 +42198,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39724,16 +42942,16 @@
+@@ -39865,16 +43167,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -41700,7 +42223,7 @@
fi
-@@ -39744,11 +42962,11 @@
+@@ -39885,11 +43187,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -41716,7 +42239,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -39782,24 +43000,36 @@
+@@ -39923,24 +43225,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41761,7 +42284,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39808,10 +43038,11 @@
+@@ -39949,10 +43263,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41771,11 +42294,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39821,16 +43052,16 @@
+@@ -39962,16 +43277,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -41796,7 +42319,7 @@
fi
-@@ -39841,11 +43072,11 @@
+@@ -39982,11 +43297,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -41812,7 +42335,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -39879,24 +43110,36 @@
+@@ -40020,24 +43335,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41857,7 +42380,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39905,10 +43148,11 @@
+@@ -40046,10 +43373,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41867,11 +42390,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -39918,16 +43162,16 @@
+@@ -40059,16 +43387,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -41892,7 +42415,7 @@
fi
-@@ -39938,11 +43182,11 @@
+@@ -40079,11 +43407,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -41908,7 +42431,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -39976,24 +43220,36 @@
+@@ -40117,24 +43445,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41953,7 +42476,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40002,10 +43258,11 @@
+@@ -40143,10 +43483,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41963,11 +42486,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40015,16 +43272,16 @@
+@@ -40156,16 +43497,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -41988,7 +42511,7 @@
fi
-@@ -40035,11 +43292,11 @@
+@@ -40176,11 +43517,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -42004,7 +42527,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -40073,24 +43330,36 @@
+@@ -40214,24 +43555,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42049,7 +42572,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40099,10 +43368,11 @@
+@@ -40240,10 +43593,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42059,11 +42582,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40112,16 +43382,16 @@
+@@ -40253,16 +43607,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -42084,7 +42607,7 @@
fi
-@@ -40132,11 +43402,11 @@
+@@ -40273,11 +43627,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -42100,7 +42623,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -40170,24 +43440,36 @@
+@@ -40311,24 +43665,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42145,7 +42668,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40196,10 +43478,11 @@
+@@ -40337,10 +43703,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42155,11 +42678,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40209,16 +43492,16 @@
+@@ -40350,16 +43717,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -42180,7 +42703,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -40251,11 +43534,11 @@
+@@ -40392,11 +43759,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -42196,7 +42719,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -40289,24 +43572,36 @@
+@@ -40430,24 +43797,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42241,7 +42764,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40315,10 +43610,11 @@
+@@ -40456,10 +43835,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42251,11 +42774,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40328,16 +43624,16 @@
+@@ -40469,16 +43849,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -42276,7 +42799,7 @@
fi
-@@ -40348,11 +43644,11 @@
+@@ -40489,11 +43869,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -42292,7 +42815,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -40386,24 +43682,36 @@
+@@ -40527,24 +43907,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42337,7 +42860,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40412,10 +43720,11 @@
+@@ -40553,10 +43945,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42347,11 +42870,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40425,16 +43734,16 @@
+@@ -40566,16 +43959,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -42372,7 +42895,7 @@
fi
-@@ -40445,11 +43754,11 @@
+@@ -40586,11 +43979,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -42388,7 +42911,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -40483,24 +43792,36 @@
+@@ -40624,24 +44017,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42433,7 +42956,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40509,10 +43830,11 @@
+@@ -40650,10 +44055,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42443,11 +42966,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40522,16 +43844,16 @@
+@@ -40663,16 +44069,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -42468,7 +42991,7 @@
fi
-@@ -40542,11 +43864,11 @@
+@@ -40683,11 +44089,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -42484,7 +43007,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -40580,24 +43902,36 @@
+@@ -40721,24 +44127,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42529,7 +43052,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40606,10 +43940,11 @@
+@@ -40747,10 +44165,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42539,11 +43062,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40619,16 +43954,16 @@
+@@ -40760,16 +44179,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -42564,7 +43087,7 @@
fi
-@@ -40639,11 +43974,11 @@
+@@ -40780,11 +44199,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -42580,7 +43103,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -40677,24 +44012,36 @@
+@@ -40818,24 +44237,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42625,7 +43148,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40703,10 +44050,11 @@
+@@ -40844,10 +44275,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42635,11 +43158,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40716,16 +44064,16 @@
+@@ -40857,16 +44289,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -42660,7 +43183,7 @@
fi
-@@ -40736,11 +44084,11 @@
+@@ -40877,11 +44309,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -42676,7 +43199,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -40774,24 +44122,36 @@
+@@ -40915,24 +44347,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42721,7 +43244,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40800,10 +44160,11 @@
+@@ -40941,10 +44385,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42731,11 +43254,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40813,16 +44174,16 @@
+@@ -40954,16 +44399,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -42756,7 +43279,7 @@
fi
-@@ -40833,11 +44194,11 @@
+@@ -40974,11 +44419,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -42772,7 +43295,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -40871,24 +44232,36 @@
+@@ -41012,24 +44457,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42817,7 +43340,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40897,10 +44270,11 @@
+@@ -41038,10 +44495,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42827,11 +43350,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -40910,16 +44284,16 @@
+@@ -41051,16 +44509,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -42852,7 +43375,7 @@
fi
-@@ -40930,11 +44304,11 @@
+@@ -41071,11 +44529,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -42868,7 +43391,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -40968,24 +44342,36 @@
+@@ -41109,24 +44567,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42913,7 +43436,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40994,10 +44380,11 @@
+@@ -41135,10 +44605,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42923,11 +43446,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41007,16 +44394,16 @@
+@@ -41148,16 +44619,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -42948,7 +43471,7 @@
fi
-@@ -41027,11 +44414,11 @@
+@@ -41168,11 +44639,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -42964,7 +43487,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -41065,24 +44452,36 @@
+@@ -41206,24 +44677,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43009,7 +43532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41091,10 +44490,11 @@
+@@ -41232,10 +44715,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43019,11 +43542,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41104,16 +44504,16 @@
+@@ -41245,16 +44729,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -43044,7 +43567,7 @@
fi
-@@ -41124,11 +44524,11 @@
+@@ -41265,11 +44749,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -43060,7 +43583,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -41162,24 +44562,36 @@
+@@ -41303,24 +44787,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43105,7 +43628,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41188,10 +44600,11 @@
+@@ -41329,10 +44825,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43115,11 +43638,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41201,16 +44614,16 @@
+@@ -41342,16 +44839,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -43140,7 +43663,7 @@
fi
-@@ -41221,11 +44634,11 @@
+@@ -41362,11 +44859,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -43156,7 +43679,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -41259,24 +44672,36 @@
+@@ -41400,24 +44897,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43201,7 +43724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41285,10 +44710,11 @@
+@@ -41426,10 +44935,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43211,11 +43734,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41298,16 +44724,16 @@
+@@ -41439,16 +44949,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -43236,7 +43759,7 @@
fi
-@@ -41318,11 +44744,11 @@
+@@ -41459,11 +44969,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -43252,7 +43775,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -41356,24 +44782,36 @@
+@@ -41497,24 +45007,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43297,7 +43820,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41382,10 +44820,11 @@
+@@ -41523,10 +45045,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43307,11 +43830,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41395,16 +44834,16 @@
+@@ -41536,16 +45059,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -43332,7 +43855,7 @@
fi
-@@ -41415,11 +44854,11 @@
+@@ -41556,11 +45079,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -43348,7 +43871,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -41453,24 +44892,36 @@
+@@ -41594,24 +45117,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43393,7 +43916,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41479,10 +44930,11 @@
+@@ -41620,10 +45155,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43403,11 +43926,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41492,16 +44944,16 @@
+@@ -41633,16 +45169,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -43428,7 +43951,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -41535,11 +44987,11 @@
+@@ -41676,11 +45212,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -43444,7 +43967,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -41573,24 +45025,36 @@
+@@ -41714,24 +45250,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43489,7 +44012,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41599,10 +45063,11 @@
+@@ -41740,10 +45288,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43499,11 +44022,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41612,16 +45077,16 @@
+@@ -41753,16 +45302,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -43524,7 +44047,7 @@
fi
-@@ -41632,11 +45097,11 @@
+@@ -41773,11 +45322,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -43540,7 +44063,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -41670,24 +45135,36 @@
+@@ -41811,24 +45360,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43585,7 +44108,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41696,10 +45173,11 @@
+@@ -41837,10 +45398,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43595,11 +44118,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41709,16 +45187,16 @@
+@@ -41850,16 +45412,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -43620,7 +44143,7 @@
fi
-@@ -41729,11 +45207,11 @@
+@@ -41870,11 +45432,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -43636,7 +44159,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -41767,24 +45245,36 @@
+@@ -41908,24 +45470,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43681,7 +44204,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41793,10 +45283,11 @@
+@@ -41934,10 +45508,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43691,11 +44214,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41806,16 +45297,16 @@
+@@ -41947,16 +45522,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -43716,7 +44239,7 @@
fi
-@@ -41826,11 +45317,11 @@
+@@ -41967,11 +45542,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -43732,7 +44255,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -41864,24 +45355,36 @@
+@@ -42005,24 +45580,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43777,7 +44300,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41890,10 +45393,11 @@
+@@ -42031,10 +45618,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43787,11 +44310,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -41903,16 +45407,16 @@
+@@ -42044,16 +45632,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -43812,7 +44335,7 @@
fi
-@@ -41923,11 +45427,11 @@
+@@ -42064,11 +45652,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -43828,7 +44351,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -41961,24 +45465,36 @@
+@@ -42102,24 +45690,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43873,7 +44396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41987,10 +45503,11 @@
+@@ -42128,10 +45728,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43883,11 +44406,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42000,16 +45517,16 @@
+@@ -42141,16 +45742,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -43908,7 +44431,7 @@
fi
-@@ -42020,11 +45537,11 @@
+@@ -42161,11 +45762,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -43924,7 +44447,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -42058,24 +45575,36 @@
+@@ -42199,24 +45800,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43969,7 +44492,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42084,10 +45613,11 @@
+@@ -42225,10 +45838,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43979,11 +44502,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42097,16 +45627,16 @@
+@@ -42238,16 +45852,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -44004,7 +44527,7 @@
fi
-@@ -42117,11 +45647,11 @@
+@@ -42258,11 +45872,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -44020,7 +44543,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -42155,24 +45685,36 @@
+@@ -42296,24 +45910,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44065,7 +44588,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42181,10 +45723,11 @@
+@@ -42322,10 +45948,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44075,11 +44598,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42194,16 +45737,16 @@
+@@ -42335,16 +45962,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -44100,7 +44623,7 @@
fi
-@@ -42214,11 +45757,11 @@
+@@ -42355,11 +45982,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -44116,7 +44639,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -42252,24 +45795,36 @@
+@@ -42393,24 +46020,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44161,7 +44684,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42278,10 +45833,11 @@
+@@ -42419,10 +46058,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44171,11 +44694,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42291,16 +45847,16 @@
+@@ -42432,16 +46072,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -44196,7 +44719,7 @@
fi
-@@ -42311,11 +45867,11 @@
+@@ -42452,11 +46092,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -44212,7 +44735,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -42349,24 +45905,36 @@
+@@ -42490,24 +46130,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44257,7 +44780,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42375,10 +45943,11 @@
+@@ -42516,10 +46168,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44267,11 +44790,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42388,16 +45957,16 @@
+@@ -42529,16 +46182,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -44292,7 +44815,7 @@
fi
-@@ -42408,11 +45977,11 @@
+@@ -42549,11 +46202,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -44308,7 +44831,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -42446,24 +46015,36 @@
+@@ -42587,24 +46240,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44353,7 +44876,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42472,10 +46053,11 @@
+@@ -42613,10 +46278,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44363,11 +44886,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42485,16 +46067,16 @@
+@@ -42626,16 +46292,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -44388,7 +44911,7 @@
fi
-@@ -42505,11 +46087,11 @@
+@@ -42646,11 +46312,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -44404,7 +44927,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -42543,24 +46125,36 @@
+@@ -42684,24 +46350,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44449,7 +44972,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42569,10 +46163,11 @@
+@@ -42710,10 +46388,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44459,11 +44982,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42582,16 +46177,16 @@
+@@ -42723,16 +46402,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -44484,7 +45007,7 @@
fi
-@@ -42602,11 +46197,11 @@
+@@ -42743,11 +46422,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -44500,7 +45023,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -42640,24 +46235,36 @@
+@@ -42781,24 +46460,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44545,7 +45068,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42666,10 +46273,11 @@
+@@ -42807,10 +46498,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44555,11 +45078,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42679,16 +46287,16 @@
+@@ -42820,16 +46512,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -44580,7 +45103,7 @@
fi
-@@ -42699,11 +46307,11 @@
+@@ -42840,11 +46532,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -44596,7 +45119,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -42737,24 +46345,36 @@
+@@ -42878,24 +46570,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44641,7 +45164,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42763,10 +46383,11 @@
+@@ -42904,10 +46608,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44651,11 +45174,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42776,16 +46397,16 @@
+@@ -42917,16 +46622,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -44676,7 +45199,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -42819,11 +46440,11 @@
+@@ -42960,11 +46665,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -44692,7 +45215,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -42857,24 +46478,36 @@
+@@ -42998,24 +46703,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44737,7 +45260,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42883,10 +46516,11 @@
+@@ -43024,10 +46741,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44747,11 +45270,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42896,16 +46530,16 @@
+@@ -43037,16 +46755,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -44772,7 +45295,7 @@
fi
-@@ -42916,11 +46550,11 @@
+@@ -43057,11 +46775,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -44788,7 +45311,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -42954,24 +46588,36 @@
+@@ -43095,24 +46813,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44833,7 +45356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42980,10 +46626,11 @@
+@@ -43121,10 +46851,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44843,11 +45366,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -42993,16 +46640,16 @@
+@@ -43134,16 +46865,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -44868,7 +45391,7 @@
fi
-@@ -43013,11 +46660,11 @@
+@@ -43154,11 +46885,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -44884,7 +45407,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -43051,24 +46698,36 @@
+@@ -43192,24 +46923,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44929,7 +45452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43077,10 +46736,11 @@
+@@ -43218,10 +46961,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44939,11 +45462,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43090,16 +46750,16 @@
+@@ -43231,16 +46975,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -44964,7 +45487,7 @@
fi
-@@ -43110,11 +46770,11 @@
+@@ -43251,11 +46995,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -44980,7 +45503,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -43148,24 +46808,36 @@
+@@ -43289,24 +47033,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45025,7 +45548,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43174,10 +46846,11 @@
+@@ -43315,10 +47071,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45035,11 +45558,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43187,16 +46860,16 @@
+@@ -43328,16 +47085,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -45060,7 +45583,7 @@
fi
-@@ -43207,11 +46880,11 @@
+@@ -43348,11 +47105,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -45076,7 +45599,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -43245,24 +46918,36 @@
+@@ -43386,24 +47143,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45121,7 +45644,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43271,10 +46956,11 @@
+@@ -43412,10 +47181,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45131,11 +45654,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43284,16 +46970,16 @@
+@@ -43425,16 +47195,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -45156,7 +45679,7 @@
fi
-@@ -43304,11 +46990,11 @@
+@@ -43445,11 +47215,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -45172,7 +45695,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -43342,24 +47028,36 @@
+@@ -43483,24 +47253,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45217,7 +45740,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43368,10 +47066,11 @@
+@@ -43509,10 +47291,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45227,11 +45750,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43381,16 +47080,16 @@
+@@ -43522,16 +47305,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -45252,7 +45775,7 @@
fi
-@@ -43401,11 +47100,11 @@
+@@ -43542,11 +47325,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -45268,7 +45791,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -43439,24 +47138,36 @@
+@@ -43580,24 +47363,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45313,7 +45836,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43465,10 +47176,11 @@
+@@ -43606,10 +47401,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45323,11 +45846,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43478,16 +47190,16 @@
+@@ -43619,16 +47415,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -45348,7 +45871,7 @@
fi
-@@ -43498,11 +47210,11 @@
+@@ -43639,11 +47435,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -45364,7 +45887,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -43536,24 +47248,36 @@
+@@ -43677,24 +47473,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45409,7 +45932,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43562,10 +47286,11 @@
+@@ -43703,10 +47511,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45419,11 +45942,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43575,16 +47300,16 @@
+@@ -43716,16 +47525,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -45444,7 +45967,7 @@
fi
-@@ -43595,11 +47320,11 @@
+@@ -43736,11 +47545,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -45460,7 +45983,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -43633,24 +47358,36 @@
+@@ -43774,24 +47583,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45505,7 +46028,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43659,10 +47396,11 @@
+@@ -43800,10 +47621,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45515,11 +46038,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43672,16 +47410,16 @@
+@@ -43813,16 +47635,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -45540,7 +46063,7 @@
fi
-@@ -43692,11 +47430,11 @@
+@@ -43833,11 +47655,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -45556,7 +46079,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -43730,24 +47468,36 @@
+@@ -43871,24 +47693,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45601,7 +46124,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43756,10 +47506,11 @@
+@@ -43897,10 +47731,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45611,11 +46134,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43769,16 +47520,16 @@
+@@ -43910,16 +47745,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -45636,7 +46159,7 @@
fi
-@@ -43789,11 +47540,11 @@
+@@ -43930,11 +47765,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -45652,7 +46175,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -43827,24 +47578,36 @@
+@@ -43968,24 +47803,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45697,7 +46220,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43853,10 +47616,11 @@
+@@ -43994,10 +47841,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45707,11 +46230,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43866,16 +47630,16 @@
+@@ -44007,16 +47855,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -45732,7 +46255,7 @@
fi
-@@ -43886,11 +47650,11 @@
+@@ -44027,11 +47875,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -45748,7 +46271,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -43924,24 +47688,36 @@
+@@ -44065,24 +47913,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45793,7 +46316,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43950,10 +47726,11 @@
+@@ -44091,10 +47951,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45803,11 +46326,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -43963,16 +47740,16 @@
+@@ -44104,16 +47965,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -45828,7 +46351,7 @@
fi
-@@ -43983,11 +47760,11 @@
+@@ -44124,11 +47985,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -45844,7 +46367,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -44021,24 +47798,36 @@
+@@ -44162,24 +48023,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45889,7 +46412,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44047,10 +47836,11 @@
+@@ -44188,10 +48061,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45899,11 +46422,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44060,16 +47850,16 @@
+@@ -44201,16 +48075,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -45924,7 +46447,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -44103,11 +47893,11 @@
+@@ -44244,11 +48118,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -45940,7 +46463,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -44141,24 +47931,36 @@
+@@ -44282,24 +48156,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45985,7 +46508,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44167,10 +47969,11 @@
+@@ -44308,10 +48194,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45995,11 +46518,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44180,16 +47983,16 @@
+@@ -44321,16 +48208,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -46020,7 +46543,7 @@
fi
-@@ -44200,11 +48003,11 @@
+@@ -44341,11 +48228,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -46036,7 +46559,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -44238,24 +48041,36 @@
+@@ -44379,24 +48266,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46081,7 +46604,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44264,10 +48079,11 @@
+@@ -44405,10 +48304,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46091,11 +46614,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44277,16 +48093,16 @@
+@@ -44418,16 +48318,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -46116,7 +46639,7 @@
fi
-@@ -44297,11 +48113,11 @@
+@@ -44438,11 +48338,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -46132,7 +46655,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -44335,24 +48151,36 @@
+@@ -44476,24 +48376,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46177,7 +46700,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44361,10 +48189,11 @@
+@@ -44502,10 +48414,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46187,11 +46710,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44374,16 +48203,16 @@
+@@ -44515,16 +48428,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -46212,7 +46735,7 @@
fi
-@@ -44394,11 +48223,11 @@
+@@ -44535,11 +48448,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -46228,7 +46751,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -44432,24 +48261,36 @@
+@@ -44573,24 +48486,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46273,7 +46796,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44458,10 +48299,11 @@
+@@ -44599,10 +48524,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46283,11 +46806,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44471,16 +48313,16 @@
+@@ -44612,16 +48538,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -46308,7 +46831,7 @@
fi
-@@ -44491,11 +48333,11 @@
+@@ -44632,11 +48558,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -46324,7 +46847,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -44529,24 +48371,36 @@
+@@ -44670,24 +48596,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46369,7 +46892,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44555,10 +48409,11 @@
+@@ -44696,10 +48634,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46379,11 +46902,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44568,16 +48423,16 @@
+@@ -44709,16 +48648,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -46404,7 +46927,7 @@
fi
-@@ -44588,11 +48443,11 @@
+@@ -44729,11 +48668,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -46420,7 +46943,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -44626,24 +48481,36 @@
+@@ -44767,24 +48706,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46465,7 +46988,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44652,10 +48519,11 @@
+@@ -44793,10 +48744,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46475,11 +46998,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44665,16 +48533,16 @@
+@@ -44806,16 +48758,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -46500,7 +47023,7 @@
fi
-@@ -44685,11 +48553,11 @@
+@@ -44826,11 +48778,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -46516,7 +47039,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -44723,24 +48591,36 @@
+@@ -44864,24 +48816,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46561,7 +47084,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44749,10 +48629,11 @@
+@@ -44890,10 +48854,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46571,11 +47094,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44762,16 +48643,16 @@
+@@ -44903,16 +48868,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -46596,7 +47119,7 @@
fi
-@@ -44782,11 +48663,11 @@
+@@ -44923,11 +48888,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -46612,7 +47135,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -44820,24 +48701,36 @@
+@@ -44961,24 +48926,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46657,7 +47180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44846,10 +48739,11 @@
+@@ -44987,10 +48964,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46667,11 +47190,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44859,16 +48753,16 @@
+@@ -45000,16 +48978,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -46692,7 +47215,7 @@
fi
-@@ -44879,11 +48773,11 @@
+@@ -45020,11 +48998,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -46708,7 +47231,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -44917,24 +48811,36 @@
+@@ -45058,24 +49036,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46753,7 +47276,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44943,10 +48849,11 @@
+@@ -45084,10 +49074,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46763,11 +47286,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -44956,16 +48863,16 @@
+@@ -45097,16 +49088,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -46788,7 +47311,7 @@
fi
-@@ -44976,11 +48883,11 @@
+@@ -45117,11 +49108,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -46804,7 +47327,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -45014,24 +48921,36 @@
+@@ -45155,24 +49146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46849,7 +47372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45040,10 +48959,11 @@
+@@ -45181,10 +49184,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46859,11 +47382,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45053,16 +48973,16 @@
+@@ -45194,16 +49198,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -46884,7 +47407,7 @@
fi
-@@ -45073,11 +48993,11 @@
+@@ -45214,11 +49218,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -46900,7 +47423,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -45111,24 +49031,36 @@
+@@ -45252,24 +49256,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46945,7 +47468,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45137,10 +49069,11 @@
+@@ -45278,10 +49294,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46955,11 +47478,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45150,16 +49083,16 @@
+@@ -45291,16 +49308,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -46980,7 +47503,7 @@
fi
-@@ -45170,11 +49103,11 @@
+@@ -45311,11 +49328,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -46996,7 +47519,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -45208,24 +49141,36 @@
+@@ -45349,24 +49366,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47041,7 +47564,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45234,10 +49179,11 @@
+@@ -45375,10 +49404,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47051,11 +47574,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45247,16 +49193,16 @@
+@@ -45388,16 +49418,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -47076,7 +47599,7 @@
fi
-@@ -45267,11 +49213,11 @@
+@@ -45408,11 +49438,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -47092,7 +47615,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -45305,24 +49251,36 @@
+@@ -45446,24 +49476,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47137,7 +47660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45331,10 +49289,11 @@
+@@ -45472,10 +49514,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47147,11 +47670,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45344,16 +49303,16 @@
+@@ -45485,16 +49528,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -47172,7 +47695,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -45387,11 +49346,11 @@
+@@ -45528,11 +49571,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -47188,7 +47711,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -45425,24 +49384,36 @@
+@@ -45566,24 +49609,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47233,7 +47756,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45451,10 +49422,11 @@
+@@ -45592,10 +49647,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47243,11 +47766,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45464,16 +49436,16 @@
+@@ -45605,16 +49661,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -47268,7 +47791,7 @@
fi
-@@ -45484,11 +49456,11 @@
+@@ -45625,11 +49681,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -47284,7 +47807,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -45522,24 +49494,36 @@
+@@ -45663,24 +49719,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47329,7 +47852,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45548,10 +49532,11 @@
+@@ -45689,10 +49757,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47339,11 +47862,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45561,16 +49546,16 @@
+@@ -45702,16 +49771,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -47364,7 +47887,7 @@
fi
-@@ -45581,11 +49566,11 @@
+@@ -45722,11 +49791,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -47380,7 +47903,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -45619,24 +49604,36 @@
+@@ -45760,24 +49829,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47425,7 +47948,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45645,10 +49642,11 @@
+@@ -45786,10 +49867,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47435,11 +47958,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45658,16 +49656,16 @@
+@@ -45799,16 +49881,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -47460,7 +47983,7 @@
fi
-@@ -45678,11 +49676,11 @@
+@@ -45819,11 +49901,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -47476,7 +47999,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -45716,24 +49714,36 @@
+@@ -45857,24 +49939,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47521,7 +48044,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45742,10 +49752,11 @@
+@@ -45883,10 +49977,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47531,11 +48054,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45755,16 +49766,16 @@
+@@ -45896,16 +49991,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -47556,7 +48079,7 @@
fi
-@@ -45775,11 +49786,11 @@
+@@ -45916,11 +50011,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -47572,7 +48095,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -45813,24 +49824,36 @@
+@@ -45954,24 +50049,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47617,7 +48140,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45839,10 +49862,11 @@
+@@ -45980,10 +50087,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47627,11 +48150,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45852,16 +49876,16 @@
+@@ -45993,16 +50101,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -47652,7 +48175,7 @@
fi
-@@ -45872,11 +49896,11 @@
+@@ -46013,11 +50121,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -47668,7 +48191,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -45910,24 +49934,36 @@
+@@ -46051,24 +50159,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47713,7 +48236,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45936,10 +49972,11 @@
+@@ -46077,10 +50197,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47723,11 +48246,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -45949,16 +49986,16 @@
+@@ -46090,16 +50211,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -47748,7 +48271,7 @@
fi
-@@ -45969,11 +50006,11 @@
+@@ -46110,11 +50231,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -47764,7 +48287,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -46007,24 +50044,36 @@
+@@ -46148,24 +50269,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47809,7 +48332,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46033,10 +50082,11 @@
+@@ -46174,10 +50307,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47819,11 +48342,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46046,16 +50096,16 @@
+@@ -46187,16 +50321,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -47844,7 +48367,7 @@
fi
-@@ -46066,11 +50116,11 @@
+@@ -46207,11 +50341,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -47860,7 +48383,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -46104,24 +50154,36 @@
+@@ -46245,24 +50379,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47905,7 +48428,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46130,10 +50192,11 @@
+@@ -46271,10 +50417,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47915,11 +48438,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46143,16 +50206,16 @@
+@@ -46284,16 +50431,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -47940,7 +48463,7 @@
fi
-@@ -46163,11 +50226,11 @@
+@@ -46304,11 +50451,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -47956,7 +48479,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -46201,24 +50264,36 @@
+@@ -46342,24 +50489,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48001,7 +48524,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46227,10 +50302,11 @@
+@@ -46368,10 +50527,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48011,11 +48534,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46240,16 +50316,16 @@
+@@ -46381,16 +50541,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -48036,7 +48559,7 @@
fi
-@@ -46260,11 +50336,11 @@
+@@ -46401,11 +50561,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -48052,7 +48575,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -46298,24 +50374,36 @@
+@@ -46439,24 +50599,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48097,7 +48620,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46324,10 +50412,11 @@
+@@ -46465,10 +50637,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48107,11 +48630,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46337,16 +50426,16 @@
+@@ -46478,16 +50651,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -48132,7 +48655,7 @@
fi
-@@ -46357,11 +50446,11 @@
+@@ -46498,11 +50671,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -48148,7 +48671,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -46395,24 +50484,36 @@
+@@ -46536,24 +50709,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48193,7 +48716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46421,10 +50522,11 @@
+@@ -46562,10 +50747,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48203,11 +48726,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46434,16 +50536,16 @@
+@@ -46575,16 +50761,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -48228,7 +48751,7 @@
fi
-@@ -46454,11 +50556,11 @@
+@@ -46595,11 +50781,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -48244,7 +48767,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -46492,24 +50594,36 @@
+@@ -46633,24 +50819,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48289,7 +48812,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46518,10 +50632,11 @@
+@@ -46659,10 +50857,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48299,11 +48822,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46531,16 +50646,16 @@
+@@ -46672,16 +50871,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -48324,7 +48847,7 @@
fi
-@@ -46551,11 +50666,11 @@
+@@ -46692,11 +50891,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -48340,7 +48863,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -46589,24 +50704,36 @@
+@@ -46730,24 +50929,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48385,7 +48908,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46615,10 +50742,11 @@
+@@ -46756,10 +50967,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48395,11 +48918,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
-@@ -46628,16 +50756,16 @@
+@@ -46769,16 +50981,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -48420,10 +48943,1258 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -46668,18 +50796,18 @@
+@@ -46812,11 +51024,11 @@
+ if test "$kde_python_link_found" = no; then
+ if test "normal" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on " >&5
+-echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on " >&5
++echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
+ fi
+ if test "${kde_cv_try_link_python_normal+set}" = set; then
+@@ -46850,24 +51062,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -46876,10 +51100,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-kde_cv_try_link_python_normal=no
++ kde_cv_try_link_python_normal=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -46889,16 +51114,16 @@
+
+
+ if test "$kde_cv_try_link_python_normal" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "normal" = normal; then
+ LIBPYTHON="$LIBPYTHON "
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -46909,11 +51134,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
+-echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
++echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m+set}" = set; then
+@@ -46947,24 +51172,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -46973,10 +51210,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m=no
++ kde_cv_try_link_python_m=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -46986,16 +51224,16 @@
+
+
+ if test "$kde_cv_try_link_python_m" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m" = normal; then
+ LIBPYTHON="$LIBPYTHON -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47006,11 +51244,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread+set}" = set; then
+@@ -47044,24 +51282,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47070,10 +51320,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread=no
++ kde_cv_try_link_python_pthread=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47083,16 +51334,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47103,11 +51354,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "tcl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
+-echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
++echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_tcl+set}" = set; then
+@@ -47141,24 +51392,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47167,10 +51430,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_tcl=no
++ kde_cv_try_link_python_tcl=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47180,16 +51444,16 @@
+
+
+ if test "$kde_cv_try_link_python_tcl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "tcl" = normal; then
+ LIBPYTHON="$LIBPYTHON -ltcl"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47200,11 +51464,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "db2" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
+-echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
++echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_db2+set}" = set; then
+@@ -47238,24 +51502,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47264,10 +51540,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_db2=no
++ kde_cv_try_link_python_db2=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47277,16 +51554,16 @@
+
+
+ if test "$kde_cv_try_link_python_db2" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "db2" = normal; then
+ LIBPYTHON="$LIBPYTHON -ldb2"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47297,11 +51574,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
+@@ -47335,24 +51612,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47361,10 +51650,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread=no
++ kde_cv_try_link_python_m_and_thread=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47374,16 +51664,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47394,11 +51684,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_util" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
+@@ -47432,24 +51722,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47458,10 +51760,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_util=no
++ kde_cv_try_link_python_m_and_thread_and_util=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47471,16 +51774,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_util" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47491,11 +51794,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
+@@ -47529,24 +51832,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47555,10 +51870,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db3=no
++ kde_cv_try_link_python_m_and_thread_and_db3=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47568,16 +51884,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47588,11 +51904,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_db3" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
+@@ -47626,24 +51942,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47652,10 +51980,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_db3=no
++ kde_cv_try_link_python_pthread_and_db3=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47665,16 +51994,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_db3" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47685,11 +52014,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
+@@ -47723,24 +52052,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47749,10 +52090,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db=no
++ kde_cv_try_link_python_m_and_thread_and_db=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47762,16 +52104,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47782,11 +52124,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_dl" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
+@@ -47820,24 +52162,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47846,10 +52200,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_dl=no
++ kde_cv_try_link_python_pthread_and_dl=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47859,16 +52214,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_dl" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47879,11 +52234,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "pthread_and_panel_curses" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
+@@ -47917,24 +52272,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -47943,10 +52310,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_pthread_and_panel_curses=no
++ kde_cv_try_link_python_pthread_and_panel_curses=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -47956,16 +52324,16 @@
+
+
+ if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "pthread_and_panel_curses" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+
+ fi
+
+@@ -47976,11 +52344,11 @@
+ if test "$kde_python_link_found" = no; then
+
+ if test "m_and_thread_and_db_special" = normal; then
+- echo "$as_me:$LINENO: checking if a Python application links" >&5
+-echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if a Python application links" >&5
++echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
+-echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
++echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
+ fi
+
+ if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
+@@ -48014,24 +52382,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -48040,10 +52420,11 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_try_link_python_m_and_thread_and_db_special=no
++ kde_cv_try_link_python_m_and_thread_and_db_special=no
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -48053,16 +52434,16 @@
+
+
+ if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_python_link_found=yes
+ if test ! "m_and_thread_and_db_special" = normal; then
+ LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
+ fi
+
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
+ Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
+ and contact the authors to let them know about this problem" >&5
+@@ -48093,18 +52474,18 @@
+
+
+
-# Check whether --with-xmms or --without-xmms was given.
+# Check whether --with-xmms was given.
if test "${with_xmms+set}" = set; then
@@ -48445,7 +50216,7 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46706,24 +50834,36 @@
+@@ -48131,24 +52512,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48490,7 +50261,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46732,10 +50872,11 @@
+@@ -48157,10 +52550,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48500,11 +50271,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
LDFLAGS="$ac_LDFLAGS_save"
-@@ -46743,8 +50884,8 @@
+@@ -48168,8 +52562,8 @@
fi
@@ -48515,7 +50286,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -46785,8 +50926,8 @@
+@@ -48210,8 +52604,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -48526,7 +50297,7 @@
if test "${ac_cv_lib_knewstuff_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46803,30 +50944,42 @@
+@@ -48228,30 +52622,42 @@
int
main ()
{
@@ -48578,7 +50349,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46835,14 +50988,15 @@
+@@ -48260,14 +52666,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48587,7 +50358,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -48598,7 +50369,7 @@
if test $ac_cv_lib_knewstuff_main = yes; then
MY_LIBKNEWSTUFF="-lknewstuff"
else
-@@ -46861,8 +51015,8 @@
+@@ -48286,8 +52693,8 @@
fi
@@ -48609,7 +50380,7 @@
if test "${ac_cv_lib_kvm_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46879,30 +51033,42 @@
+@@ -48304,30 +52711,42 @@
int
main ()
{
@@ -48661,7 +50432,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46911,14 +51077,15 @@
+@@ -48336,14 +52755,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48670,7 +50441,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -48681,7 +50452,7 @@
if test $ac_cv_lib_kvm_main = yes; then
LIBKVM="-lkvm"
fi
-@@ -46948,8 +51115,8 @@
+@@ -48373,8 +52793,8 @@
fi
for i in $ac_topsubdirs; do
@@ -48692,7 +50463,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -46960,8 +51127,8 @@
+@@ -48385,8 +52805,8 @@
else
install_it="no"
fi
@@ -48703,7 +50474,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -47173,221 +51340,221 @@
+@@ -48598,221 +53018,221 @@
superkaramba_SUBDIR_included_FALSE=
fi
@@ -49033,7 +50804,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -47407,39 +51574,58 @@
+@@ -48832,39 +53252,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -49108,7 +50879,7 @@
fi
fi
rm -f confcache
-@@ -47448,38 +51634,31 @@
+@@ -48873,38 +53312,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -49160,7 +50931,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
-@@ -47742,11 +51921,35 @@
+@@ -49167,11 +53599,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -49198,7 +50969,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -47755,8 +51958,43 @@
+@@ -49180,8 +53636,43 @@
fi
@@ -49243,7 +51014,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -47770,18 +52008,19 @@
+@@ -49195,18 +53686,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -49266,7 +51037,7 @@
as_basename=basename
else
as_basename=false
-@@ -47789,159 +52028,120 @@
+@@ -49214,159 +53706,120 @@
# Name of the executable.
@@ -49497,7 +51268,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -47950,7 +52150,19 @@
+@@ -49375,7 +53828,19 @@
as_mkdir_p=false
fi
@@ -49518,7 +51289,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -47959,31 +52171,14 @@
+@@ -49384,31 +53849,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -49550,11 +51321,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -47991,30 +52186,20 @@
+@@ -49416,30 +53864,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -49593,7 +51364,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -48041,19 +52226,21 @@
+@@ -49447,7 +53885,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -49466,19 +53904,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -49605,7 +51385,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -49621,7 +51401,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -48064,39 +52251,24 @@
+@@ -49489,39 +53929,24 @@
do
case $1 in
--*=*)
@@ -49667,7 +51447,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -48106,18 +52278,24 @@
+@@ -49531,18 +53956,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -49697,7 +51477,7 @@
esac
shift
-@@ -48133,144 +52311,156 @@
+@@ -49558,144 +53989,156 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -49972,7 +51752,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -48282,566 +52472,758 @@
+@@ -49707,566 +54150,758 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -51236,7 +53016,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -48849,248 +53231,130 @@
+@@ -50274,248 +54909,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -51586,7 +53366,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -49101,135 +53365,39 @@
+@@ -50526,135 +55043,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -51748,7 +53528,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -49239,18 +53407,29 @@
+@@ -50664,18 +55085,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -51786,7 +53566,7 @@
else
continue
fi
-@@ -49272,53 +53451,79 @@
+@@ -50697,53 +55129,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -51899,7 +53679,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeutils, "3.5.5") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -63149,8 +64929,8 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+-KDE_DIST=Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list