rev 3809 - in trunk/packages/kdelibs/debian: . patches
Pierre Habouzit
madcoder at costa.debian.org
Wed May 24 10:01:24 UTC 2006
Author: madcoder
Date: 2006-05-24 09:59:23 +0000 (Wed, 24 May 2006)
New Revision: 3809
Removed:
trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r523640.diff
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
prepare 3.5.3 kdelibs
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2006-05-24 09:51:01 UTC (rev 3808)
+++ trunk/packages/kdelibs/debian/changelog 2006-05-24 09:59:23 UTC (rev 3809)
@@ -1,3 +1,14 @@
+kdelibs (4:3.5.3-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + fix crashes in konqueror (closes: #356876).
+
+ +++ Changes by Pierre Habouzit:
+
+ * remove branch pulls patches.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 24 May 2006 11:53:24 +0200
+
kdelibs (4:3.5.2-2) unstable; urgency=low
* KDE_3_5_BRANCH update (up to r526316). Contains important fixes for khtml.
Deleted: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r523640.diff
Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-05-24 09:51:01 UTC (rev 3808)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-05-24 09:59:23 UTC (rev 3809)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,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)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,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.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,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"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,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*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,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
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,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
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,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*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
esac
;;
*64-bit*)
@@ -220,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,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)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,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)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,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
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,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
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,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*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,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.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,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
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,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 :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,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
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,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"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,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(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,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)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,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*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,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 &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,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
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
;;
beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,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}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,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'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
;;
esac
;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,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"`
-@@ -7244,20 +7350,17 @@
+@@ -7247,20 +7353,17 @@
dynamic_linker=no
;;
@@ -628,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7275,14 +7378,19 @@
+@@ -7278,14 +7381,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +650,7 @@
esac
;;
-@@ -7302,9 +7410,9 @@
+@@ -7305,9 +7413,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
-@@ -7319,7 +7427,7 @@
+@@ -7322,7 +7430,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
-@@ -7330,7 +7438,7 @@
+@@ -7333,7 +7441,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
-@@ -7342,6 +7450,18 @@
+@@ -7345,6 +7453,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7385,29 +7505,26 @@
+@@ -7388,29 +7508,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,
-@@ -7417,6 +7534,18 @@
+@@ -7420,6 +7537,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7426,7 +7555,7 @@
+@@ -7429,7 +7558,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
-@@ -7454,8 +7583,13 @@
+@@ -7457,8 +7586,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
-@@ -7475,7 +7609,7 @@
+@@ -7478,7 +7612,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'
-@@ -7493,13 +7627,6 @@
+@@ -7496,13 +7630,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7525,7 +7652,7 @@
+@@ -7528,7 +7655,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'
-@@ -7558,6 +7685,29 @@
+@@ -7561,6 +7688,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}'
-@@ -7571,6 +7721,11 @@
+@@ -7574,6 +7724,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7595,6 +7750,9 @@
+@@ -7598,6 +7753,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.
-@@ -7621,7 +7779,9 @@
+@@ -7624,7 +7782,9 @@
case $tagname in
CXX)
@@ -874,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7683,7 +7843,7 @@
+@@ -7686,7 +7846,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
-@@ -7721,7 +7881,7 @@
+@@ -7724,7 +7884,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +892,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7857,7 +8017,7 @@
+@@ -7860,7 +8020,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
-@@ -7967,7 +8127,7 @@
+@@ -7970,7 +8130,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'*)
-@@ -7999,7 +8159,7 @@
+@@ -8002,7 +8162,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
-@@ -8026,6 +8186,15 @@
+@@ -8029,6 +8189,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8059,44 +8228,36 @@
+@@ -8062,44 +8231,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.*`
;;
-@@ -8112,7 +8273,7 @@
+@@ -8115,7 +8276,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
-@@ -8128,43 +8289,27 @@
+@@ -8131,43 +8292,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
-@@ -8183,32 +8328,22 @@
+@@ -8186,32 +8331,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]]'
-@@ -8229,10 +8364,13 @@
+@@ -8232,10 +8367,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8252,36 +8390,43 @@
+@@ -8255,36 +8393,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"
-@@ -8313,13 +8458,13 @@
+@@ -8316,13 +8461,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
-@@ -8338,13 +8483,13 @@
+@@ -8341,13 +8486,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
-@@ -8382,10 +8527,21 @@
+@@ -8385,10 +8530,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8425,7 +8581,7 @@
+@@ -8428,7 +8584,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])
-@@ -8458,36 +8614,9 @@
+@@ -8461,36 +8617,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8630,9 @@
+@@ -8504,9 +8633,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])
-@@ -8512,7 +8641,7 @@
+@@ -8515,7 +8644,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
-@@ -8521,48 +8650,11 @@
+@@ -8524,48 +8653,11 @@
fi
;;
@@ -1362,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8587,7 +8679,7 @@
+@@ -8590,7 +8682,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)=
-@@ -8599,6 +8691,7 @@
+@@ -8602,6 +8694,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)=
-@@ -8616,7 +8709,7 @@
+@@ -8619,7 +8712,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
-@@ -8626,11 +8719,15 @@
+@@ -8629,11 +8722,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
-@@ -8641,18 +8738,18 @@
+@@ -8644,18 +8741,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
-@@ -8670,8 +8767,8 @@
+@@ -8673,8 +8770,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'
-@@ -8697,7 +8794,7 @@
+@@ -8700,7 +8797,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
-@@ -8727,11 +8824,26 @@
+@@ -8730,11 +8827,26 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1479,7 +1479,7 @@
# When large executables or shared objects are built, AIX ld can
# have problems creating the table of contents. If linking a library
-@@ -8745,7 +8857,7 @@
+@@ -8748,7 +8860,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1488,7 +1488,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`
-@@ -8764,8 +8876,12 @@
+@@ -8767,8 +8879,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1501,7 +1501,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8774,15 +8890,16 @@
+@@ -8777,15 +8893,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1522,7 +1522,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.
-@@ -8791,13 +8908,12 @@
+@@ -8794,13 +8911,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1538,7 +1538,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8806,16 +8922,26 @@
+@@ -8809,16 +8925,26 @@
# -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'
@@ -1570,7 +1570,7 @@
chorus*)
case $cc_basename in
*)
-@@ -8829,12 +8955,12 @@
+@@ -8832,12 +8958,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'
@@ -1585,7 +1585,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
-@@ -8843,70 +8969,81 @@
+@@ -8846,70 +8972,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1719,7 +1719,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9054,14 @@
+@@ -8920,14 +9057,14 @@
;;
esac
;;
@@ -1736,7 +1736,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9078,12 @@
+@@ -8944,12 +9081,12 @@
# location of the library.
case $cc_basename in
@@ -1752,7 +1752,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8955,11 +9092,11 @@
+@@ -8958,11 +9095,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.
@@ -1766,7 +1766,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,33 +9106,22 @@
+@@ -8972,33 +9109,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1807,7 +1807,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -9006,17 +9132,20 @@
+@@ -9009,17 +9135,20 @@
esac
case $cc_basename in
@@ -1834,7 +1834,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9161,15 @@
+@@ -9035,12 +9164,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1854,7 +1854,7 @@
;;
esac
fi
-@@ -9048,11 +9180,25 @@
+@@ -9051,11 +9183,25 @@
;;
esac
;;
@@ -1882,7 +1882,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9063,9 +9209,9 @@
+@@ -9066,9 +9212,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1894,7 +1894,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9074,16 +9220,16 @@
+@@ -9077,16 +9223,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1915,7 +1915,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9101,20 +9247,44 @@
+@@ -9104,20 +9250,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1966,7 +1966,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9312,7 @@
+@@ -9145,7 +9315,7 @@
;;
mvs*)
case $cc_basename in
@@ -1975,7 +1975,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9152,7 +9322,7 @@
+@@ -9155,7 +9325,7 @@
;;
esac
;;
@@ -1984,7 +1984,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=
-@@ -9163,15 +9333,31 @@
+@@ -9166,15 +9336,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::"'
;;
@@ -2018,7 +2018,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9367,14 @@
+@@ -9184,14 +9370,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2036,7 +2036,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9392,7 @@
+@@ -9209,7 +9395,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2045,7 +2045,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9411,13 @@
+@@ -9228,13 +9414,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2061,7 +2061,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9426,17 @@
+@@ -9243,17 +9429,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2083,7 +2083,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9455,7 @@
+@@ -9272,7 +9458,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2092,7 +2092,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9476,14 @@
+@@ -9293,27 +9479,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2122,7 +2122,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9496,33 @@
+@@ -9326,36 +9499,33 @@
;;
solaris*)
case $cc_basename in
@@ -2171,7 +2171,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9360,9 +9530,9 @@
+@@ -9363,9 +9533,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2183,7 +2183,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9542,9 @@
+@@ -9375,9 +9545,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
@@ -2195,7 +2195,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9553,9 @@
+@@ -9386,9 +9556,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2207,7 +2207,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9568,63 @@
+@@ -9401,12 +9571,63 @@
;;
esac
;;
@@ -2273,7 +2273,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9661,6 @@
+@@ -9443,8 +9664,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2282,7 +2282,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9459,7 +9678,7 @@
+@@ -9462,7 +9681,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2291,7 +2291,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9513,7 +9732,7 @@
+@@ -9516,7 +9735,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.
@@ -2300,7 +2300,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9553,7 +9772,7 @@
+@@ -9556,7 +9775,7 @@
fi
;;
@@ -2309,7 +2309,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9808,37 @@
+@@ -9592,13 +9811,37 @@
$rm -f confest.$objext
@@ -2348,7 +2348,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'.
-@@ -9639,12 +9882,16 @@
+@@ -9642,12 +9885,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2366,7 +2366,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9901,7 @@
+@@ -9657,7 +9904,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2375,7 +2375,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9662,8 +9909,10 @@
+@@ -9665,8 +9912,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2388,7 +2388,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9922,6 @@
+@@ -9676,8 +9925,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2397,7 +2397,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9684,8 +9931,6 @@
+@@ -9687,8 +9934,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2406,7 +2406,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9714,20 +9959,27 @@
+@@ -9717,20 +9962,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2435,7 +2435,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
-@@ -9739,8 +9991,6 @@
+@@ -9742,8 +9994,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2444,7 +2444,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9750,7 +10000,7 @@
+@@ -9753,7 +10003,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2453,7 +2453,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'.
-@@ -9774,11 +10024,16 @@
+@@ -9777,11 +10027,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2470,7 +2470,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10059,12 @@
+@@ -9807,11 +10062,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2485,7 +2485,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 \
-@@ -9858,7 +10114,7 @@
+@@ -9861,7 +10117,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2494,7 +2494,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10180,11 @@
+@@ -9927,11 +10183,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2508,7 +2508,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9959,6 +10215,12 @@
+@@ -9962,6 +10218,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2521,7 +2521,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9970,6 +10232,9 @@
+@@ -9973,6 +10235,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2531,7 +2531,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9989,7 +10254,7 @@
+@@ -9992,7 +10257,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2540,7 +2540,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10285,7 @@
+@@ -10023,7 +10288,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2549,7 +2549,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10035,7 +10300,7 @@
+@@ -10038,7 +10303,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2558,7 +2558,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10264,7 +10529,10 @@
+@@ -10267,7 +10532,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.
@@ -2570,7 +2570,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10306,9 +10574,6 @@
+@@ -10309,9 +10577,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2580,7 +2580,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'"
-@@ -10330,14 +10595,30 @@
+@@ -10333,14 +10598,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'"
;;
@@ -2613,7 +2613,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10355,14 +10636,17 @@
+@@ -10358,14 +10639,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2633,7 +2633,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10518,6 +10802,10 @@
+@@ -10521,6 +10805,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2644,7 +2644,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10814,7 @@
+@@ -10529,7 +10817,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2653,7 +2653,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10551,18 +10839,28 @@
+@@ -10554,18 +10842,28 @@
;;
chorus*)
case $cc_basename in
@@ -2685,7 +2685,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10570,22 +10868,22 @@
+@@ -10573,22 +10871,22 @@
;;
esac
;;
@@ -2714,7 +2714,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10598,9 +10896,13 @@
+@@ -10601,9 +10899,13 @@
;;
esac
;;
@@ -2729,7 +2729,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.
-@@ -10609,20 +10911,26 @@
+@@ -10612,20 +10914,26 @@
;;
esac
;;
@@ -2761,7 +2761,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10947,25 @@
+@@ -10642,25 +10950,25 @@
;;
mvs*)
case $cc_basename in
@@ -2792,7 +2792,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
-@@ -10671,24 +10979,15 @@
+@@ -10674,24 +10982,15 @@
;;
psos*)
;;
@@ -2819,7 +2819,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10698,12 +10997,12 @@
+@@ -10701,12 +11000,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2834,7 +2834,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10713,7 +11012,7 @@
+@@ -10716,7 +11015,7 @@
;;
tandem*)
case $cc_basename in
@@ -2843,7 +2843,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10721,7 +11020,14 @@
+@@ -10724,7 +11023,14 @@
;;
esac
;;
@@ -2859,7 +2859,7 @@
;;
vxworks*)
;;
-@@ -10768,6 +11074,11 @@
+@@ -10771,6 +11077,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2871,7 +2871,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10784,7 +11095,7 @@
+@@ -10787,7 +11098,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2880,7 +2880,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10810,6 +11121,16 @@
+@@ -10813,6 +11124,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2897,7 +2897,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11142,7 @@
+@@ -10824,7 +11145,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.
@@ -2906,7 +2906,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10844,13 +11165,20 @@
+@@ -10847,13 +11168,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2929,7 +2929,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10865,15 +11193,15 @@
+@@ -10868,15 +11196,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2951,7 +2951,7 @@
;;
sunos4*)
-@@ -10882,7 +11210,7 @@
+@@ -10885,7 +11213,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2960,7 +2960,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'
-@@ -10895,6 +11223,17 @@
+@@ -10898,6 +11226,17 @@
fi
;;
@@ -2978,7 +2978,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11261,7 @@
+@@ -10925,7 +11264,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2987,7 +2987,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11270,16 @@
+@@ -10934,6 +11273,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
@@ -3004,7 +3004,7 @@
])
-@@ -10955,7 +11304,10 @@
+@@ -10958,7 +11307,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3016,7 +3016,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11333,7 @@
+@@ -10984,7 +11336,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3025,7 +3025,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*
-@@ -10998,7 +11350,8 @@
+@@ -11001,7 +11353,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3035,7 +3035,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11361,10 @@
+@@ -11011,6 +11364,10 @@
with_gnu_ld=no
fi
;;
@@ -3046,7 +3046,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11018,6 +11375,27 @@
+@@ -11021,6 +11378,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3074,7 +3074,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11055,7 +11433,7 @@
+@@ -11058,7 +11436,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
@@ -3083,7 +3083,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11065,13 +11443,13 @@
+@@ -11068,13 +11446,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'
@@ -3100,7 +3100,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
-@@ -11080,23 +11458,70 @@
+@@ -11083,23 +11461,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3177,7 +3177,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11110,13 +11535,40 @@
+@@ -11113,13 +11538,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3220,7 +3220,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11126,24 +11578,19 @@
+@@ -11129,24 +11581,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3252,7 +3252,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11602,7 @@
+@@ -11158,7 +11605,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
@@ -3261,7 +3261,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11624,21 @@
+@@ -11180,9 +11627,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
@@ -3285,7 +3285,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11196,7 +11655,7 @@
+@@ -11199,7 +11658,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3294,7 +3294,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`
-@@ -11215,8 +11674,12 @@
+@@ -11218,8 +11677,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3307,7 +3307,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11224,30 +11687,30 @@
+@@ -11227,30 +11690,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3349,7 +3349,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11719,11 @@
+@@ -11259,13 +11722,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'
@@ -3366,7 +3366,7 @@
fi
fi
;;
-@@ -11275,7 +11736,7 @@
+@@ -11278,7 +11739,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3375,7 +3375,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11285,69 +11746,69 @@
+@@ -11288,69 +11749,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3491,7 +3491,7 @@
;;
dgux*)
-@@ -11380,8 +11841,8 @@
+@@ -11383,8 +11844,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3502,7 +3502,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
-@@ -11389,7 +11850,7 @@
+@@ -11392,7 +11853,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3511,7 +3511,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
-@@ -11403,47 +11864,62 @@
+@@ -11406,47 +11867,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3598,7 +3598,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11457,7 +11933,7 @@
+@@ -11460,7 +11936,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3607,7 +3607,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'
-@@ -11467,7 +11943,7 @@
+@@ -11470,7 +11946,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3616,7 +3616,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
-@@ -11490,7 +11966,8 @@
+@@ -11493,7 +11969,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
@@ -3626,7 +3626,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11500,7 +11977,7 @@
+@@ -11503,7 +11980,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3635,7 +3635,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11511,14 +11988,14 @@
+@@ -11514,14 +11991,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
@@ -3652,7 +3652,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'
-@@ -11530,13 +12007,13 @@
+@@ -11533,13 +12010,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}\*'
@@ -3668,7 +3668,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12021,15 @@
+@@ -11547,21 +12024,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3694,7 +3694,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'
-@@ -11567,8 +12038,18 @@
+@@ -11570,8 +12041,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3715,7 +3715,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11577,7 +12058,7 @@
+@@ -11580,7 +12061,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.
@@ -3724,7 +3724,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11625,36 +12106,45 @@
+@@ -11628,36 +12109,45 @@
fi
;;
@@ -3791,7 +3791,7 @@
;;
uts4*)
-@@ -11672,11 +12162,6 @@
+@@ -11675,11 +12165,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3803,7 +3803,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11697,13 +12182,14 @@
+@@ -11700,13 +12185,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3819,7 +3819,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11831,7 +12317,7 @@
+@@ -11834,7 +12320,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
@@ -3828,208 +3828,6 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -11,6 +11,163 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT
-+])],
-+ [$4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-+
- # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
-@@ -501,6 +658,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
-
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- arts/kde/Makefile.in
+++ arts/kde/Makefile.in
@@ -143,6 +143,8 @@
@@ -4041,7 +3839,11 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -184,8 +186,6 @@
+@@ -181,11 +183,10 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4050,7 +3852,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -262,7 +262,6 @@
+@@ -262,7 +263,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4058,7 +3860,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -299,6 +298,9 @@
+@@ -299,6 +299,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4068,23 +3870,72 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -354,6 +356,7 @@
+@@ -342,18 +345,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,6 +385,7 @@
+@@ -375,18 +376,23 @@
+ build_vendor = @build_vendor@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+ dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+ dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+ dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -576,7 +580,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -508,6 +514,7 @@
+ libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+ licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+ licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -515,10 +522,12 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -4093,7 +3944,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +618,9 @@
+@@ -614,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4105,61 +3956,111 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -995,18 +999,18 @@
+@@ -960,18 +969,18 @@
+
+
+ #>+ 3
+-kaudiorecordstream.moc: $(srcdir)/kaudiorecordstream.h
+- $(MOC) $(srcdir)/kaudiorecordstream.h -o kaudiorecordstream.moc
++kioinputstream_impl.moc: $(srcdir)/kioinputstream_impl.h
++ $(MOC) $(srcdir)/kioinputstream_impl.h -o kioinputstream_impl.moc
+
+ #>+ 2
+-mocs: kaudiorecordstream.moc
++mocs: kioinputstream_impl.moc
+
+ #>+ 3
+-kioinputstream_impl.moc: $(srcdir)/kioinputstream_impl.h
+- $(MOC) $(srcdir)/kioinputstream_impl.h -o kioinputstream_impl.moc
++kaudiorecordstream.moc: $(srcdir)/kaudiorecordstream.h
++ $(MOC) $(srcdir)/kaudiorecordstream.h -o kaudiorecordstream.moc
+
+ #>+ 2
+-mocs: kioinputstream_impl.moc
++mocs: kaudiorecordstream.moc
+
+ #>+ 3
+ kartsserver.moc: $(srcdir)/kartsserver.h
+@@ -995,13 +1004,6 @@
mocs: kconverttest.moc
#>+ 3
-kvideowidget.moc: $(srcdir)/kvideowidget.h
- $(MOC) $(srcdir)/kvideowidget.h -o kvideowidget.moc
-+kaudioconverter.moc: $(srcdir)/kaudioconverter.h
-+ $(MOC) $(srcdir)/kaudioconverter.h -o kaudioconverter.moc
-
- #>+ 2
+-
+-#>+ 2
-mocs: kvideowidget.moc
-+mocs: kaudioconverter.moc
+-
+-#>+ 3
+ kaudioconverter.moc: $(srcdir)/kaudioconverter.h
+ $(MOC) $(srcdir)/kaudioconverter.h -o kaudioconverter.moc
+@@ -1009,11 +1011,11 @@
+ mocs: kaudioconverter.moc
+
#>+ 3
--kaudioconverter.moc: $(srcdir)/kaudioconverter.h
-- $(MOC) $(srcdir)/kaudioconverter.h -o kaudioconverter.moc
+-kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
+- $(MOC) $(srcdir)/kplayobjectcreator.h -o kplayobjectcreator.moc
+kvideowidget.moc: $(srcdir)/kvideowidget.h
+ $(MOC) $(srcdir)/kvideowidget.h -o kvideowidget.moc
#>+ 2
--mocs: kaudioconverter.moc
+-mocs: kplayobjectcreator.moc
+mocs: kvideowidget.moc
#>+ 3
- kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
-@@ -1030,13 +1034,6 @@
- mocs: kdatarequest_impl.moc
+ kaudioplaystream.moc: $(srcdir)/kaudioplaystream.h
+@@ -1023,18 +1025,18 @@
+ mocs: kaudioplaystream.moc
#>+ 3
+-kdatarequest_impl.moc: $(srcdir)/kdatarequest_impl.h
+- $(MOC) $(srcdir)/kdatarequest_impl.h -o kdatarequest_impl.moc
++kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
++ $(MOC) $(srcdir)/kplayobjectcreator.h -o kplayobjectcreator.moc
+
+ #>+ 2
+-mocs: kdatarequest_impl.moc
++mocs: kplayobjectcreator.moc
+
+ #>+ 3
-kartsdispatcher.moc: $(srcdir)/kartsdispatcher.h
- $(MOC) $(srcdir)/kartsdispatcher.h -o kartsdispatcher.moc
--
--#>+ 2
++kdatarequest_impl.moc: $(srcdir)/kdatarequest_impl.h
++ $(MOC) $(srcdir)/kdatarequest_impl.h -o kdatarequest_impl.moc
+
+ #>+ 2
-mocs: kartsdispatcher.moc
--
--#>+ 3
++mocs: kdatarequest_impl.moc
+
+ #>+ 3
kplayobject.moc: $(srcdir)/kplayobject.h
- $(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
+@@ -1044,18 +1046,18 @@
+ mocs: kplayobject.moc
-@@ -1051,11 +1048,11 @@
- mocs: kplayobjectfactory_p.moc
+ #>+ 3
+-kplayobjectfactory_p.moc: $(srcdir)/kplayobjectfactory_p.h
+- $(MOC) $(srcdir)/kplayobjectfactory_p.h -o kplayobjectfactory_p.moc
++kartsdispatcher.moc: $(srcdir)/kartsdispatcher.h
++ $(MOC) $(srcdir)/kartsdispatcher.h -o kartsdispatcher.moc
+ #>+ 2
+-mocs: kplayobjectfactory_p.moc
++mocs: kartsdispatcher.moc
+
#>+ 3
-kaudioplaystream_p.moc: $(srcdir)/kaudioplaystream_p.h
- $(MOC) $(srcdir)/kaudioplaystream_p.h -o kaudioplaystream_p.moc
-+kartsdispatcher.moc: $(srcdir)/kartsdispatcher.h
-+ $(MOC) $(srcdir)/kartsdispatcher.h -o kartsdispatcher.moc
++kplayobjectfactory_p.moc: $(srcdir)/kplayobjectfactory_p.h
++ $(MOC) $(srcdir)/kplayobjectfactory_p.h -o kplayobjectfactory_p.moc
#>+ 2
-mocs: kaudioplaystream_p.moc
-+mocs: kartsdispatcher.moc
++mocs: kplayobjectfactory_p.moc
#>+ 3
kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
-@@ -1065,11 +1062,18 @@
+@@ -1065,8 +1067,15 @@
mocs: kaudiorecordstream_p.moc
#>+ 3
@@ -4172,29 +4073,25 @@
+#>+ 3
clean-metasources:
- -rm -f kaudiorecordstream.moc kioinputstream_impl.moc kartsserver.moc kartsfloatwatch.moc kconverttest.moc kvideowidget.moc kaudioconverter.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kartsdispatcher.moc kplayobject.moc kplayobjectfactory_p.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
-+ -rm -f kaudiorecordstream.moc kioinputstream_impl.moc kartsserver.moc kartsfloatwatch.moc kconverttest.moc kaudioconverter.moc kvideowidget.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobject.moc kplayobjectfactory_p.moc kartsdispatcher.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
++ -rm -f kioinputstream_impl.moc kaudiorecordstream.moc kartsserver.moc kartsfloatwatch.moc kconverttest.moc kaudioconverter.moc kvideowidget.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobject.moc kartsdispatcher.moc kplayobjectfactory_p.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
#>+ 2
--KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl Makefile.in kaudioconverter.h kdatarequest_impl.h Makefile.am
-+KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl kaudioconverter.h Makefile.in kdatarequest_impl.h Makefile.am
+ KDE_DIST=kconverttest.h kaudiorecordstream_p.h kaudioplaystream_p.h kioinputstream_impl.h artskde.idl Makefile.in kaudioconverter.h kdatarequest_impl.h Makefile.am
+@@ -1117,7 +1126,7 @@
- #>+ 3
- clean-closures:
-@@ -1117,7 +1121,7 @@
-
#>+ 11
-libartskde_la.all_cc.cc: $(srcdir)/Makefile.in artskde.cc $(srcdir)/kplayobject.cc $(srcdir)/kplayobjectfactory.cc $(srcdir)/kartsdispatcher.cc $(srcdir)/kaudioconverter.cc $(srcdir)/kplayobjectcreator.cc kioinputstream_impl.moc kaudiorecordstream.moc kartsfloatwatch.moc kartsserver.moc kaudioconverter.moc kvideowidget.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kplayobject.moc kartsdispatcher.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
-+libartskde_la.all_cc.cc: $(srcdir)/Makefile.in artskde.cc $(srcdir)/kplayobject.cc $(srcdir)/kplayobjectfactory.cc $(srcdir)/kartsdispatcher.cc $(srcdir)/kaudioconverter.cc $(srcdir)/kplayobjectcreator.cc kioinputstream_impl.moc kaudiorecordstream.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kartsdispatcher.moc kplayobjectfactory_p.moc kplayobject.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
++libartskde_la.all_cc.cc: $(srcdir)/Makefile.in artskde.cc $(srcdir)/kplayobject.cc $(srcdir)/kplayobjectfactory.cc $(srcdir)/kartsdispatcher.cc $(srcdir)/kaudioconverter.cc $(srcdir)/kplayobjectcreator.cc kaudiorecordstream.moc kioinputstream_impl.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
@echo 'creating libartskde_la.all_cc.cc ...'; \
rm -f libartskde_la.all_cc.files libartskde_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cc.final; \
-@@ -1129,7 +1133,7 @@
+@@ -1129,7 +1138,7 @@
rm -f libartskde_la.all_cc.final libartskde_la.all_cc.files
#>+ 11
-libartskde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kioinputstream_impl.cpp $(srcdir)/kartsfloatwatch.cpp $(srcdir)/kaudiorecordstream.cpp $(srcdir)/kaudioplaystream.cpp $(srcdir)/kartsserver.cpp $(srcdir)/kdatarequest_impl.cpp $(srcdir)/kvideowidget.cpp $(srcdir)/kaudiomanagerplay.cpp kioinputstream_impl.moc kaudiorecordstream.moc kartsfloatwatch.moc kartsserver.moc kaudioconverter.moc kvideowidget.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kplayobject.moc kartsdispatcher.moc kaudiorecordstream_p.moc kaudioplaystream_p.moc
-+libartskde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kioinputstream_impl.cpp $(srcdir)/kartsfloatwatch.cpp $(srcdir)/kaudiorecordstream.cpp $(srcdir)/kaudioplaystream.cpp $(srcdir)/kartsserver.cpp $(srcdir)/kdatarequest_impl.cpp $(srcdir)/kvideowidget.cpp $(srcdir)/kaudiomanagerplay.cpp kioinputstream_impl.moc kaudiorecordstream.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kaudioplaystream.moc kplayobjectcreator.moc kdatarequest_impl.moc kartsdispatcher.moc kplayobjectfactory_p.moc kplayobject.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
++libartskde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kioinputstream_impl.cpp $(srcdir)/kartsfloatwatch.cpp $(srcdir)/kaudiorecordstream.cpp $(srcdir)/kaudioplaystream.cpp $(srcdir)/kartsserver.cpp $(srcdir)/kdatarequest_impl.cpp $(srcdir)/kvideowidget.cpp $(srcdir)/kaudiomanagerplay.cpp kaudiorecordstream.moc kioinputstream_impl.moc kartsfloatwatch.moc kartsserver.moc kvideowidget.moc kaudioconverter.moc kplayobjectcreator.moc kaudioplaystream.moc kdatarequest_impl.moc kplayobjectfactory_p.moc kartsdispatcher.moc kplayobject.moc kaudioplaystream_p.moc kaudiorecordstream_p.moc
@echo 'creating libartskde_la.all_cpp.cpp ...'; \
rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
@@ -4209,7 +4106,11 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -170,8 +172,6 @@
+@@ -167,11 +169,10 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4218,7 +4119,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -248,7 +248,6 @@
+@@ -248,7 +249,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4226,7 +4127,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -285,6 +284,9 @@
+@@ -285,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4236,23 +4137,72 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,6 +342,7 @@
+@@ -328,18 +331,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,6 +371,7 @@
+@@ -361,18 +362,23 @@
+ build_vendor = @build_vendor@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+ dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+ dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+ dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -549,7 +553,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -494,6 +500,7 @@
+ libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+ licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+ licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -501,10 +508,12 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -4261,7 +4211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +591,9 @@
+@@ -587,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4284,7 +4234,11 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -165,8 +167,6 @@
+@@ -162,11 +164,10 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4293,7 +4247,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -243,7 +243,6 @@
+@@ -243,7 +244,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4301,7 +4255,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -280,6 +279,9 @@
+@@ -280,6 +280,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4311,23 +4265,72 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,6 +337,7 @@
+@@ -323,18 +326,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,6 +366,7 @@
+@@ -356,18 +357,23 @@
+ build_vendor = @build_vendor@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+ dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+ dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+ dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -541,7 +545,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -489,6 +495,7 @@
+ libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+ licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+ licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -496,10 +503,12 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -4336,7 +4339,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +583,9 @@
+@@ -579,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4359,7 +4362,11 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -126,8 +128,6 @@
+@@ -123,11 +125,10 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4368,7 +4375,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -204,7 +204,6 @@
+@@ -204,7 +205,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4376,7 +4383,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -241,6 +240,9 @@
+@@ -241,6 +241,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4386,23 +4393,72 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +298,7 @@
+@@ -284,18 +287,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -324,6 +327,7 @@
+@@ -317,18 +318,23 @@
+ build_vendor = @build_vendor@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+ dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+ dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+ dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -487,7 +491,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -450,6 +456,7 @@
+ libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+ licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+ licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -457,10 +464,12 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -487,7 +496,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -4411,7 +4467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +529,9 @@
+@@ -525,9 +534,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4434,7 +4490,11 @@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-@@ -142,8 +144,6 @@
+@@ -139,11 +141,10 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
GSSAPI_INCS = @GSSAPI_INCS@
GSSAPI_LIBS = @GSSAPI_LIBS@
GSSAPI_RPATH = @GSSAPI_RPATH@
@@ -4443,7 +4503,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
HAVE_MITSHM = @HAVE_MITSHM@
HAVE_SENDFILE = @HAVE_SENDFILE@
-@@ -220,7 +220,6 @@
+@@ -220,7 +221,6 @@
LIBXSLT_RPATH = @LIBXSLT_RPATH@
LIBZ = @LIBZ@
LIB_CUPS = @LIB_CUPS@
@@ -4451,7 +4511,7 @@
LIB_EXR = @LIB_EXR@
LIB_IDN = @LIB_IDN@
LIB_JASPER = @LIB_JASPER@
-@@ -257,6 +256,9 @@
+@@ -257,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -4461,23 +4521,72 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,6 +314,7 @@
+@@ -300,18 +303,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -340,6 +343,7 @@
+@@ -333,18 +334,23 @@
+ build_vendor = @build_vendor@
+ cups_modeldir = @cups_modeldir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
+ dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
+ dnssd_SUBDIR_included_FALSE = @dnssd_SUBDIR_included_FALSE@
+ dnssd_SUBDIR_included_TRUE = @dnssd_SUBDIR_included_TRUE@
doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
exec_prefix = @exec_prefix@
+have_pkg_config = @have_pkg_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
-@@ -506,7 +510,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -466,6 +472,7 @@
+ libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
+ licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
+ licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
+@@ -473,10 +480,12 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ path_su = @path_su@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -506,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -4486,7 +4595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +548,9 @@
+@@ -544,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4510,7 +4619,7 @@
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
-@@ -97,9 +100,6 @@
+@@ -100,9 +103,6 @@
/* Define if your system has Linux Directory Notification */
#undef HAVE_DNOTIFY
@@ -4520,20 +4629,7 @@
/* Define if you have OpenEXR */
#undef HAVE_EXR
-@@ -460,6 +460,12 @@
- /* If we are going to use OpenSSL */
- #undef HAVE_SSL
-
-+/* Define to 1 if you have the `statfs' function. */
-+#undef HAVE_STATFS
-+
-+/* Define to 1 if you have the `statvfs' function. */
-+#undef HAVE_STATVFS
-+
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
-
-@@ -561,6 +567,9 @@
+@@ -564,6 +564,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
@@ -4543,7 +4639,7 @@
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
-@@ -588,6 +597,12 @@
+@@ -591,6 +594,12 @@
/* Define if sys/stat.h declares S_ISSOCK. */
#undef HAVE_S_ISSOCK
@@ -4556,10 +4652,699 @@
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
+@@ -769,27 +778,27 @@
+ /* Define if you have POSIX.1b scheduling */
+ #undef POSIX1B_SCHEDULING
+
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+
+ /* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+- automatically deduced at run-time.
++ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+@@ -1089,10 +1098,10 @@
+ kde_socklen_t) */
+ #undef ksize_t
+
+-/* Define to `long' if <sys/types.h> does not define. */
++/* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
+
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+
+
--- configure
+++ configure
-@@ -278,15 +278,15 @@
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59d.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+ done
+
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+ else
+ as_basename=false
+@@ -63,157 +124,386 @@
+
+
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
++# CDPATH.
++$as_unset CDPATH
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++ if (eval ":") 2>/dev/null; then
++ as_have_required=yes
++else
++ as_have_required=no
+ fi
+
++ if test $as_have_required = yes && (eval ":
++(as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+- case $0 in
+- *[\\/]* ) as_myself=$0 ;;
+- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
+
+- ;;
+- esac
+- # We did not find ourselves, most probably we were run as `sh COMMAND'
+- # in which case we are not to be found in the path.
+- if test "x$as_myself" = x; then
+- as_myself=$0
+- fi
+- if test ! -f "$as_myself"; then
+- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+- { (exit 1); exit 1; }; }
+- fi
+- case $CONFIG_SHELL in
+- '')
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++ as_lineno_1=\$LINENO
++ as_lineno_2=\$LINENO
++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++ :
++else
++ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
++ case $as_dir in
+ /*)
+- if ("$as_dir/$as_base" -c '
++ for as_base in sh bash ksh sh5; do
++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++ done;;
++ esac
++done
++IFS=$as_save_IFS
++
++
++ for as_shell in $as_candidate_shells $SHELL; do
++ # Try only shells which exist, to save several forks.
++ if test -f $as_shell &&
++ { ($as_shell) 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++ CONFIG_SHELL=$as_shell
++ as_have_required=yes
++ if { $as_shell 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++ (exit $1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+- CONFIG_SHELL=$as_dir/$as_base
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+- fi;;
+- esac
+- done
+-done
+-;;
+- esac
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++ break
++fi
++
++fi
++
++ done
++
++ if test "x$CONFIG_SHELL" != x; then
++ for as_var in BASH_ENV ENV
++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++ done
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++ if test $as_have_required = no; then
++ echo This script requires a shell more modern than all the
++ echo shells that I found on your system. Please install a
++ echo modern shell, or manually run the script under such a
++ echo shell if you do have one.
++ { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++ (exit \$1)
++}
++as_func_success () {
++ as_func_return 0
++}
++as_func_failure () {
++ as_func_return 1
++}
++as_func_ret_success () {
++ return 0
++}
++as_func_ret_failure () {
++ return 1
++}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
++fi
++
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++ :
++else
++ exitcode=1
++ echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++ echo No shell found that supports shell functions.
++ echo Please tell autoconf at gnu.org about your system,
++ echo including any error possibly output before this
++ echo message
++}
++
++
++
++ as_lineno_1=$LINENO
++ as_lineno_2=$LINENO
++ test "x$as_lineno_1" != "x$as_lineno_2" &&
++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line before each line; the second 'sed' does the real
+- # work. The second script uses 'N' to pair each line-number line
+- # with the numbered line, and appends trailing '-' during
+- # substitution so that $LINENO is not a special case at line end.
++ # line-number line after each line using $LINENO; the second 'sed'
++ # does the real work. The second script uses 'N' to pair each
++ # line-number line with the line containing $LINENO, and appends
++ # trailing '-' during substitution so that $LINENO is not a special
++ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+- sed '=' <$as_myself |
++ # scripts with optimization help from Paolo Bonzini. Blame Lee
++ # E. McMahon (1931-1989) for sed's syntax. :-)
++ sed -n '
++ p
++ /[$]LINENO/=
++ ' <$as_myself |
+ sed '
++ s/[$]LINENO.*/&-/
++ t lineno
++ b
++ :lineno
+ N
+- s,$,-,
+- : loop
+- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++ :loop
++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+- s,-$,,
+- s,^['$as_cr_digits']*\n,,
++ s/-\n.*//
+ ' >$as_me.lineno &&
+- chmod +x $as_me.lineno ||
++ chmod +x "$as_me.lineno" ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+- # original and so on. Autoconf is especially sensible to this).
+- . ./$as_me.lineno
++ # original and so on. Autoconf is especially sensitive to this).
++ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+ }
+
+
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+- *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T=' ' ;;
+- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++ as_dirname=dirname
++else
++ as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++ case `echo 'x\c'` in
++ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
++ *) ECHO_C='\c';;
++ esac;;
++*)
++ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+ else
+ as_expr=false
+ fi
+
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++ rm -f conf$$.dir/conf$$.file
++else
++ rm -f conf$$.dir
++ mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+- # We could just check for DJGPP; but this test a) works b) is more generic
+- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+- if test -f conf$$.exe; then
+- # Don't use ln at all; we don't have any links
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+- else
+- as_ln_s='ln -s'
+- fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+@@ -222,7 +512,19 @@
+ as_mkdir_p=false
+ fi
+
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works. Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++ as_executable_p="test -x"
++else
++ as_executable_p=:
++fi
++rm -f conf$$.file
+
+ # 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'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" $as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+
+
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,15 @@
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -4577,27 +5362,914 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -464,7 +464,7 @@
+@@ -395,29 +688,26 @@
+
+ tagnames=${tagnames+${tagnames},}F77
+
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete. It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,448 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-# include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER PKG_CONFIG LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM have_pkg_config PKG_CONFIG ac_pt_PKG_CONFIG AVAHI_CFLAGS AVAHI_LIBS LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++kde_libs_prefix
++kde_libs_htmldir
++CONF_FILES
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
++CPP
++CXX
++CXXFLAGS
++ac_ct_CXX
++CXXDEPMODE
++am__fastdepCXX_TRUE
++am__fastdepCXX_FALSE
++WOVERLOADED_VIRTUAL
++HAVE_GCC_VISIBILITY
++unsermake_enable_pch_TRUE
++unsermake_enable_pch_FALSE
++USE_EXCEPTIONS
++USE_RTTI
++CXXCPP
++NOOPT_CXXFLAGS
++NOOPT_CFLAGS
++ENABLE_PERMISSIVE_FLAG
++LDFLAGS_AS_NEEDED
++LDFLAGS_NEW_DTAGS
++KDE_USE_FINAL_TRUE
++KDE_USE_FINAL_FALSE
++KDE_USE_CLOSURE_TRUE
++KDE_USE_CLOSURE_FALSE
++KDE_NO_UNDEFINED
++KDE_USE_NMCHECK_TRUE
++KDE_USE_NMCHECK_FALSE
++GREP
++EGREP
++LN_S
++ECHO
++AR
++RANLIB
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++KDE_PLUGIN
++KDE_CHECK_PLUGIN
++INSTALL_LTDL_TRUE
++INSTALL_LTDL_FALSE
++CONVENIENCE_LTDL_TRUE
++CONVENIENCE_LTDL_FALSE
++LIBADD_DL
++MSGFMT
++GMSGFMT
++XGETTEXT
++ALLOCA
++ACL_LIBS
++LIBUTIL
++LIBCOMPAT
++LIBCRYPT
++LIBRESOLV
++LIB_POLL
++FRAMEWORK_COREAUDIO
++LIBSOCKET
++X_EXTRA_LIBS
++LIBUCB
++LIBDL
++KDE_USE_FPIE
++KDE_USE_PIE
++include_x11_TRUE
++include_x11_FALSE
++XMKMF
++X_PRE_LIBS
++LIB_X11
++LIB_XRENDER
++LIBSM
++X_INCLUDES
++X_LDFLAGS
++x_includes
++x_libraries
++QTE_NORTTI
++LIB_XEXT
++LIBPTHREAD
++USE_THREADS
++KDE_MT_LDFLAGS
++KDE_MT_LIBS
++USER_INCLUDES
++USER_LDFLAGS
++LIBZ
++LIBPNG
++LIBJPEG
++qt_libraries
++qt_includes
++QT_INCLUDES
++QT_LDFLAGS
++PERL
++MOC
++UIC
++UIC_TR
++LIB_QT
++LIB_QPE
++kde_qtver
++KDE_EXTRA_RPATH
++KDE_RPATH
++X_RPATH
++kde_libraries
++kde_includes
++KDE_LDFLAGS
++KDE_INCLUDES
++all_includes
++all_libraries
++AUTODIRS
++include_ARTS_TRUE
++include_ARTS_FALSE
++MAKEKDEWIDGETS
++KCONFIG_COMPILER
++KCFG_DEPENDENCIES
++DCOPIDLNG
++DCOPIDL
++DCOPIDL2CPP
++DCOP_DEPENDENCIES
++MCOPIDL
++ARTSCCONFIG
++MEINPROC
++KDE_XSL_STYLESHEET
++XMLLINT
++kde_htmldir
++kde_appsdir
++kde_icondir
++kde_sounddir
++kde_datadir
++kde_locale
++kde_confdir
++kde_kcfgdir
++kde_mimedir
++kde_wallpaperdir
++kde_bindir
++xdg_appsdir
++xdg_menudir
++xdg_directorydir
++kde_templatesdir
++kde_servicesdir
++kde_servicetypesdir
++kde_moduledir
++kdeinitdir
++kde_styledir
++kde_widgetdir
++LIB_KDED
++LIB_KDECORE
++LIB_KDEUI
++LIB_KIO
++LIB_KJS
++LIB_SMB
++LIB_KAB
++LIB_KABC
++LIB_KHTML
++LIB_KSPELL
++LIB_KPARTS
++LIB_KDEPRINT
++LIB_KUTILS
++LIB_KDEPIM
++LIB_KIMPROXY
++LIB_KNEWSTUFF
++LIB_KDNSSD
++LIB_KUNITTEST
++LIB_KSYCOCA
++LIB_KFILE
++LIB_KFM
++QNAMESPACE_H
++LIBICE
++LIB_KIMGIO
++EXTRA_SUBDIRS
++HAVE_SENDFILE
++HAVE_MITSHM
++ICE_SUBDIR
++ICE_RLIB
++LIBUTEMPTER
++QTDOCDIR
++KDE_HAVE_DOT
++DOXYGEN
++DOXYGEN_PROJECT_NAME
++DOXYGEN_PROJECT_NUMBER
++KDE_HAS_DOXYGEN
++include_VERSION_SCRIPT_TRUE
++include_VERSION_SCRIPT_FALSE
++MD5SUM
++have_pkg_config
++PKG_CONFIG
++AVAHI_CFLAGS
++AVAHI_LIBS
++LUA
++LUA_INCLUDES
++LUA_LIBS
++LIB_IDN
++LIBART_LIBS
++LIBART_CFLAGS
++LIBART_RPATH
++include_SVGICONS_TRUE
++include_SVGICONS_FALSE
++KDE_FORCE_INLINE
++kde_cups_config
++include_cups_SUBDIR_TRUE
++include_cups_SUBDIR_FALSE
++LIB_CUPS
++cups_modeldir
++path_su
++LIBBZ2
++include_BZIP2_TRUE
++include_BZIP2_FALSE
++LIBXSLT_LIBS
++LIBXSLT_CFLAGS
++LIBXSLT_RPATH
++LIBXML_LIBS
++LIBXML_CFLAGS
++LIBXML_RPATH
++HELP_SUBDIR
++MEINPROC_DEP
++DOJAVA_TRUE
++DOJAVA_FALSE
++LIBTHAI
++KJAVA_POLICYPATH
++LIBTIFF
++LIB_JASPER
++LIB_EXR
++EXR_FLAGS
++include_TIFF_MODULES_TRUE
++include_TIFF_MODULES_FALSE
++include_JP2_MODULES_TRUE
++include_JP2_MODULES_FALSE
++include_EXR_MODULES_TRUE
++include_EXR_MODULES_FALSE
++KDEINIT_XFT_INCLUDES
++LIBFAM
++LIBVOLMGT
++SSL_INCLUDES
++SSL_LDFLAGS
++LIBSSL
++include_bzip2_TRUE
++include_bzip2_FALSE
++GSSAPI_INCS
++GSSAPI_LIBS
++GSSAPI_RPATH
++LIBPCRE
++PCRECFLAGS
++include_aspell_plugin_TRUE
++include_aspell_plugin_FALSE
++include_hspell_plugin_TRUE
++include_hspell_plugin_FALSE
++LIBASOUND
++undefined_symbols_allowed_TRUE
++undefined_symbols_allowed_FALSE
++TOPSUBDIRS
++dcop_SUBDIR_included_TRUE
++dcop_SUBDIR_included_FALSE
++libltdl_SUBDIR_included_TRUE
++libltdl_SUBDIR_included_FALSE
++kdefx_SUBDIR_included_TRUE
++kdefx_SUBDIR_included_FALSE
++kdecore_SUBDIR_included_TRUE
++kdecore_SUBDIR_included_FALSE
++kunittest_SUBDIR_included_TRUE
++kunittest_SUBDIR_included_FALSE
++kdeui_SUBDIR_included_TRUE
++kdeui_SUBDIR_included_FALSE
++kdesu_SUBDIR_included_TRUE
++kdesu_SUBDIR_included_FALSE
++kjs_SUBDIR_included_TRUE
++kjs_SUBDIR_included_FALSE
++kwallet_SUBDIR_included_TRUE
++kwallet_SUBDIR_included_FALSE
++kio_SUBDIR_included_TRUE
++kio_SUBDIR_included_FALSE
++arts_SUBDIR_included_TRUE
++arts_SUBDIR_included_FALSE
++dnssd_SUBDIR_included_TRUE
++dnssd_SUBDIR_included_FALSE
++kab_SUBDIR_included_TRUE
++kab_SUBDIR_included_FALSE
++kconf_update_SUBDIR_included_TRUE
++kconf_update_SUBDIR_included_FALSE
++kded_SUBDIR_included_TRUE
++kded_SUBDIR_included_FALSE
++kdoctools_SUBDIR_included_TRUE
++kdoctools_SUBDIR_included_FALSE
++kimgio_SUBDIR_included_TRUE
++kimgio_SUBDIR_included_FALSE
++kioslave_SUBDIR_included_TRUE
++kioslave_SUBDIR_included_FALSE
++knewstuff_SUBDIR_included_TRUE
++knewstuff_SUBDIR_included_FALSE
++kparts_SUBDIR_included_TRUE
++kparts_SUBDIR_included_FALSE
++kresources_SUBDIR_included_TRUE
++kresources_SUBDIR_included_FALSE
++kstyles_SUBDIR_included_TRUE
++kstyles_SUBDIR_included_FALSE
++kutils_SUBDIR_included_TRUE
++kutils_SUBDIR_included_FALSE
++libkmid_SUBDIR_included_TRUE
++libkmid_SUBDIR_included_FALSE
++libkscreensaver_SUBDIR_included_TRUE
++libkscreensaver_SUBDIR_included_FALSE
++licenses_SUBDIR_included_TRUE
++licenses_SUBDIR_included_FALSE
++mimetypes_SUBDIR_included_TRUE
++mimetypes_SUBDIR_included_FALSE
++pics_SUBDIR_included_TRUE
++pics_SUBDIR_included_FALSE
++doc_SUBDIR_included_TRUE
++doc_SUBDIR_included_FALSE
++kcert_SUBDIR_included_TRUE
++kcert_SUBDIR_included_FALSE
++kinit_SUBDIR_included_TRUE
++kinit_SUBDIR_included_FALSE
++kdeprint_SUBDIR_included_TRUE
++kdeprint_SUBDIR_included_FALSE
++kabc_SUBDIR_included_TRUE
++kabc_SUBDIR_included_FALSE
++kspell2_SUBDIR_included_TRUE
++kspell2_SUBDIR_included_FALSE
++kmdi_SUBDIR_included_TRUE
++kmdi_SUBDIR_included_FALSE
++kcmshell_SUBDIR_included_TRUE
++kcmshell_SUBDIR_included_FALSE
++khtml_SUBDIR_included_TRUE
++khtml_SUBDIR_included_FALSE
++interfaces_SUBDIR_included_TRUE
++interfaces_SUBDIR_included_FALSE
++kdewidgets_SUBDIR_included_TRUE
++kdewidgets_SUBDIR_included_FALSE
++kate_SUBDIR_included_TRUE
++kate_SUBDIR_included_FALSE
++LIBOBJS
++LTLIBOBJS'
ac_subst_files=''
++ ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF'
++
# Initialize some variables set by options.
-@@ -945,6 +945,10 @@
- ac_env_FFLAGS_value=$FFLAGS
- ac_cv_env_FFLAGS_set=${FFLAGS+set}
- ac_cv_env_FFLAGS_value=$FFLAGS
-+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_env_PKG_CONFIG_value=$PKG_CONFIG
-+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ ac_init_help=
+@@ -492,34 +1213,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+- eval "$ac_prev=\$ac_option"
++ eval $ac_prev=\$ac_option
+ ac_prev=
+ continue
+ fi
+
+- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++ case $ac_option in
++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *) ac_optarg=yes ;;
++ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+- case $ac_option in
++ case $ac_dashdash$ac_option in
++ --)
++ ac_dashdash=yes ;;
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+@@ -541,12 +1276,18 @@
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++ -datadir | --datadir | --datadi | --datad)
+ ac_prev=datadir ;;
+- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+- | --da=*)
++ -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ datadir=$ac_optarg ;;
+
++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++ | --dataroo | --dataro | --datar)
++ ac_prev=datarootdir ;;
++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++ datarootdir=$ac_optarg ;;
++
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+@@ -554,7 +1295,17 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- eval "enable_$ac_feature=no" ;;
++ eval enable_$ac_feature=no ;;
++
++ -docdir | --docdir | --docdi | --doc | --do)
++ ac_prev=docdir ;;
++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++ docdir=$ac_optarg ;;
++
++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++ ac_prev=dvidir ;;
++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1314,7 @@
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "enable_$ac_feature='$ac_optarg'" ;;
++ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1341,12 @@
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++ ac_prev=htmldir ;;
++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++ | --ht=*)
++ htmldir=$ac_optarg ;;
++
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+@@ -618,13 +1371,16 @@
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
++ -localedir | --localedir | --localedi | --localed | --locale)
++ ac_prev=localedir ;;
++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++ localedir=$ac_optarg ;;
++
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+- | --localstate | --localstat | --localsta | --localst \
+- | --locals | --local | --loca | --loc | --lo)
++ | --localstate | --localstat | --localsta | --localst | --locals)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1445,16 @@
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++ ac_prev=pdfdir ;;
++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++ pdfdir=$ac_optarg ;;
++
++ -psdir | --psdir | --psdi | --psd | --ps)
++ ac_prev=psdir ;;
++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++ psdir=$ac_optarg ;;
++
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+@@ -745,11 +1511,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+- case $ac_option in
+- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+- *) ac_optarg=yes ;;
+- esac
+- eval "with_$ac_package='$ac_optarg'" ;;
++ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1520,7 @@
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+- eval "with_$ac_package=no" ;;
++ eval with_$ac_package=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -789,8 +1551,7 @@
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+- eval "$ac_envvar='$ac_optarg'"
++ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+@@ -810,27 +1571,19 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+- eval ac_val=$`echo $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; }; };;
+- esac
+-done
+-
+-# 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
+- eval ac_val=$`echo $ac_var`
++ eval ac_val=\$$ac_var
+ case $ac_val in
+- [\\/$]* | ?:[\\/]* ) ;;
+- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; };;
++ [\\/$]* | ?:[\\/]* ) continue;;
++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++ { (exit 1); exit 1; }; }
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,94 +1610,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+
+
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++ { echo "$as_me: error: Working directory cannot be determined" >&2
++ { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++ { echo "$as_me: error: pwd does not report name of working directory" >&2
++ { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+- # Try the directory containing this script, then its parent.
+- ac_confdir=`(dirname "$0") 2>/dev/null ||
++ # Try the directory containing this script, then the parent directory.
++ ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+ srcdir=$ac_confdir
+- if test ! -r $srcdir/$ac_unique_file; then
++ if test ! -r "$srcdir/$ac_unique_file"; then
+ srcdir=..
+ fi
+ else
+ ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+- if test "$ac_srcdir_defaulted" = yes; then
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+- { (exit 1); exit 1; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+- { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
++if test ! -r "$srcdir/$ac_unique_file"; then
++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++ { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++ { (exit 1); exit 1; }; }
++ pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++ srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_env_${ac_var}_value=\$${ac_var}
++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+
#
# Report the --help message.
-@@ -1026,6 +1030,8 @@
+@@ -973,9 +1708,6 @@
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+-_ACEOF
+-
+- cat <<_ACEOF
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+@@ -993,15 +1725,22 @@
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+- --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --infodir=DIR info documentation [PREFIX/info]
+- --mandir=DIR man documentation [PREFIX/man]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+@@ -1026,6 +1765,8 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-fast-perl disable fast Makefile generation (needs perl)
@@ -4606,7 +6278,20 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1062,7 +1068,6 @@
+@@ -1042,10 +1783,8 @@
+ of memory)
+ --enable-closure delay template instantiation
+ --enable-nmcheck enable automatic namespace cleanness check
+- --enable-shared[=PKGS]
+- build shared libraries [default=yes]
+- --enable-static[=PKGS]
+- build static libraries [default=no]
++ --enable-shared[=PKGS] build shared libraries [default=yes]
++ --enable-static[=PKGS] build static libraries [default=no]
+ --enable-libsuffix /lib directory suffix (64,32,none,auto=default)
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+@@ -1062,7 +1801,6 @@
toolchain hidden visibility default=no
--enable-sendfile enable the use of sendfile() (Linux only)
--enable-mitshm use MIT-SHM for pixmap loading/saving
@@ -4614,49 +6299,914 @@
--disable-openpty disable openpty (UNIX98 terminals) support default=enabled
--enable-fast-malloc Use own malloc implementation : yes,no,full,debug
--disable-cups disable CUPS support default=auto
-@@ -1088,6 +1093,8 @@
- --with-qt-includes=DIR where the Qt includes are.
- --with-qt-libraries=DIR where the Qt library is installed.
- --without-arts build without aRts default=no
-+ --with-rgbfile=path Define custom path for rgb.txt. (default:
-+ \$(x11libdir)/X11/rgb.txt)
+@@ -1078,8 +1816,7 @@
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+- --with-tags[=TAGS]
+- include additional configurations [automatic]
++ --with-tags[=TAGS] include additional configurations [automatic]
+ --with-acl enable support for POSIX ACLs [default=check]
+ --with-extra-includes=DIR
+ adds non standard include paths
+@@ -1091,8 +1828,7 @@
+ --with-rgbfile=path Define custom path for rgb.txt. (default:
+ \$(x11libdir)/X11/rgb.txt)
--with-distribution indicate the distribution in bug reports
- --with-utempter use utempter for utmp management
- [default=check]
-@@ -1122,6 +1129,7 @@
+- --with-utempter use utempter for utmp management
+- [default=check]
++ --with-utempter use utempter for utmp management [default=check]
+ --with-lua-dir=DIR where the root of Lua 5.x is installed
+ --with-lua-includes=DIR where the Lua includes are
+ --with-lua-libraries=DIR
+@@ -1116,131 +1852,100 @@
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+- headers in a nonstandard directory <include dir>
++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
-+ PKG_CONFIG path to pkg-config utility
++ XMKMF Path to xmkmf, Makefile generator for X Window System
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -1214,7 +1222,7 @@
+
+ _ACEOF
++ac_status=$?
+ fi
+
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+- ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d $ac_dir || continue
+ ac_builddir=.
+
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+- # A "../" for each directory in $ac_dir_suffix.
+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+- ac_dir_suffix= ac_top_builddir=
+-fi
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+
+ case $srcdir in
+- .) # No --srcdir option. We are building in place.
++ .) # We are building in place.
+ ac_srcdir=.
+- if test -z "$ac_top_builddir"; then
+- ac_top_srcdir=.
+- else
+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+- fi ;;
+- [\\/]* | ?:[\\/]* ) # Absolute path.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir ;;
+- *) # Relative path.
+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+- case "$ac_dir" in
+- .) ac_abs_builddir=`pwd`;;
+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+- case ${ac_top_builddir}. in
+- .) ac_abs_top_builddir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+- case $ac_srcdir in
+- .) ac_abs_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+- esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+- case $ac_top_srcdir in
+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+- esac;;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+- cd $ac_dir
+- # Check for guested configure; otherwise get Cygnus style configure.
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
+ if test -f $ac_srcdir/configure.gnu; then
+- echo
++ echo &&
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+- echo
++ echo &&
+ $SHELL $ac_srcdir/configure --help=recursive
+- elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
+- echo
+- $ac_configure --help
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
+- fi
- cd $ac_popdir
-+ cd "$ac_popdir"
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-@@ -2156,6 +2164,31 @@
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+ cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59d
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+- exit 0
++ exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59. Invocation command line was
++generated by GNU Autoconf 2.59d. Invocation command line was
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ $ $0 $@
+
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1259,7 +1964,7 @@
+ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+ /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+ /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+ /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+@@ -1273,6 +1978,7 @@
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+
+ } >&5
+
+@@ -1305,7 +2011,7 @@
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++ *\'*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+@@ -1340,8 +2046,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log. We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+@@ -1354,20 +2060,34 @@
+ _ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+-{
++(
++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++ eval ac_val=\$$ac_var
++ case $ac_val in #(
++ *${as_nl}*)
++ case $ac_var in #(
++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++ esac
++ case $ac_var in #(
++ _ | IFS | as_nl) ;; #(
++ *) $as_unset $ac_var ;;
++ esac ;;
++ esac
++ done
+ (set) 2>&1 |
+- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+- *ac_space=\ *)
++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++ *${as_nl}ac_space=\ *)
+ sed -n \
+- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+- ;;
++ "s/'\''/'\''\\\\'\'''\''/g;
++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++ ;; #(
+ *)
+- sed -n \
+- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+- esac;
+-}
++ esac |
++ sort
++)
+ echo
+
+ cat <<\_ASBOX
+@@ -1378,22 +2098,22 @@
+ echo
+ for ac_var in $ac_subst_vars
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+- eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ eval ac_val=\$$ac_var
++ echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+@@ -1405,26 +2125,24 @@
+ ## ----------- ##
+ _ASBOX
+ echo
+- sed "/^$/d" confdefs.h | sort
++ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+- rm -f core *.core &&
+- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++ rm -f core *.core core.conftest.* &&
++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+- ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+
+ # Predefined preprocessor variables.
+
+@@ -1455,14 +2173,17 @@
+
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+- if test "x$prefix" != xNONE; then
+- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+- else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
++if test -n "$CONFIG_SITE"; then
++ set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++ set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++ set x "$ac_default_prefix/share/config.site" \
++ "$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+ if test -r "$ac_site_file"; then
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1491,12 +2212,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+- eval ac_new_val="\$ac_env_${ac_var}_value"
++ eval ac_old_val=\$ac_cv_env_${ac_var}_value
++ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1521,8 +2241,7 @@
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+@@ -1539,12 +2258,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+
+
+
+@@ -1561,6 +2274,11 @@
+
+
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ ac_aux_dir=
+@@ -1606,13 +2324,13 @@
+
+
+
+- # Check whether --enable-fast-perl or --disable-fast-perl was given.
++ # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+- enableval="$enable_fast_perl"
+- with_fast_perl=$enableval
++ enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+ with_fast_perl=yes
+-fi;
++fi
++
+
+
+ val=
+@@ -1636,74 +2354,118 @@
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+- ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++ ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++ ac_build_alias=`$ac_config_guess`
++test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$ac_config_sub $ac_build_alias` ||
++ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+- ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++ if test "x$host_alias" = x; then
++ ac_cv_host=$ac_cv_build
++else
++ ac_cv_host=`$ac_config_sub $host_alias` ||
++ { { echo "$as_me:$LINENO: error: $ac_config_sub $host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+- ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++ if test "x$target_alias" = x; then
++ ac_cv_target=$ac_cv_host
++else
++ ac_cv_target=`$ac_config_sub $target_alias` ||
++ { { echo "$as_me:$LINENO: error: $ac_config_sub $target_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $target_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
++fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++ { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1713,17 +2475,17 @@
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+- program_transform_name="s,^,$program_prefix,;$program_transform_name"
++ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $. echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+
+
+ am__api_version="1.9"
+@@ -1745,8 +2507,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1768,7 +2530,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -1787,21 +2549,22 @@
+ ;;
+ esac
+ done
++IFS=$as_save_IFS
+
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
++ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1815,8 +2578,8 @@
+ if test -z "$kde_save_INSTALL_given" ; then
+ # OK, user hasn't given any INSTALL, autoconf found one for us
+ # now we test, if it supports the -p flag
+- echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+ rm -f confinst.$$.* > /dev/null 2>&1
+ echo "Testtest" > confinst.$$.orig
+ ac_res=no
+@@ -1828,8 +2591,8 @@
+ fi
+ fi
+ rm -f confinst.$$.*
+- echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ fi
+
+ if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1839,8 +2602,8 @@
+ INSTALL_SCRIPT='${INSTALL}'
+ fi
+
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1882,8 +2645,8 @@
+ Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+@@ -1934,8 +2697,8 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1948,41 +2711,44 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++ { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ 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
+
++
+ test -n "$AWK" && break
+ done
+
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+- @echo 'ac_maketemp="$(MAKE)"'
++ @echo 'ac_maketemp=X"$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
++if test "$ac_maketemp" != X ; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+ eval ac_cv_prog_make_${ac_make}_set=no
+@@ -1990,12 +2756,12 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = 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; }
+ SET_MAKE=
+ 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; }
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+@@ -2066,8 +2832,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2080,32 +2846,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2118,27 +2886,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ 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
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2158,6 +2940,31 @@
+
+
+
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
+
++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
++
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
@@ -4672,7 +7222,826 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -2948,8 +2981,7 @@
+@@ -2171,8 +2978,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2194,7 +3001,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -2213,21 +3020,22 @@
+ ;;
+ esac
+ done
++IFS=$as_save_IFS
+
+
+ fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+- # As a last resort, use the slow shell script. We don't cache a
+- # path for INSTALL within a source directory, because that will
++ # As a last resort, use the slow shell script. Don't cache a
++ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+- # removed, or if the path is relative.
++ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -2238,11 +3046,11 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+- ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+
+ DEPDIR="${am__leading_dot}deps"
+
+- ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+
+
+ am_make=${MAKE-make}
+@@ -2252,8 +3060,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2280,15 +3088,15 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+- enableval="$enable_dependency_tracking"
++ enableval=$enable_dependency_tracking;
++fi
+
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+@@ -2308,10 +3116,9 @@
+
+
+
+- # Check whether --enable-debug or --disable-debug was given.
++ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+- enableval="$enable_debug"
+-
++ enableval=$enable_debug;
+ case $enableval in
+ yes)
+ kde_use_debug_code="yes"
+@@ -2331,18 +3138,18 @@
+ kde_use_debug_code="no"
+ kde_use_debug_define=no
+
+-fi;
++fi
++
+
+- # Check whether --enable-dummyoption or --disable-dummyoption was given.
++ # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+- enableval="$enable_dummyoption"
++ enableval=$enable_dummyoption;
++fi
+
+-fi;
+
+- # Check whether --enable-strict or --disable-strict was given.
++ # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+- enableval="$enable_strict"
+-
++ enableval=$enable_strict;
+ if test $enableval = "no"; then
+ kde_use_strict_options="no"
+ else
+@@ -2351,12 +3158,12 @@
+
+ else
+ kde_use_strict_options="no"
+-fi;
++fi
+
+- # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+- enableval="$enable_warnings"
+
++ # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++ enableval=$enable_warnings;
+ if test $enableval = "no"; then
+ kde_use_warnings="no"
+ else
+@@ -2365,20 +3172,21 @@
+
+ else
+ kde_use_warnings="yes"
+-fi;
++fi
++
+
+ if test "$kde_use_debug_code" != "no"; then
+ kde_use_warnings=yes
+ fi
+
+- # Check whether --enable-profile or --disable-profile was given.
++ # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+- enableval="$enable_profile"
+- kde_use_profiling=$enableval
++ enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+ kde_use_profiling="no"
+
+-fi;
++fi
++
+
+ CFLAGS=" $CFLAGS"
+
+@@ -2390,8 +3198,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2404,32 +3212,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2442,36 +3252,51 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ 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
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ else
+ CC="$ac_cv_prog_CC"
+ fi
+
+ if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2484,74 +3309,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ 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
+
+- CC=$ac_ct_CC
+-else
+- CC="$ac_cv_prog_CC"
+-fi
+
++ fi
+ fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2565,7 +3350,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -2576,6 +3361,7 @@
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+@@ -2593,22 +3379,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ 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
+
++
+ fi
+ if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2621,36 +3408,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ 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
+
++
+ test -n "$CC" && break
+ done
+ fi
+ if test -z "$CC"; then
+ ac_ct_CC=$CC
+- for ac_prog in cl
++ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2663,29 +3452,45 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ 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
+
++
+ test -n "$ac_ct_CC" && break
+ done
+
+- CC=$ac_ct_CC
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
+ fi
+
+ fi
+@@ -2698,25 +3503,38 @@
+ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
++
++# List of possible output files. We want to start from the most likely,
++# but we have to check foo.exe before foo, because Cygwin `test -f' looks
++# also for foo.exe. b.out is created by i960 compilers.
++# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
++# But we are not allowed to rm a.*, and we do not want always remove
++# conftest.*, so we will list them literally, when appropriate.
++ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
++
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions. Remove them first so a
++# subsequent execution test works.
++rm -f $ac_outfiles conftest.*
++
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -2732,51 +3550,40 @@
+ return 0;
+ }
+ _ACEOF
++
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files $ac_outfiles"
++
++# The following tests should remove their output except files matching conftest.*.
+ # 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.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- # Find the output, starting from the most likely. This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++ for ac_file in $ac_outfiles a.* conftest.* NO
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+- ;;
+- conftest.$ac_ext )
+- # This is the source file.
+- ;;
+- [ab].out )
+- # We found the default executable, but exeext='' is most
+- # certainly right.
+- break;;
+- *.* )
+- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- # FIXME: I believe we export ac_cv_exeext for Libtool,
+- # but it would be cool to find out if it's true. Does anybody
+- # maintain Libtool? --akim.
+- export ac_cv_exeext
+- break;;
+- * )
+- break;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ * ) break;;
+ esac
+ done
++if test "$ac_file" = NO; then
++ { { echo "$as_me:$LINENO: error: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: no output file found
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2788,14 +3595,12 @@
+ { (exit 77); exit 77; }; }
+ fi
+
+-ac_exeext=$ac_cv_exeext
+-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
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++# Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -2820,83 +3625,84 @@
+ fi
+ fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
++# Clean up; list also $ac_file, in case it matched a wildcard entry.
++rm -f $ac_outfiles $ac_file
+
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if test "${ac_cv_exeext+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+- test -f "$ac_file" || continue
+- case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- export ac_cv_exeext
+- break;;
+- * ) break;;
+- esac
+-done
++ # If both `conftest.exe' and `conftest' are `present' (well, observable),
++ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
++ # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
++ for ac_file in conftest.exe conftest conftest.* NO; do
++ test -f "$ac_file" || continue
++ case $ac_file in
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ break;;
++ * ) break;;
++ esac
++ done
++ if test "$ac_file" = NO; then
++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ # Clean up; list also $ac_file, in case it matched conftest.*.
++ rm -f $ac_outfiles $ac_file
++
+ else
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
++
+ fi
+
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+
+-rm -f conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++
++
++ac_clean_files=$ac_clean_files_save
++
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+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. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
++ rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++ for ac_file in conftest.o conftest.obj conftest.*; do
++ test -f "$ac_file" || continue;
+ case $ac_file in
+- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+@@ -2912,14 +3718,16 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++
++
++rm -f conftest.*
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2950,8 +3758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4682,7 +8051,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3007,8 +3039,7 @@
+@@ -2968,24 +3775,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3009,8 +3820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4692,7 +8097,109 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3124,8 +3155,7 @@
+@@ -3027,97 +3837,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- 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
+ ac_status=$?
+@@ -3126,8 +3862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4702,17 +8209,95 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3179,8 +3209,7 @@
- cat conftest.err >&5
+@@ -3139,81 +3874,24 @@
+ ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+ (exit $ac_status); }; }; then
+- ac_cv_prog_cc_stdc=$ac_arg
+-break
++ :
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
+-_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'
-+ { 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=$?
-@@ -3225,8 +3254,7 @@
+- { (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
+- for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -3227,8 +3905,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4722,7 +8307,118 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3270,8 +3298,7 @@
+@@ -3240,30 +3917,104 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- :
++ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+@@ -3272,8 +4023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4732,7 +8428,304 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3828,8 +3855,7 @@
+@@ -3285,27 +4035,36 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- break
++ ac_cv_prog_cc_c89=$ac_arg
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3314,8 +4073,8 @@
+
+ depcc="$CC" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3404,8 +4163,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+@@ -3427,8 +4186,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
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -3488,9 +4247,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3528,6 +4288,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3545,8 +4306,8 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3595,9 +4356,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -3635,6 +4397,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -3685,18 +4448,22 @@
+
+ CXXFLAGS=" $CXXFLAGS"
+
+- 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'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++ if test -n "$CCC"; then
++ CXX=$CCC
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3709,36 +4476,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++ { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ 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
+
++
+ test -n "$CXX" && break
+ done
+ fi
+ if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3751,55 +4520,70 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ 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
+
++
+ test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+- CXX=$ac_ct_CXX
++ if test "x$ac_ct_CXX" = x; then
++ CXX="g++"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ CXX=$ac_ct_CXX
++ fi
+ fi
+
+-
++ fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3830,8 +4614,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4742,7 +8735,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3887,8 +3913,7 @@
+@@ -3848,24 +4631,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++ ac_cxx_werror_flag=yes
++ ac_cv_prog_cxx_g=no
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3889,8 +4676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4752,7 +8781,59 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3959,8 +3984,7 @@
+@@ -3907,47 +4693,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+- CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+- if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+- else
+- CXXFLAGS="-g"
+- fi
+-else
+- if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
+- else
+- CXXFLAGS=
+- fi
+-fi
+-for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++ CXXFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -3961,8 +4718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4762,7 +8843,33 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4004,8 +4028,7 @@
+@@ -3979,20 +4735,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++ CXXFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+ ;
+ return 0;
+ }
+@@ -4006,8 +4761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4772,7 +8879,88 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4183,8 +4206,7 @@
+@@ -4019,21 +4773,40 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- break
++ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+ fi
+
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f 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
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4042,8 +4815,8 @@
+
+ depcc="$CXX" am_compiler_list=
+
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4132,8 +4905,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+@@ -4151,8 +4924,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+
+
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4185,8 +4958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4782,7 +8970,47 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4295,8 +4317,7 @@
+@@ -4203,13 +4975,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_bad_compiler=yes
++ kde_bad_compiler=yes
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+
+ if test "$kde_bad_compiler" = "yes"; then
+ { { echo "$as_me:$LINENO: error:
+@@ -4251,17 +5024,16 @@
+ fi
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+
+-
+-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'
+@@ -4297,8 +5069,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4792,7 +9020,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4384,8 +4405,7 @@
+@@ -4315,7 +5086,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4329,29 +5102,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-fno-builtin $CXXFLAGS"
+ 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
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4386,8 +5158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4802,7 +9078,56 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4487,8 +4507,7 @@
+@@ -4404,7 +5175,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4418,13 +5191,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ 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; }
+ :
+ WOVERLOADED_VRITUAL=""
+ fi
+@@ -4445,16 +5218,15 @@
+
+ if test "$kde_use_profiling" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4489,8 +5261,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4812,7 +9137,59 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4587,8 +4606,7 @@
+@@ -4507,7 +5278,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4521,16 +5294,16 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+
+ 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
+@@ -4545,16 +5318,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"
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4589,8 +5361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4822,7 +9199,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4672,8 +4690,7 @@
+@@ -4607,7 +5378,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4621,27 +5394,26 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4674,8 +5446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4832,7 +9254,56 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4762,8 +4779,7 @@
+@@ -4692,7 +5463,9 @@
+ 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
+ CFLAGS="$save_CFLAGS"
+@@ -4706,13 +5479,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = 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; }
+ :
+ CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ 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
+@@ -4720,16 +5493,15 @@
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4764,8 +5536,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4842,7 +9313,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4850,8 +4866,7 @@
+@@ -4782,7 +5553,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4796,28 +5569,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wundef $CXXFLAGS"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4852,8 +5624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4852,7 +9370,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4938,8 +4953,7 @@
+@@ -4870,7 +5641,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4884,28 +5657,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -4940,8 +5712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4862,7 +9427,74 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5046,8 +5060,7 @@
+@@ -4958,7 +5729,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -4972,13 +5745,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ 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
+@@ -4990,13 +5763,13 @@
+ CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+ fi
+
+- # Check whether --enable-pch or --disable-pch was given.
++ # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+- enableval="$enable_pch"
+- kde_use_pch=$enableval
++ enableval=$enable_pch; kde_use_pch=$enableval
+ else
+ kde_use_pch=no
+-fi;
++fi
++
+
+ HAVE_GCC_VISIBILITY=0
+
+@@ -5004,16 +5777,15 @@
+ if test "$GXX" = "yes"; then
+ gcc_no_reorder_blocks=NO
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5048,8 +5820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4872,7 +9504,56 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5140,8 +5153,7 @@
+@@ -5066,7 +5837,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5080,13 +5853,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ gcc_no_reorder_blocks=YES
+ 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
+@@ -5098,16 +5871,15 @@
+ CFLAGS="$CFLAGS -fno-reorder-blocks"
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5142,8 +5914,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4882,7 +9563,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5228,8 +5240,7 @@
+@@ -5160,7 +5931,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5174,28 +5947,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5230,8 +6002,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4892,7 +9620,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5316,8 +5327,7 @@
+@@ -5248,7 +6019,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5262,28 +6035,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-check-new"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5318,8 +6090,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4902,7 +9677,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5404,8 +5414,7 @@
+@@ -5336,7 +6107,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5350,28 +6123,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS -fno-common"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5406,8 +6178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4912,7 +9734,87 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5520,8 +5529,7 @@
+@@ -5424,7 +6195,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5438,13 +6211,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_EXCEPTIONS="-fexceptions"
+ 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; }
+ :
+ USE_EXCEPTIONS=
+ fi
+@@ -5452,37 +6225,37 @@
+ ENABLE_PERMISSIVE_FLAG="-fpermissive"
+
+ if test "$kde_use_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+ echo >conftest.h
+ if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- 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
+ if test "$kde_gcc_supports_pch" = "yes"; then
+- echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+ if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+ kde_gcc_supports_pch=yes
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ kde_gcc_supports_pch=no
+- 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
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
+
+
+- echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5522,8 +6295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4922,7 +9824,51 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5613,8 +5621,7 @@
+@@ -5540,9 +6312,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_opt_noinline_match=no
++ kde_cv_opt_noinline_match=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -5550,8 +6323,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+
+ if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+ CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5571,16 +6344,15 @@
+
+ if test "$kde_use_pch" = "yes"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5615,8 +6387,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4932,7 +9878,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5702,8 +5709,7 @@
+@@ -5633,7 +6404,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5647,29 +6420,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --pch"
+ 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
+
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5704,8 +6476,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4942,7 +9936,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5790,8 +5796,7 @@
+@@ -5722,7 +6493,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5736,28 +6509,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5792,8 +6564,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4952,7 +9993,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5878,8 +5883,7 @@
+@@ -5810,7 +6581,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5824,28 +6597,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5880,8 +6652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4962,7 +10050,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5966,8 +5970,7 @@
+@@ -5898,7 +6669,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -5912,28 +6685,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -5968,8 +6740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4972,7 +10107,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6054,8 +6057,7 @@
+@@ -5986,7 +6757,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6000,28 +6773,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ 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
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -6056,8 +6828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4982,7 +10164,124 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6478,8 +6480,7 @@
+@@ -6074,7 +6845,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6088,13 +6861,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ CXXFLAGS="$CXXFLAGS --one_per"
+ 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
+@@ -6201,13 +6974,13 @@
+ fi
+
+
+- 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'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6263,9 +7036,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6303,6 +7077,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6320,8 +7095,8 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6370,9 +7145,10 @@
+ # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -6410,6 +7186,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+
+ done
+@@ -6436,16 +7213,15 @@
+ NOOPT_CFLAGS=-O0
+ fi
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -6480,8 +7256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4992,7 +10291,93 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6605,8 +6606,7 @@
+@@ -6498,7 +7273,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6512,22 +7289,21 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ NOOPT_CXXFLAGS=-O0
+ 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
+
+
+- # Check whether --enable-coverage or --disable-coverage was given.
++ # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+- enableval="$enable_coverage"
+-
++ enableval=$enable_coverage;
+ if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+ ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+ ac_coverage_linker="-lgcc"
+@@ -6543,36 +7319,36 @@
+ CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+ LDFLAGS="$LDFLAGS $ac_coverage_linker"
+
+-fi;
++fi
++
+
+
+
+
+
+
+- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++ # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+- enableval="$enable_new_ldflags"
+- kde_use_new_ldflags=$enableval
++ enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+ kde_use_new_ldflags=no
+-fi;
++fi
++
+
+ LDFLAGS_AS_NEEDED=""
+ LDFLAGS_NEW_DTAGS=""
+ if test "x$kde_use_new_ldflags" = "xyes"; then
+ LDFLAGS_NEW_DTAGS=""
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -6607,8 +7383,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5002,7 +10387,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6694,8 +6694,7 @@
+@@ -6625,7 +7400,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6639,29 +7416,28 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ 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
+
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -6696,8 +7472,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5012,7 +10445,71 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6778,185 +6777,6 @@
+@@ -6714,7 +7489,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -6728,13 +7505,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ 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
+@@ -6744,13 +7521,13 @@
+
+
+
+- # Check whether --enable-final or --disable-final was given.
++ # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+- enableval="$enable_final"
+- kde_use_final=$enableval
++ enableval=$enable_final; kde_use_final=$enableval
+ else
+ kde_use_final=no
+-fi;
++fi
++
+
+ if test "x$kde_use_final" = "xyes"; then
+ KDE_USE_FINAL_TRUE=""
+@@ -6763,13 +7540,13 @@
+
+
+
+- # Check whether --enable-closure or --disable-closure was given.
++ # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+- enableval="$enable_closure"
+- kde_use_closure=$enableval
++ enableval=$enable_closure; kde_use_closure=$enableval
+ else
+ kde_use_closure=no
+-fi;
++fi
++
+
+ KDE_NO_UNDEFINED=""
+ if test "x$kde_use_closure" = "xyes"; then
+@@ -6780,198 +7557,19 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -5198,7 +10695,125 @@
fi
-@@ -7144,7 +6964,7 @@
+
+
+
+- # Check whether --enable-nmcheck or --disable-nmcheck was given.
++ # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+- enableval="$enable_nmcheck"
+- kde_use_nmcheck=$enableval
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+ kde_use_nmcheck=no
+-fi;
++fi
++
+
+ if test "$kde_use_nmcheck" = "yes"; then
+ KDE_USE_NMCHECK_TRUE=""
+@@ -6999,10 +7597,9 @@
+ INCLTDL="$LTDLINCL"
+
+
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+- enableval="$enable_shared"
+- p=${PACKAGE-default}
++ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+@@ -7021,12 +7618,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"
+- p=${PACKAGE-default}
++ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+@@ -7045,7 +7642,8 @@
+ esac
+ else
+ enable_static=no
+-fi;
++fi
++
+
+
+
+@@ -7054,11 +7652,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
+-fi;
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
++
+
+ if test "$kdelibsuff" = "auto"; then
+
+@@ -7079,8 +7677,8 @@
+ kdelibsuff=
+ fi
+ if test -z "$kdelibsuff"; then
+- echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++ { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7096,14 +7694,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+
+- echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++ { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+ fi
+
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+- enableval="$enable_fast_install"
+- p=${PACKAGE-default}
++ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+@@ -7122,10 +7719,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
+@@ -7149,7 +7747,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
@@ -5207,7 +10822,292 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7249,7 +7069,7 @@
+@@ -7178,83 +7776,230 @@
+ fi
+
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+
+-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 grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+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'
++ ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.*;;
++esac
+
+
++ $ac_path_GREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
+-else
+- with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
+- # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+- case $host in
+- *-*-mingw*)
+- # gcc leaves a trailing carriage return which upsets mingw
+- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+- *)
+- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+- esac
+- case $ac_prog in
+- # Accept absolute paths.
+- [\\/]* | ?:[\\/]*)
+- re_direlt='/[^/][^/]*/\.\./'
+- # Canonicalize the pathname of ld
+- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+- done
+- test -z "$LD" && LD="$ac_prog"
+- ;;
+- "")
+- # If it fails, then pretend we aren't using GCC.
+- ac_prog=ld
+- ;;
+- *)
+- # If it is relative, then search for the first ld in PATH.
+- with_gnu_ld=unknown
+- ;;
+- esac
+-elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++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
++
+ else
+- if test -z "$LD"; then
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH; do
++ ac_cv_path_GREP=$GREP
++fi
++
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++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_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_path_EGREP="$GREP -E"
++ else
++ # Extract the first word of "egrep" to use in msg output
++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
++ 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
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ ac_count=`expr $ac_count + 1`
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.*;;
++esac
++
++
++ $ac_path_EGREP_found && break 3
++ done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++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
++
++else
++ ac_cv_path_EGREP=$EGREP
++fi
++
++
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++ with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [\\/]* | ?:[\\/]*)
++ re_direlt='/[^/][^/]*/\.\./'
++ # Canonicalize the pathname of ld
++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
++else
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -z "$LD"; then
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
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,
@@ -5216,7 +11116,27 @@
# 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'*)
-@@ -7283,7 +7103,7 @@
+@@ -7274,21 +8019,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ 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
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5225,7 +11145,33 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7313,6 +7133,15 @@
+@@ -7298,29 +8043,38 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -5239,9 +11185,14 @@
+ ;;
+esac
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7323,36 +7152,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7328,56 +8082,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -5309,7 +11260,37 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-@@ -7399,44 +7235,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; 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; }
+ else
+- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7404,44 +8165,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -5364,7 +11345,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7452,7 +7280,7 @@
+@@ -7457,7 +8210,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -5373,7 +11354,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
-@@ -7468,43 +7296,27 @@
+@@ -7473,43 +8226,27 @@
esac
;;
@@ -5430,7 +11411,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
-@@ -7523,32 +7335,22 @@
+@@ -7528,32 +8265,22 @@
;;
openbsd*)
@@ -5466,7 +11447,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]'
-@@ -7569,10 +7371,13 @@
+@@ -7574,17 +8301,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5481,7 +11462,16 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -7588,6 +7393,9 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ 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
+@@ -7593,14 +8323,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -5491,16 +11481,27 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-@@ -7622,7 +7430,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7627,7 +8360,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7625 "configure"' > conftest.$ac_ext
-+ echo '#line 7433 "configure"' > conftest.$ac_ext
+- echo '#line 7630 "configure"' > conftest.$ac_ext
++ echo '#line 8363 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7665,14 +7473,13 @@
+@@ -7670,14 +8403,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -5517,7 +11518,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7684,7 +7491,6 @@
+@@ -7689,7 +8421,6 @@
esac
;;
*64-bit*)
@@ -5525,7 +11526,18 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7744,8 +7550,7 @@
+@@ -7714,8 +8445,8 @@
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7749,8 +8480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5535,7 +11547,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7780,6 +7585,26 @@
+@@ -7767,8 +8497,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-lt_cv_cc_needs_belf=no
++ lt_cv_cc_needs_belf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -7778,13 +8509,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -5562,7 +11594,18 @@
esac
-@@ -7820,8 +7645,7 @@
+@@ -7792,8 +8543,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7825,8 +8576,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5572,7 +11615,68 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7991,8 +7815,7 @@
+@@ -7843,8 +8593,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test $ac_cv_header_stdc = yes; then
+@@ -7901,6 +8652,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -7920,8 +8672,8 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -7944,12 +8696,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -7972,9 +8726,9 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $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
+@@ -7996,8 +8750,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5582,7 +11686,53 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8059,8 +7882,7 @@
+@@ -8014,12 +8767,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_ext
+ fi
+-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_header" | $as_tr_cpp` 1
+@@ -8034,18 +8789,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8064,8 +8820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5592,8 +11742,76 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8175,6 +7997,243 @@
+@@ -8082,15 +8837,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8124,9 +8880,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8150,25 +8907,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8180,17 +8931,258 @@
+
done
+
@@ -5601,13 +11819,13 @@
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
-+ 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'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5663,9 +11881,10 @@
+ # Broken: fails on valid input.
+continue
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
-+ # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -5703,6 +11922,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -5720,8 +11940,8 @@
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
@@ -5770,9 +11990,10 @@
+ # Broken: fails on valid input.
+continue
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
-+ # OK, works on sane cases. Now check whether non-existent headers
++ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -5810,6 +12031,7 @@
+ac_preproc_ok=:
+break
+fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -5825,7 +12047,7 @@
+ { (exit 1); exit 1; }; }
+fi
+
-+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'
@@ -5836,16 +12058,157 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8267,7 +8326,7 @@
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8203,36 +9195,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
++ { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
+ 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
++
+ test -n "$F77" && break
+ done
+ fi
+ if test -z "$F77"; then
+ ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8245,48 +9239,63 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
+ 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
+
++
+ test -n "$ac_ct_F77" && break
+ done
+
+- F77=$ac_ct_F77
++ if test "x$ac_ct_F77" = x; then
++ F77=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ F77=$ac_ct_F77
++ fi
+ fi
+
+
# Provide some information about the compiler.
--echo "$as_me:8270:" \
-+echo "$as_me:8329:" \
- "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:8275:" \
+- "checking for Fortran 77 compiler version" >&5
++echo "$as_me:$LINENO: 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
-@@ -8313,8 +8372,7 @@
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++ (eval $ac_compiler --version >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++ (eval $ac_compiler -v >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++ (eval $ac_compiler -V >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+@@ -8296,8 +9305,8 @@
+ # input file. (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8318,8 +9327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5855,7 +12218,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8363,8 +8421,7 @@
+@@ -8336,20 +9344,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8368,8 +9377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5865,7 +12255,33 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8422,7 +8479,7 @@
+@@ -8386,13 +9394,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
++ ac_cv_prog_f77_g=no
+ 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
++{ 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
+@@ -8421,13 +9430,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -5874,7 +12290,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8451,20 +8508,70 @@
+@@ -8456,20 +9465,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -5951,7 +12367,33 @@
# 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.
-@@ -8501,9 +8608,6 @@
+@@ -8480,19 +9539,19 @@
+ fi
+
+ if test -n $lt_cv_sys_max_cmd_len ; then
+- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+- echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
++ { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+
+
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8506,9 +9565,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -5961,7 +12403,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'"
-@@ -8525,14 +8629,30 @@
+@@ -8530,14 +9586,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'"
;;
@@ -5994,7 +12436,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8550,14 +8670,17 @@
+@@ -8555,14 +9627,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -6014,8 +12456,41 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8719,7 +8842,7 @@
+@@ -8680,15 +9755,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
+- echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++ { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+- echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8702,8 +9777,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+
+
+@@ -8724,7 +9799,7 @@
+
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
@@ -6023,7 +12498,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8739,7 +8862,7 @@
+@@ -8744,7 +9819,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -6032,7 +12507,313 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8996,6 +9119,7 @@
+@@ -8754,8 +9829,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8768,32 +9843,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++ { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8806,27 +9883,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ 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
+
+- AR=$ac_ct_AR
++ if test "x$ac_ct_AR" = x; then
++ AR="false"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ AR=$ac_ct_AR
++ fi
+ else
+ AR="$ac_cv_prog_AR"
+ fi
+@@ -8834,8 +9925,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8848,32 +9939,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8886,27 +9979,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ 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
+
+- RANLIB=$ac_ct_RANLIB
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ RANLIB=$ac_ct_RANLIB
++ fi
+ else
+ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -8914,8 +10021,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8928,32 +10035,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+- echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8966,27 +10075,41 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ 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
+
+- STRIP=$ac_ct_STRIP
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
+ else
+ STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9001,6 +10124,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -6040,7 +12821,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9015,15 +9139,26 @@
+@@ -9020,21 +10144,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -6069,7 +12850,15 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -9049,7 +9184,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9054,7 +10189,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -6078,7 +12867,31 @@
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
-@@ -9111,7 +9246,7 @@
+@@ -9086,17 +10221,17 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ 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
+
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+- echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9116,7 +10251,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -6087,7 +12900,52 @@
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
-@@ -9206,68 +9341,25 @@
+@@ -9148,11 +10283,11 @@
+
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ 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
+
+ else
+@@ -9167,21 +10302,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
++ enableval=$enable_libtool_lock;
++fi
+
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+
+-# Check whether --with-pic or --without-pic was given.
++# Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then
+- withval="$with_pic"
+- pic_mode="$withval"
++ withval=$with_pic; pic_mode="$withval"
+ else
+ pic_mode=default
+-fi;
++fi
++
+ test -z "$pic_mode" && pic_mode=default
+
+ # Use C for the default configuration in the libtool script
+@@ -9211,68 +10346,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -6171,7 +13029,18 @@
## CAVEAT EMPTOR:
-@@ -9296,18 +9388,20 @@
+@@ -9286,8 +10378,8 @@
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9301,26 +10393,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 \
@@ -6179,13 +13048,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:9302: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9394: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9306: \$? = $ac_status" >&5
-+ echo "$as_me:9398: \$? = $ac_status" >&5
+- echo "$as_me:9311: \$? = $ac_status" >&5
++ echo "$as_me:10403: \$? = $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
@@ -6197,7 +13066,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9368,6 +9462,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ 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"
+@@ -9334,8 +10428,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9373,6 +10467,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -6209,7 +13099,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9384,7 +9483,7 @@
+@@ -9389,7 +10488,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6218,7 +13108,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9410,6 +9509,16 @@
+@@ -9415,6 +10514,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -6235,7 +13125,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9421,7 +9530,7 @@
+@@ -9426,7 +10535,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.
@@ -6244,7 +13134,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9444,13 +9553,20 @@
+@@ -9449,13 +10558,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -6267,7 +13157,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9465,15 +9581,15 @@
+@@ -9470,15 +10586,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -6289,7 +13179,7 @@
;;
sunos4*)
-@@ -9482,7 +9598,7 @@
+@@ -9487,7 +10603,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -6298,10 +13188,12 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9495,6 +9611,17 @@
+@@ -9500,8 +10616,19 @@
fi
;;
+- uts4*)
+- lt_prog_compiler_pic='-pic'
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
@@ -6313,10 +13205,33 @@
+ lt_prog_compiler_can_build_shared=no
+ ;;
+
- uts4*)
- lt_prog_compiler_pic='-pic'
++ uts4*)
++ lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9529,18 +9656,20 @@
+ ;;
+
+@@ -9511,16 +10638,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9534,26 +10661,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 \
@@ -6324,13 +13239,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:9535: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9540: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9539: \$? = $ac_status" >&5
-+ echo "$as_me:9666: \$? = $ac_status" >&5
+- echo "$as_me:9544: \$? = $ac_status" >&5
++ echo "$as_me:10671: \$? = $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
@@ -6342,25 +13257,37 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9561,7 +9690,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+@@ -9566,7 +10695,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9571,6 +9700,48 @@
+@@ -9576,8 +10705,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -6387,8 +13314,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+ :
@@ -6397,10 +13324,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9583,38 +9754,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9588,60 +10759,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6421,13 +13350,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:9602: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9766: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9607: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10771: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9606: \$? = $ac_status" >&5
-+ echo "$as_me:9770: \$? = $ac_status" >&5
+- echo "$as_me:9611: \$? = $ac_status" >&5
++ echo "$as_me:10775: \$? = $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
@@ -6451,7 +13380,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9685,6 +9854,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ 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;}
+@@ -9651,8 +10820,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+@@ -9690,6 +10859,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -6468,7 +13436,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9695,6 +9874,10 @@
+@@ -9700,6 +10879,10 @@
with_gnu_ld=no
fi
;;
@@ -6479,7 +13447,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9705,6 +9888,27 @@
+@@ -9710,6 +10893,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -6507,7 +13475,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9742,7 +9946,7 @@
+@@ -9747,7 +10951,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6516,7 +13484,7 @@
else
ld_shlibs=no
fi
-@@ -9752,13 +9956,13 @@
+@@ -9757,13 +10961,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'
@@ -6533,7 +13501,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
-@@ -9767,23 +9971,70 @@
+@@ -9772,23 +10976,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6609,7 +13577,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9797,13 +10048,40 @@
+@@ -9802,13 +11053,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6652,7 +13620,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9813,24 +10091,19 @@
+@@ -9818,24 +11096,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6684,7 +13652,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9842,7 +10115,7 @@
+@@ -9847,7 +11120,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -6693,7 +13661,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9864,9 +10137,21 @@
+@@ -9869,9 +11142,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
@@ -6717,7 +13685,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9883,7 +10168,7 @@
+@@ -9888,7 +11173,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -6726,7 +13694,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`
-@@ -9902,8 +10187,12 @@
+@@ -9907,8 +11192,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -6739,7 +13707,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9911,22 +10200,23 @@
+@@ -9916,22 +11205,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -6770,7 +13738,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9950,8 +10240,7 @@
+@@ -9955,8 +11245,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6780,7 +13748,14 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9978,14 +10267,13 @@
+@@ -9978,19 +11267,20 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6798,7 +13773,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10012,8 +10300,7 @@
+@@ -10017,8 +11307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6808,7 +13783,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10045,13 +10332,11 @@
+@@ -10040,7 +11329,9 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10050,13 +11341,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -6825,7 +13810,7 @@
fi
fi
;;
-@@ -10064,7 +10349,7 @@
+@@ -10069,7 +11358,7 @@
ld_shlibs=no
;;
@@ -6834,7 +13819,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10074,13 +10359,13 @@
+@@ -10079,13 +11368,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6851,7 +13836,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.
-@@ -10090,52 +10375,52 @@
+@@ -10095,52 +11384,52 @@
;;
darwin* | rhapsody*)
@@ -6944,7 +13929,7 @@
fi
;;
-@@ -10169,8 +10454,8 @@
+@@ -10174,8 +11463,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6955,7 +13940,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10178,7 +10463,7 @@
+@@ -10183,7 +11472,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6964,7 +13949,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
-@@ -10192,47 +10477,62 @@
+@@ -10197,47 +11486,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -7033,25 +14018,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
+- hardcode_direct=no
+- hardcode_shlibpath_var=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=no
hardcode_shlibpath_var=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_direct=no
-- hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10246,7 +10546,7 @@
+@@ -10251,7 +11555,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7060,7 +14045,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'
-@@ -10256,7 +10556,7 @@
+@@ -10261,7 +11565,7 @@
link_all_deplibs=yes
;;
@@ -7069,7 +14054,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10279,7 +10579,8 @@
+@@ -10284,7 +11588,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
@@ -7079,7 +14064,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10289,7 +10590,7 @@
+@@ -10294,7 +11599,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -7088,7 +14073,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10300,14 +10601,14 @@
+@@ -10305,14 +11610,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -7105,7 +14090,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'
-@@ -10319,13 +10620,13 @@
+@@ -10324,13 +11629,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -7121,7 +14106,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10333,21 +10634,15 @@
+@@ -10338,21 +11643,15 @@
hardcode_libdir_separator=:
;;
@@ -7147,7 +14132,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'
-@@ -10356,8 +10651,18 @@
+@@ -10361,8 +11660,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7168,7 +14153,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10366,7 +10671,7 @@
+@@ -10371,7 +11680,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.
@@ -7177,7 +14162,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10414,36 +10719,45 @@
+@@ -10419,36 +11728,45 @@
fi
;;
@@ -7244,8 +14229,14 @@
;;
uts4*)
-@@ -10462,11 +10776,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10463,15 +11781,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -7256,7 +14247,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -10499,6 +10808,7 @@
+@@ -10489,8 +11802,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.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -10504,6 +11817,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -7264,7 +14266,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10534,7 +10844,7 @@
+@@ -10526,20 +11840,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7273,7 +14292,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10544,7 +10854,20 @@
+@@ -10549,7 +11863,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7295,7 +14314,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10609,7 +10932,7 @@
+@@ -10614,7 +11941,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7304,7 +14323,7 @@
;;
beos*)
-@@ -10618,7 +10941,7 @@
+@@ -10623,7 +11950,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7313,7 +14332,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10634,7 +10957,7 @@
+@@ -10639,7 +11966,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7322,7 +14341,7 @@
need_version=no
need_lib_prefix=no
-@@ -10646,7 +10969,8 @@
+@@ -10651,7 +11978,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7332,7 +14351,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10676,7 +11000,7 @@
+@@ -10681,7 +12009,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7341,7 +14360,7 @@
;;
esac
;;
-@@ -10699,7 +11023,7 @@
+@@ -10704,7 +12032,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7350,7 +14369,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"`
-@@ -10722,20 +11046,17 @@
+@@ -10727,20 +12055,17 @@
dynamic_linker=no
;;
@@ -7382,7 +14401,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10753,14 +11074,19 @@
+@@ -10758,14 +12083,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7404,7 +14423,7 @@
esac
;;
-@@ -10780,9 +11106,9 @@
+@@ -10785,9 +12115,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7416,7 +14435,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10797,7 +11123,7 @@
+@@ -10802,7 +12132,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7425,7 +14444,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10808,7 +11134,7 @@
+@@ -10813,7 +12143,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7434,7 +14453,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10820,6 +11146,18 @@
+@@ -10825,6 +12155,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -7453,7 +14472,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10863,29 +11201,26 @@
+@@ -10868,29 +12210,26 @@
;;
# This must be Linux ELF.
@@ -7490,7 +14509,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,
-@@ -10895,6 +11230,18 @@
+@@ -10900,6 +12239,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7509,7 +14528,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10904,7 +11251,7 @@
+@@ -10909,7 +12260,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7518,7 +14537,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10932,8 +11279,13 @@
+@@ -10937,8 +12288,13 @@
openbsd*)
version_type=sunos
@@ -7533,7 +14552,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
-@@ -10953,7 +11305,7 @@
+@@ -10958,7 +12314,7 @@
os2*)
libname_spec='$name'
@@ -7542,7 +14561,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10971,13 +11323,6 @@
+@@ -10976,13 +12332,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7556,7 +14575,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11003,7 +11348,7 @@
+@@ -11008,7 +12357,7 @@
need_version=yes
;;
@@ -7565,7 +14584,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'
-@@ -11036,6 +11381,29 @@
+@@ -11041,6 +12390,29 @@
fi
;;
@@ -7595,17 +14614,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11051,12 +11419,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11052,16 +12424,21 @@
+ 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
+-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
++{ 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=
if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
@@ -7615,7 +14642,91 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11182,8 +11555,7 @@
+@@ -11081,8 +12458,8 @@
+ # directories.
+ hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+@@ -11095,29 +12472,29 @@
+
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 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
+ ;;
+ *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+ fi
+@@ -11149,8 +12526,8 @@
+
+ darwin*)
+ # if libdl is installed we need to link against it
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11163,17 +12540,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11187,8 +12564,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7625,7 +14736,73 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11286,8 +11658,7 @@
+@@ -11205,14 +12581,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11226,8 +12603,8 @@
+ ;;
+
+ *)
+- echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11254,30 +12631,24 @@
+
+ #undef shl_load
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shl_load ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -11291,8 +12662,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7635,7 +14812,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11352,8 +11723,7 @@
+@@ -11309,18 +12679,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shl_load=no
++ ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11333,17 +12704,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -11357,8 +12728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7645,7 +14869,69 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11446,8 +11816,7 @@
+@@ -11375,19 +12745,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11414,30 +12785,24 @@
+
+ #undef dlopen
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11451,8 +12816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7655,7 +14941,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11512,8 +11881,7 @@
+@@ -11469,18 +12833,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_dlopen=no
++ ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11493,17 +12858,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11517,8 +12882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7665,7 +14998,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11579,8 +11947,7 @@
+@@ -11535,19 +12899,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11560,17 +12925,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -11584,8 +12949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7675,7 +15056,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11646,8 +12013,7 @@
+@@ -11602,19 +12966,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_svld_dlopen=no
++ ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11627,17 +12992,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+ ;
+ return 0;
+ }
+@@ -11651,8 +13016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7685,7 +15114,26 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11706,7 +12072,7 @@
+@@ -11669,14 +13033,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_dld_link=no
++ ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11711,13 +13076,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -7694,16 +15142,24 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11722,7 +12088,7 @@
+
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11727,7 +13092,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11725 "configure"
-+#line 12091 "configure"
+-#line 11730 "configure"
++#line 13095 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11779,6 +12145,8 @@
+@@ -11784,6 +13149,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7712,7 +15168,7 @@
exit (status);
}
-@@ -11788,12 +12156,12 @@
+@@ -11793,12 +13160,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7727,25 +15183,35 @@
esac
else :
# compilation failed
-@@ -11808,7 +12176,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11809,13 +13176,13 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11820,7 +12188,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11825,7 +13192,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11823 "configure"
-+#line 12191 "configure"
+-#line 11828 "configure"
++#line 13195 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11877,6 +12245,8 @@
+@@ -11882,6 +13249,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -7754,7 +15220,7 @@
exit (status);
}
-@@ -11886,12 +12256,12 @@
+@@ -11891,12 +13260,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7769,17 +15235,38 @@
esac
else :
# compilation failed
-@@ -11924,7 +12294,7 @@
+@@ -11907,8 +13276,8 @@
+
+
fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+ fi
+ CPPFLAGS="$save_CPPFLAGS"
+@@ -11929,19 +13298,19 @@
+ fi
+
-# Report which librarie types wil actually be built
+-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
+# Report which library types will actually be built
- 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
-@@ -11936,7 +12306,7 @@
++{ 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
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -7787,7 +15274,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11945,47 +12315,10 @@
+@@ -11950,58 +13319,21 @@
fi
;;
@@ -7835,8 +15322,25 @@
- fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12011,7 +12344,8 @@
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12016,7 +13348,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.
@@ -7846,7 +15350,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 \
-@@ -12125,11 +12459,11 @@
+@@ -12130,11 +13463,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7860,7 +15364,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12159,6 +12493,12 @@
+@@ -12164,6 +13497,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7873,7 +15377,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12170,6 +12510,9 @@
+@@ -12175,6 +13514,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -7883,7 +15387,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12189,7 +12532,7 @@
+@@ -12194,7 +13536,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7892,7 +15396,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12220,7 +12563,7 @@
+@@ -12225,7 +13567,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7901,7 +15405,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12235,7 +12578,7 @@
+@@ -12240,7 +13582,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -7910,7 +15414,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12462,7 +12805,10 @@
+@@ -12467,7 +13809,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.
@@ -7922,7 +15426,23 @@
fi
-@@ -12497,6 +12843,9 @@
+@@ -12480,11 +13825,11 @@
+ CC="$lt_save_CC"
+
+
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+- withval="$with_tags"
+- tagnames="$withval"
+-fi;
++ withval=$with_tags; tagnames="$withval"
++fi
++
+
+ if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+@@ -12502,6 +13847,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -7932,18 +15452,20 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12527,7 +12876,9 @@
+@@ -12532,8 +13880,10 @@
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
+- ac_ext=cc
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
++ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12547,6 +12898,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12552,6 +13902,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -7951,7 +15473,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12564,7 +12916,7 @@
+@@ -12569,7 +13920,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -7960,7 +15482,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12574,17 +12926,34 @@
+@@ -12579,17 +13930,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -7996,7 +15518,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12595,18 +12964,27 @@
+@@ -12600,18 +13968,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -8027,7 +15549,48 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12677,7 +13055,7 @@
+@@ -12625,18 +14002,18 @@
+ # Set up default GNU C++ configuration
+
+
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+- withval="$with_gnu_ld"
+- test "$withval" = no || with_gnu_ld=yes
++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+ with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+@@ -12665,11 +14042,11 @@
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+- echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12682,7 +14059,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,
@@ -8036,7 +15599,27 @@
# 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'*)
-@@ -12711,7 +13089,7 @@
+@@ -12702,21 +14079,21 @@
+
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+- echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++ { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ 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
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8045,7 +15628,18 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12730,8 +13108,8 @@
+@@ -12726,8 +14103,8 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+@@ -12735,8 +14112,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
@@ -8056,7 +15650,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12757,7 +13135,7 @@
+@@ -12762,7 +14139,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.
@@ -8065,7 +15659,18 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12788,8 +13166,23 @@
+@@ -12777,8 +14154,8 @@
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+@@ -12793,8 +14170,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -8091,7 +15696,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12806,7 +13199,7 @@
+@@ -12811,7 +14203,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -8100,7 +15705,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`
-@@ -12825,8 +13218,12 @@
+@@ -12830,8 +14222,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -8113,7 +15718,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12835,15 +13232,16 @@
+@@ -12840,15 +14236,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8134,7 +15739,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.
-@@ -12873,8 +13271,7 @@
+@@ -12878,8 +14275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8144,8 +15749,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12903,13 +13300,12 @@
+@@ -12901,20 +14297,21 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -8160,7 +15774,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12936,8 +13332,7 @@
+@@ -12941,8 +14338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8170,7 +15784,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12969,16 +13364,26 @@
+@@ -12964,7 +14360,9 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -12974,16 +14372,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -8202,7 +15826,7 @@
chorus*)
case $cc_basename in
*)
-@@ -12992,12 +13397,12 @@
+@@ -12997,12 +14405,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'
@@ -8217,7 +15841,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
-@@ -13006,70 +13411,81 @@
+@@ -13011,70 +14419,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8351,7 +15975,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13080,14 +13496,14 @@
+@@ -13085,14 +14504,14 @@
;;
esac
;;
@@ -8368,7 +15992,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13104,12 +13520,12 @@
+@@ -13109,12 +14528,12 @@
# location of the library.
case $cc_basename in
@@ -8384,7 +16008,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13118,11 +13534,11 @@
+@@ -13123,11 +14542,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.
@@ -8398,7 +16022,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13132,33 +13548,22 @@
+@@ -13137,33 +14556,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -8439,7 +16063,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13169,17 +13574,20 @@
+@@ -13174,17 +14582,20 @@
esac
case $cc_basename in
@@ -8466,7 +16090,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13195,12 +13603,15 @@
+@@ -13200,12 +14611,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -8486,7 +16110,7 @@
;;
esac
fi
-@@ -13211,11 +13622,25 @@
+@@ -13216,11 +14630,25 @@
;;
esac
;;
@@ -8514,7 +16138,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13226,9 +13651,9 @@
+@@ -13231,9 +14659,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -8526,7 +16150,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13237,16 +13662,16 @@
+@@ -13242,16 +14670,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -8547,7 +16171,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13264,20 +13689,44 @@
+@@ -13269,20 +14697,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -8598,7 +16222,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13305,7 +13754,7 @@
+@@ -13310,7 +14762,7 @@
;;
mvs*)
case $cc_basename in
@@ -8607,7 +16231,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13315,7 +13764,7 @@
+@@ -13320,7 +14772,7 @@
;;
esac
;;
@@ -8616,7 +16240,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=
-@@ -13326,15 +13775,31 @@
+@@ -13331,15 +14783,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::"'
;;
@@ -8650,7 +16274,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13344,14 +13809,14 @@
+@@ -13349,14 +14817,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -8668,7 +16292,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13369,7 +13834,7 @@
+@@ -13374,7 +14842,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8677,7 +16301,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13388,13 +13853,13 @@
+@@ -13393,13 +14861,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -8693,7 +16317,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13403,17 +13868,17 @@
+@@ -13408,17 +14876,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -8715,7 +16339,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13432,7 +13897,7 @@
+@@ -13437,7 +14905,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8724,7 +16348,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13453,27 +13918,14 @@
+@@ -13458,27 +14926,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -8754,7 +16378,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13486,36 +13938,33 @@
+@@ -13491,36 +14946,33 @@
;;
solaris*)
case $cc_basename in
@@ -8803,7 +16427,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13523,9 +13972,9 @@
+@@ -13528,9 +14980,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -8815,7 +16439,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13535,9 +13984,9 @@
+@@ -13540,9 +14992,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
@@ -8827,7 +16451,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13546,9 +13995,9 @@
+@@ -13551,9 +15003,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -8839,14 +16463,14 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13561,12 +14010,63 @@
+@@ -13566,12 +15018,63 @@
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
- archive_cmds_need_lc_CXX=no
++ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
@@ -8879,7 +16503,7 @@
+ # names for shared libraries.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
-+ archive_cmds_need_lc_CXX=no
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_CXX=':'
@@ -8905,7 +16529,18 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13623,7 +14123,7 @@
+@@ -13591,8 +15094,8 @@
+ ld_shlibs_CXX=no
+ ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+ GCC_CXX="$GXX"
+@@ -13628,7 +15131,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.
@@ -8914,7 +16549,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13663,7 +14163,7 @@
+@@ -13668,7 +15171,7 @@
fi
;;
@@ -8923,7 +16558,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13699,6 +14199,29 @@
+@@ -13704,6 +15207,29 @@
$rm -f confest.$objext
@@ -8953,7 +16588,18 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13746,6 +14269,10 @@
+@@ -13712,8 +15238,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -13751,6 +15277,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -8964,7 +16610,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13754,7 +14281,7 @@
+@@ -13759,7 +15289,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8973,7 +16619,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13779,18 +14306,28 @@
+@@ -13784,18 +15314,28 @@
;;
chorus*)
case $cc_basename in
@@ -9005,7 +16651,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13798,22 +14335,22 @@
+@@ -13803,22 +15343,22 @@
;;
esac
;;
@@ -9034,7 +16680,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13826,9 +14363,13 @@
+@@ -13831,9 +15371,13 @@
;;
esac
;;
@@ -9049,7 +16695,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13837,20 +14378,26 @@
+@@ -13842,20 +15386,26 @@
;;
esac
;;
@@ -9080,7 +16726,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13867,25 +14414,25 @@
+@@ -13872,25 +15422,25 @@
;;
mvs*)
case $cc_basename in
@@ -9111,7 +16757,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13899,24 +14446,15 @@
+@@ -13904,24 +15454,15 @@
;;
psos*)
;;
@@ -9138,7 +16784,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13926,12 +14464,12 @@
+@@ -13931,12 +15472,12 @@
;;
sunos4*)
case $cc_basename in
@@ -9153,7 +16799,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13941,7 +14479,7 @@
+@@ -13946,7 +15487,7 @@
;;
tandem*)
case $cc_basename in
@@ -9162,7 +16808,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13949,7 +14487,14 @@
+@@ -13954,7 +15495,14 @@
;;
esac
;;
@@ -9178,7 +16824,28 @@
;;
vxworks*)
;;
-@@ -13982,18 +14527,20 @@
+@@ -13964,16 +15512,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -13987,26 +15535,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 \
@@ -9186,13 +16853,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:13988: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14533: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13993: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15541: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13992: \$? = $ac_status" >&5
-+ echo "$as_me:14537: \$? = $ac_status" >&5
+- echo "$as_me:13997: \$? = $ac_status" >&5
++ echo "$as_me:15545: \$? = $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
@@ -9204,45 +16871,40 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -14014,7 +14561,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+@@ -14019,7 +15569,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14024,50 +14571,90 @@
+@@ -14029,8 +15579,50 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_cv_prog_compiler_c_o_CXX=no
-- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9266,8 +16928,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+ :
@@ -9276,18 +16938,22 @@
+fi
+
+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14041,60 +15633,58 @@
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+-
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -9298,13 +16964,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:14055: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14637: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14060: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14059: \$? = $ac_status" >&5
-+ echo "$as_me:14641: \$? = $ac_status" >&5
+- echo "$as_me:14064: \$? = $ac_status" >&5
++ echo "$as_me:15649: \$? = $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
@@ -9328,7 +16994,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14117,7 +14704,10 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ 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;}
+@@ -14104,8 +15694,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -14122,22 +15712,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -9340,8 +17045,13 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14128,11 +14718,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -9352,7 +17062,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -14165,6 +14750,7 @@
+@@ -14155,8 +15743,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.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -14170,6 +15758,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -9360,7 +17081,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14200,7 +14786,7 @@
+@@ -14192,20 +15781,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9369,7 +17107,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14210,7 +14796,20 @@
+@@ -14215,7 +15804,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9391,7 +17129,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14275,7 +14874,7 @@
+@@ -14280,7 +15882,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9400,7 +17138,7 @@
;;
beos*)
-@@ -14284,7 +14883,7 @@
+@@ -14289,7 +15891,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9409,7 +17147,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14300,7 +14899,7 @@
+@@ -14305,7 +15907,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9418,7 +17156,7 @@
need_version=no
need_lib_prefix=no
-@@ -14312,7 +14911,8 @@
+@@ -14317,7 +15919,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9428,7 +17166,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14342,7 +14942,7 @@
+@@ -14347,7 +15950,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9437,7 +17175,7 @@
;;
esac
;;
-@@ -14365,7 +14965,7 @@
+@@ -14370,7 +15973,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9446,7 +17184,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"`
-@@ -14388,20 +14988,17 @@
+@@ -14393,20 +15996,17 @@
dynamic_linker=no
;;
@@ -9478,7 +17216,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14419,14 +15016,19 @@
+@@ -14424,14 +16024,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9500,7 +17238,7 @@
esac
;;
-@@ -14446,9 +15048,9 @@
+@@ -14451,9 +16056,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9512,7 +17250,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14463,7 +15065,7 @@
+@@ -14468,7 +16073,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9521,7 +17259,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14474,7 +15076,7 @@
+@@ -14479,7 +16084,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9530,7 +17268,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14486,6 +15088,18 @@
+@@ -14491,6 +16096,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -9549,7 +17287,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14529,29 +15143,26 @@
+@@ -14534,29 +16151,26 @@
;;
# This must be Linux ELF.
@@ -9586,7 +17324,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,
-@@ -14561,6 +15172,18 @@
+@@ -14566,6 +16180,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9605,7 +17343,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14570,7 +15193,7 @@
+@@ -14575,7 +16201,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9614,7 +17352,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14598,8 +15221,13 @@
+@@ -14603,8 +16229,13 @@
openbsd*)
version_type=sunos
@@ -9629,7 +17367,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
-@@ -14619,7 +15247,7 @@
+@@ -14624,7 +16255,7 @@
os2*)
libname_spec='$name'
@@ -9638,7 +17376,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14637,13 +15265,6 @@
+@@ -14642,13 +16273,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -9652,7 +17390,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14669,7 +15290,7 @@
+@@ -14674,7 +16298,7 @@
need_version=yes
;;
@@ -9661,7 +17399,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'
-@@ -14702,6 +15323,29 @@
+@@ -14707,6 +16331,29 @@
fi
;;
@@ -9691,17 +17429,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14717,12 +15361,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14718,16 +16365,21 @@
+ 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
+-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
++{ 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_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
@@ -9711,7 +17457,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14754,1118 +15403,293 @@
+@@ -14747,8 +16399,8 @@
+ # directories.
+ hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+
+ if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+@@ -14759,1152 +16411,327 @@
enable_fast_install=needless
fi
@@ -9740,17 +17497,7 @@
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- ;;
-- esac
--fi
-
--if test "x$enable_dlopen" != xyes; then
-- enable_dlopen=unknown
-- enable_dlopen_self=unknown
-- enable_dlopen_self_static=unknown
--else
-- lt_cv_dlopen=no
-- lt_cv_dlopen_libs=
++
+# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
@@ -9808,12 +17555,7 @@
+ lt_cv_prog_compiler_c_o_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
-
-- case $host_os in
-- beos*)
-- lt_cv_dlopen="load_add_on"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
++
+ case $var in
+ old_archive_cmds_CXX | \
+ old_archive_from_new_cmds_CXX | \
@@ -9840,20 +17582,39 @@
+ *'\$0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
;;
-+ esac
+ esac
+-fi
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+- lt_cv_dlopen=no
+- lt_cv_dlopen_libs=
++cfgfile="$ofile"
+
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-+cfgfile="$ofile"
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
- darwin*)
- # if libdl is installed we need to link against it
@@ -9870,7 +17631,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -9913,8 +17675,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
-ac_cv_lib_dl_dlopen=no
-fi
@@ -9927,22 +17689,24 @@
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-fi
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
- ;;
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
- *)
- echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -9959,31 +17723,30 @@
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
-#undef shl_load
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# A C compiler.
++LTCC=$lt_LTCC
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10004,9 +17767,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -10042,8 +17804,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A C compiler.
-+LTCC=$lt_LTCC
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_shl_load=no
-fi
@@ -10068,8 +17830,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10112,8 +17874,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dld_shl_load=no
-fi
@@ -10140,27 +17902,27 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# A BSD-compatible nm program.
++NM=$lt_NM
-#undef dlopen
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# A symbol stripping program
++STRIP=$lt_STRIP
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10181,8 +17943,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
-int
-main ()
@@ -10218,8 +17980,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
-ac_cv_func_dlopen=no
-fi
@@ -10244,8 +18006,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10288,8 +18050,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Used on cygwin: assembler.
++AS="$AS"
-ac_cv_lib_dl_dlopen=no
-fi
@@ -10315,8 +18077,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10359,8 +18121,9 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
-ac_cv_lib_svld_dlopen=no
-fi
@@ -10386,8 +18149,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -10430,9 +18193,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# Object file suffix (normally "o").
++objext="$ac_objext"
-ac_cv_lib_dld_dld_link=no
-fi
@@ -10445,13 +18207,6 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
--fi
+# Old archive suffix (normally "a").
+libext="$libext"
@@ -10484,35 +18239,42 @@
+# Do we need a version for libraries?
+need_version=$need_version
-- ;;
-- esac
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+-fi
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+
+- ;;
+- esac
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -10525,20 +18287,20 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15391 "configure"
+-#line 15396 "configure"
-#include "confdefs.h"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Library versioning type.
++version_type=$version_type
-#include <stdio.h>
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -10549,8 +18311,9 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Library versioning type.
-+version_type=$version_type
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_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. */
@@ -10573,23 +18336,25 @@
-# endif
-# endif
-#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- if (self)
- {
@@ -10597,11 +18362,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- exit (status);
-}
@@ -10624,21 +18386,23 @@
- fi
-fi
-rm -fr conftest*
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -10652,23 +18416,23 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15489 "configure"
+-#line 15494 "configure"
-#include "confdefs.h"
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
-#include <stdio.h>
+# Dependencies to place before the objects being linked to create a
+# shared library.
-+predep_objects=$lt_predep_objects_CXX
++predeps=$lt_predeps_CXX
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -10681,7 +18445,7 @@
-#endif
+# Dependencies to place after the objects being linked to create a
+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++postdeps=$lt_postdeps_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -10704,27 +18468,33 @@
-# endif
-# endif
-#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
- exit (status);
-}
-EOF
@@ -10746,31 +18516,43 @@
- fi
-fi
-rm -fr conftest*
--
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
--
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
-
--
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -11047,13 +18829,46 @@
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -15981,7 +15805,10 @@
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+@@ -15986,7 +16813,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.
@@ -11065,7 +18880,7 @@
fi
-@@ -16053,16 +15880,42 @@
+@@ -16058,29 +16888,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11107,10 +18922,21 @@
+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
-@@ -16075,7 +15928,7 @@
+-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 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
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -11118,7 +18944,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16083,8 +15936,10 @@
+@@ -16088,21 +16944,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -11130,17 +18956,38 @@
+ fi
;;
esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16097,8 +15952,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
-test "$ld_shlibs_F77" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+
GCC_F77="$G77"
LD_F77="$LD"
+@@ -16111,8 +16967,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
-@@ -16145,6 +15998,11 @@
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_F77='-Wl,'
+@@ -16150,6 +17006,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -11152,7 +18999,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16161,7 +16019,7 @@
+@@ -16166,7 +17027,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -11161,7 +19008,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16187,6 +16045,16 @@
+@@ -16192,6 +17053,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -11178,7 +19025,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16198,7 +16066,7 @@
+@@ -16203,7 +17074,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.
@@ -11187,7 +19034,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16221,13 +16089,20 @@
+@@ -16226,13 +17097,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -11210,7 +19057,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16242,15 +16117,15 @@
+@@ -16247,15 +17125,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -11232,7 +19079,7 @@
;;
sunos4*)
-@@ -16259,7 +16134,7 @@
+@@ -16264,7 +17142,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -11241,7 +19088,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16272,6 +16147,17 @@
+@@ -16277,6 +17155,17 @@
fi
;;
@@ -11259,7 +19106,28 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16306,18 +16192,20 @@
+@@ -16288,16 +17177,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16311,26 +17200,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 \
@@ -11267,13 +19135,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:16312: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16317: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17206: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16316: \$? = $ac_status" >&5
-+ echo "$as_me:16202: \$? = $ac_status" >&5
+- echo "$as_me:16321: \$? = $ac_status" >&5
++ echo "$as_me:17210: \$? = $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
@@ -11285,25 +19153,37 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16338,7 +16226,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+@@ -16343,7 +17234,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16348,6 +16236,48 @@
+@@ -16353,8 +17244,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -11330,8 +19210,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
@@ -11340,10 +19220,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16360,38 +16290,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16365,60 +17298,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -11364,13 +19246,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:16379: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16302: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16384: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17310: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16383: \$? = $ac_status" >&5
-+ echo "$as_me:16306: \$? = $ac_status" >&5
+- echo "$as_me:16388: \$? = $ac_status" >&5
++ echo "$as_me:17314: \$? = $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
@@ -11394,7 +19276,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16462,6 +16390,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ 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;}
+@@ -16428,8 +17359,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_F77=
+@@ -16467,6 +17398,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -11411,7 +19332,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16472,6 +16410,10 @@
+@@ -16477,6 +17418,10 @@
with_gnu_ld=no
fi
;;
@@ -11422,7 +19343,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16482,6 +16424,27 @@
+@@ -16487,6 +17432,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11450,7 +19371,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16519,7 +16482,7 @@
+@@ -16524,7 +17490,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -11459,7 +19380,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16529,13 +16492,13 @@
+@@ -16534,13 +17500,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'
@@ -11476,7 +19397,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
-@@ -16544,23 +16507,70 @@
+@@ -16549,23 +17515,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -11553,7 +19474,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16574,13 +16584,40 @@
+@@ -16579,13 +17592,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11596,7 +19517,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16590,24 +16627,19 @@
+@@ -16595,24 +17635,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11628,7 +19549,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16619,7 +16651,7 @@
+@@ -16624,7 +17659,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -11637,7 +19558,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16641,9 +16673,21 @@
+@@ -16646,9 +17681,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
@@ -11661,7 +19582,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16660,7 +16704,7 @@
+@@ -16665,7 +17712,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -11670,7 +19591,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`
-@@ -16679,8 +16723,12 @@
+@@ -16684,8 +17731,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -11683,7 +19604,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16688,22 +16736,23 @@
+@@ -16693,22 +17744,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -11714,7 +19635,7 @@
program main
end
-@@ -16717,8 +16766,7 @@
+@@ -16722,8 +17774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11724,7 +19645,14 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16745,14 +16793,13 @@
+@@ -16745,19 +17796,20 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11742,7 +19670,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16769,8 +16816,7 @@
+@@ -16774,8 +17826,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11752,7 +19680,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16802,13 +16848,11 @@
+@@ -16797,7 +17848,9 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16807,13 +17860,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -11769,7 +19707,7 @@
fi
fi
;;
-@@ -16821,7 +16865,7 @@
+@@ -16826,7 +17877,7 @@
ld_shlibs_F77=no
;;
@@ -11778,7 +19716,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16831,68 +16875,68 @@
+@@ -16836,68 +17887,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -11891,7 +19829,7 @@
fi
;;
-@@ -16926,8 +16970,8 @@
+@@ -16931,8 +17982,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11902,7 +19840,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16935,7 +16979,7 @@
+@@ -16940,7 +17991,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -11911,7 +19849,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
-@@ -16949,47 +16993,62 @@
+@@ -16954,47 +18005,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -11998,7 +19936,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17003,7 +17062,7 @@
+@@ -17008,7 +18074,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -12007,7 +19945,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'
-@@ -17013,7 +17072,7 @@
+@@ -17018,7 +18084,7 @@
link_all_deplibs_F77=yes
;;
@@ -12016,7 +19954,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
-@@ -17036,7 +17095,8 @@
+@@ -17041,7 +18107,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
@@ -12026,7 +19964,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17046,7 +17106,7 @@
+@@ -17051,7 +18118,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -12035,7 +19973,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17057,14 +17117,14 @@
+@@ -17062,14 +18129,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -12052,7 +19990,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'
-@@ -17076,13 +17136,13 @@
+@@ -17081,13 +18148,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -12068,7 +20006,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17090,21 +17150,15 @@
+@@ -17095,21 +18162,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -12094,7 +20032,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'
-@@ -17113,8 +17167,18 @@
+@@ -17118,8 +18179,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12115,7 +20053,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17123,7 +17187,7 @@
+@@ -17128,7 +18199,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.
@@ -12124,7 +20062,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17171,36 +17235,45 @@
+@@ -17176,36 +18247,45 @@
fi
;;
@@ -12191,8 +20129,14 @@
;;
uts4*)
-@@ -17219,11 +17292,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17220,15 +18300,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12203,7 +20147,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -17256,6 +17324,7 @@
+@@ -17246,8 +18321,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.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -17261,6 +18336,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -12211,7 +20166,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17291,7 +17360,7 @@
+@@ -17283,20 +18359,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -12220,7 +20192,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17301,7 +17370,20 @@
+@@ -17306,7 +18382,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -12242,7 +20214,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17366,7 +17448,7 @@
+@@ -17371,7 +18460,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -12251,7 +20223,7 @@
;;
beos*)
-@@ -17375,7 +17457,7 @@
+@@ -17380,7 +18469,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -12260,7 +20232,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17391,7 +17473,7 @@
+@@ -17396,7 +18485,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -12269,7 +20241,7 @@
need_version=no
need_lib_prefix=no
-@@ -17403,7 +17485,8 @@
+@@ -17408,7 +18497,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -12279,7 +20251,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17433,7 +17516,7 @@
+@@ -17438,7 +18528,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -12288,7 +20260,7 @@
;;
esac
;;
-@@ -17456,7 +17539,7 @@
+@@ -17461,7 +18551,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -12297,7 +20269,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"`
-@@ -17479,20 +17562,17 @@
+@@ -17484,20 +18574,17 @@
dynamic_linker=no
;;
@@ -12329,7 +20301,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17510,14 +17590,19 @@
+@@ -17515,14 +18602,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -12351,7 +20323,7 @@
esac
;;
-@@ -17537,9 +17622,9 @@
+@@ -17542,9 +18634,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -12363,7 +20335,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17554,7 +17639,7 @@
+@@ -17559,7 +18651,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -12372,7 +20344,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17565,7 +17650,7 @@
+@@ -17570,7 +18662,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -12381,7 +20353,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17577,6 +17662,18 @@
+@@ -17582,6 +18674,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -12400,7 +20372,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17620,29 +17717,26 @@
+@@ -17625,29 +18729,26 @@
;;
# This must be Linux ELF.
@@ -12437,14 +20409,18 @@
# 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,
-@@ -17652,6 +17746,18 @@
+@@ -17657,16 +18758,28 @@
dynamic_linker='GNU/Linux ld.so'
;;
+-netbsd*)
+- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
+ 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'
+ 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
@@ -12453,10 +20429,12 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -17661,7 +17767,7 @@
++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
@@ -12465,7 +20443,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17689,8 +17795,13 @@
+@@ -17694,8 +18807,13 @@
openbsd*)
version_type=sunos
@@ -12480,7 +20458,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
-@@ -17710,7 +17821,7 @@
+@@ -17715,7 +18833,7 @@
os2*)
libname_spec='$name'
@@ -12489,7 +20467,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17728,13 +17839,6 @@
+@@ -17733,13 +18851,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -12503,7 +20481,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17760,7 +17864,7 @@
+@@ -17765,7 +18876,7 @@
need_version=yes
;;
@@ -12512,7 +20490,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'
-@@ -17793,6 +17897,29 @@
+@@ -17798,6 +18909,29 @@
fi
;;
@@ -12542,17 +20520,25 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17808,12 +17935,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -17809,16 +18943,21 @@
+ 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
+-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
++{ 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_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
@@ -12562,7 +20548,18 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17845,36 +17977,6 @@
+@@ -17838,8 +18977,8 @@
+ # directories.
+ hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+
+ if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+@@ -17850,36 +18989,6 @@
enable_fast_install=needless
fi
@@ -12599,7 +20596,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17889,7 +17991,8 @@
+@@ -17894,7 +19003,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.
@@ -12609,7 +20606,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 \
-@@ -17989,6 +18092,12 @@
+@@ -17994,6 +19104,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -12622,7 +20619,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18000,6 +18109,9 @@
+@@ -18005,6 +19121,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -12632,7 +20629,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18019,7 +18131,7 @@
+@@ -18024,7 +19143,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -12641,7 +20638,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18050,7 +18162,7 @@
+@@ -18055,7 +19174,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -12650,7 +20647,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18065,7 +18177,7 @@
+@@ -18070,7 +19189,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -12659,7 +20656,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18267,7 +18379,10 @@
+@@ -18272,7 +19391,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.
@@ -12671,7 +20668,15 @@
fi
-@@ -18300,26 +18415,55 @@
+@@ -18293,7 +19415,6 @@
+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+
+
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+
+@@ -18305,26 +19426,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -12728,7 +20733,18 @@
## 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
-@@ -18346,18 +18490,20 @@
+@@ -18336,8 +19486,8 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+
+
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18351,26 +19501,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 \
@@ -12736,13 +20752,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:18352: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18496: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19507: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18356: \$? = $ac_status" >&5
-+ echo "$as_me:18500: \$? = $ac_status" >&5
+- echo "$as_me:18361: \$? = $ac_status" >&5
++ echo "$as_me:19511: \$? = $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
@@ -12754,7 +20770,28 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18418,6 +18564,11 @@
+ $rm conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+ 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"
+@@ -18384,8 +19536,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18423,6 +19575,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -12766,7 +20803,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18434,7 +18585,7 @@
+@@ -18439,7 +19596,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -12775,7 +20812,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18460,6 +18611,16 @@
+@@ -18465,6 +19622,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -12792,7 +20829,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18471,7 +18632,7 @@
+@@ -18476,7 +19643,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.
@@ -12801,7 +20838,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18494,13 +18655,20 @@
+@@ -18499,13 +19666,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12824,7 +20861,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18515,15 +18683,15 @@
+@@ -18520,15 +19694,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -12846,7 +20883,7 @@
;;
sunos4*)
-@@ -18532,7 +18700,7 @@
+@@ -18537,7 +19711,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -12855,7 +20892,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18545,6 +18713,17 @@
+@@ -18550,6 +19724,17 @@
fi
;;
@@ -12873,7 +20910,28 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18579,18 +18758,20 @@
+@@ -18561,16 +19746,16 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18584,26 +19769,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 \
@@ -12881,13 +20939,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:18585: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18764: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18589: \$? = $ac_status" >&5
-+ echo "$as_me:18768: \$? = $ac_status" >&5
+- echo "$as_me:18594: \$? = $ac_status" >&5
++ echo "$as_me:19779: \$? = $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
@@ -12899,25 +20957,37 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18611,7 +18792,7 @@
+ $rm conftest*
+
fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+@@ -18616,7 +19803,7 @@
fi
+
+ fi
-case "$host_os" in
+case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18621,6 +18802,48 @@
+@@ -18626,8 +19813,50 @@
;;
esac
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -12944,8 +21014,8 @@
+ LDFLAGS="$save_LDFLAGS"
+
+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+ :
@@ -12954,10 +21024,12 @@
+fi
+
+
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18633,38 +18856,36 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18638,60 +19867,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -12978,13 +21050,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:18652: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18868: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18657: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18656: \$? = $ac_status" >&5
-+ echo "$as_me:18872: \$? = $ac_status" >&5
+- echo "$as_me:18661: \$? = $ac_status" >&5
++ echo "$as_me:19883: \$? = $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
@@ -13008,7 +21080,46 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18735,6 +18956,16 @@
+
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+
+
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+- echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++ { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+ 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;}
+@@ -18701,8 +19928,8 @@
+ need_locks=no
+ fi
+
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+ runpath_var=
+ allow_undefined_flag_GCJ=
+@@ -18740,6 +19967,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -13025,7 +21136,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18745,6 +18976,10 @@
+@@ -18750,6 +19987,10 @@
with_gnu_ld=no
fi
;;
@@ -13036,7 +21147,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18755,6 +18990,27 @@
+@@ -18760,6 +20001,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -13064,7 +21175,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18792,7 +19048,7 @@
+@@ -18797,7 +20059,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -13073,7 +21184,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18802,13 +19058,13 @@
+@@ -18807,13 +20069,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'
@@ -13090,7 +21201,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
-@@ -18817,23 +19073,70 @@
+@@ -18822,23 +20084,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -13167,7 +21278,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18847,13 +19150,40 @@
+@@ -18852,13 +20161,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13210,7 +21321,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18863,24 +19193,19 @@
+@@ -18868,24 +20204,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13242,7 +21353,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18892,7 +19217,7 @@
+@@ -18897,7 +20228,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -13251,7 +21362,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18914,9 +19239,21 @@
+@@ -18919,9 +20250,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
@@ -13275,7 +21386,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18933,7 +19270,7 @@
+@@ -18938,7 +20281,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -13284,7 +21395,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`
-@@ -18952,8 +19289,12 @@
+@@ -18957,8 +20300,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -13297,7 +21408,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18961,22 +19302,23 @@
+@@ -18966,22 +20313,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -13328,7 +21439,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19000,8 +19342,7 @@
+@@ -19005,8 +20353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13338,7 +21449,14 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19028,14 +19369,13 @@
+@@ -19028,19 +20375,20 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -13356,7 +21474,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19062,8 +19402,7 @@
+@@ -19067,8 +20415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13366,7 +21484,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19095,13 +19434,11 @@
+@@ -19090,7 +20437,9 @@
+ 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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19100,13 +20449,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -13383,7 +21511,7 @@
fi
fi
;;
-@@ -19114,7 +19451,7 @@
+@@ -19119,7 +20466,7 @@
ld_shlibs_GCJ=no
;;
@@ -13392,7 +21520,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19124,68 +19461,68 @@
+@@ -19129,68 +20476,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -13505,7 +21633,7 @@
fi
;;
-@@ -19219,8 +19556,8 @@
+@@ -19224,8 +20571,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -13516,7 +21644,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19228,7 +19565,7 @@
+@@ -19233,7 +20580,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -13525,7 +21653,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
-@@ -19242,47 +19579,62 @@
+@@ -19247,47 +20594,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -13612,7 +21740,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19296,7 +19648,7 @@
+@@ -19301,7 +20663,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -13621,7 +21749,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'
-@@ -19306,7 +19658,7 @@
+@@ -19311,7 +20673,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -13630,7 +21758,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
-@@ -19329,7 +19681,8 @@
+@@ -19334,7 +20696,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
@@ -13640,7 +21768,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19339,7 +19692,7 @@
+@@ -19344,7 +20707,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -13649,7 +21777,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19350,14 +19703,14 @@
+@@ -19355,14 +20718,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -13666,7 +21794,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'
-@@ -19369,13 +19722,13 @@
+@@ -19374,13 +20737,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -13682,7 +21810,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19383,21 +19736,15 @@
+@@ -19388,21 +20751,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -13708,7 +21836,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'
-@@ -19406,8 +19753,18 @@
+@@ -19411,8 +20768,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13729,7 +21857,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19416,7 +19773,7 @@
+@@ -19421,7 +20788,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.
@@ -13738,7 +21866,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19464,36 +19821,45 @@
+@@ -19469,36 +20836,45 @@
fi
;;
@@ -13805,8 +21933,14 @@
;;
uts4*)
-@@ -19512,11 +19878,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19513,15 +20889,10 @@
+ esac
+ fi
+
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -13817,7 +21951,18 @@
#
# Do we need to explicitly link libc?
#
-@@ -19549,6 +19910,7 @@
+@@ -19539,8 +20910,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.
+- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+@@ -19554,6 +20925,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -13825,7 +21970,24 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19584,7 +19946,7 @@
+@@ -19576,20 +20948,20 @@
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -13834,7 +21996,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19594,7 +19956,20 @@
+@@ -19599,7 +20971,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13856,7 +22018,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19659,7 +20034,7 @@
+@@ -19664,7 +21049,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13865,7 +22027,7 @@
;;
beos*)
-@@ -19668,7 +20043,7 @@
+@@ -19673,7 +21058,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13874,7 +22036,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19684,7 +20059,7 @@
+@@ -19689,7 +21074,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13883,7 +22045,7 @@
need_version=no
need_lib_prefix=no
-@@ -19696,7 +20071,8 @@
+@@ -19701,7 +21086,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13893,7 +22055,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19726,7 +20102,7 @@
+@@ -19731,7 +21117,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13902,7 +22064,7 @@
;;
esac
;;
-@@ -19749,7 +20125,7 @@
+@@ -19754,7 +21140,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13911,7 +22073,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"`
-@@ -19772,20 +20148,17 @@
+@@ -19777,20 +21163,17 @@
dynamic_linker=no
;;
@@ -13943,7 +22105,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19803,14 +20176,19 @@
+@@ -19808,14 +21191,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13965,7 +22127,7 @@
esac
;;
-@@ -19830,9 +20208,9 @@
+@@ -19835,9 +21223,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13977,7 +22139,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19847,7 +20225,7 @@
+@@ -19852,7 +21240,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13986,7 +22148,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19858,7 +20236,7 @@
+@@ -19863,7 +21251,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13995,7 +22157,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19870,6 +20248,18 @@
+@@ -19875,6 +21263,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -14014,18 +22176,37 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19913,29 +20303,26 @@
- ;;
-
- # This must be Linux ELF.
+@@ -19898,1084 +21298,284 @@
+ *-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*)
-+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'
+- 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'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -14033,69 +22214,68 @@
- 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,
-@@ -19945,6 +20332,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
-@@ -19954,7 +20353,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
-@@ -19982,995 +20381,186 @@
-
- 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
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
+- 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
- ;;
@@ -14879,7 +23059,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20775 "configure"
+-#line 20780 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -14887,7 +23067,20 @@
-#endif
-
-#include <stdio.h>
--
++ 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
++ ;;
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -14897,7 +23090,11 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
-/* 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
@@ -14919,24 +23116,62 @@
-# endif
-# endif
-#endif
--
++# 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
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++ # 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
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++ # 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'
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++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'
++ ;;
+
- exit (status);
-}
-EOF
@@ -14955,15 +23190,37 @@
- else :
- # compilation failed
- lt_cv_dlopen_self=no
-- 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
-fi
-rm -fr conftest*
-
--
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
++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
++ ;;
+
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -14977,12 +23234,35 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20873 "configure"
+-#line 20878 "configure"
-#include "confdefs.h"
--
++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
++ ;;
+
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
++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
++ 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
+ ;;
@@ -15171,8 +23451,8 @@
+ 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
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15188,8 +23468,8 @@
- LIBS="$save_LIBS"
- ;;
- esac
-+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
++{ 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" || \
@@ -15217,8 +23497,8 @@
+ # 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; }
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -15234,7 +23514,7 @@
fi
-@@ -20987,7 +20577,8 @@
+@@ -20992,7 +21592,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.
@@ -15244,7 +23524,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 \
-@@ -21087,6 +20678,12 @@
+@@ -21092,6 +21693,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -15257,7 +23537,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21098,6 +20695,9 @@
+@@ -21103,6 +21710,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -15267,7 +23547,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21117,7 +20717,7 @@
+@@ -21122,7 +21732,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -15276,7 +23556,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21148,7 +20748,7 @@
+@@ -21153,7 +21763,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -15285,7 +23565,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21163,7 +20763,7 @@
+@@ -21168,7 +21778,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -15294,7 +23574,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21365,7 +20965,10 @@
+@@ -21370,7 +21980,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.
@@ -15306,7 +23586,15 @@
fi
-@@ -21404,15 +21007,42 @@
+@@ -21390,7 +22003,6 @@
+ RC)
+
+
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+
+@@ -21409,15 +22021,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -15349,7 +23637,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21428,7 +21058,8 @@
+@@ -21433,7 +22072,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.
@@ -15359,7 +23647,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 \
-@@ -21528,6 +21159,12 @@
+@@ -21533,6 +22173,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -15372,7 +23660,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21539,6 +21176,9 @@
+@@ -21544,6 +22190,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -15382,7 +23670,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21558,7 +21198,7 @@
+@@ -21563,7 +22212,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -15391,7 +23679,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21589,7 +21229,7 @@
+@@ -21594,7 +22243,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -15400,7 +23688,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21604,7 +21244,7 @@
+@@ -21609,7 +22258,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -15409,7 +23697,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21806,7 +21446,10 @@
+@@ -21811,7 +22460,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.
@@ -15421,7 +23709,7 @@
fi
-@@ -21853,7 +21496,7 @@
+@@ -21858,7 +22510,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -15430,7 +23718,184 @@
# Prevent multiple expansion
-@@ -22294,8 +21937,7 @@
+@@ -21910,18 +22562,17 @@
+
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-# Check whether --enable-ltdl-install or --disable-ltdl-install was given.
++# Check whether --enable-ltdl-install was given.
+ if test "${enable_ltdl_install+set}" = set; then
+- enableval="$enable_ltdl_install"
++ enableval=$enable_ltdl_install;
++fi
+
+-fi;
+
+
+
+@@ -21950,8 +22601,8 @@
+ . ./conftest
+ rm -f conftest
+
+-echo "$as_me:$LINENO: checking which extension is used for shared libraries" >&5
+-echo $ECHO_N "checking which extension is used for shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking which extension is used for shared libraries" >&5
++echo $ECHO_N "checking which extension is used for shared libraries... $ECHO_C" >&6; }
+ if test "${libltdl_cv_shlibext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -21975,8 +22626,8 @@
+ rm -f conftest
+
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+-echo "${ECHO_T}$libltdl_cv_shlibext" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
++echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
+ if test -n "$libltdl_cv_shlibext"; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -21985,15 +22636,15 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
+-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
++echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
+ if test "${libltdl_cv_shlibpath_var+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ libltdl_cv_shlibpath_var="$shlibpath_var"
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
+-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
++echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
+ if test -n "$libltdl_cv_shlibpath_var"; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -22002,15 +22653,15 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for the default library search path" >&5
+-echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for the default library search path" >&5
++echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
+ if test "${libltdl_cv_sys_search_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
+-echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
++echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; }
+ if test -n "$libltdl_cv_sys_search_path"; then
+ case "$host" in
+ *-*-mingw*) pathsep=";" ;;
+@@ -22031,8 +22682,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${libltdl_cv_objdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22051,8 +22702,8 @@
+ rmdir .libs 2>/dev/null
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
+-echo "${ECHO_T}$libltdl_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
++echo "${ECHO_T}$libltdl_cv_objdir" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define LTDL_OBJDIR "$libltdl_cv_objdir/"
+@@ -22060,8 +22711,8 @@
+
+
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output" >&5
+-echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output" >&5
++echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_global_symbol_pipe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22235,11 +22886,11 @@
+ if test -z "$ac_cv_sys_global_symbol_pipe"; then
+ ac_result=no
+ fi
+-echo "$as_me:$LINENO: result: $ac_result" >&5
+-echo "${ECHO_T}$ac_result" >&6
++{ echo "$as_me:$LINENO: result: $ac_result" >&5
++echo "${ECHO_T}$ac_result" >&6; }
+
+-echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
+-echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
++echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
+ if test "${libltdl_cv_preloaded_symbols+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22250,8 +22901,8 @@
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
+-echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
++echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
+ if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22261,8 +22912,8 @@
+ fi
+
+ LIBADD_DL=
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22275,17 +22926,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -22299,8 +22950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15440,7 +23905,73 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22392,8 +22034,7 @@
+@@ -22317,14 +22967,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22332,8 +22983,8 @@
+ _ACEOF
+ LIBADD_DL="-ldl"
+ else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22360,30 +23011,24 @@
+
+ #undef dlopen
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -22397,8 +23042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15450,7 +23981,58 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22462,8 +22103,7 @@
+@@ -22415,13 +23059,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_dlopen=no
++ ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22429,8 +23074,8 @@
+ _ACEOF
+
+ else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22443,17 +23088,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -22467,8 +23112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15460,7 +24042,73 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22566,8 +22206,7 @@
+@@ -22485,14 +23129,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_svld_dlopen=no
++ ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22506,8 +23151,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22534,30 +23179,24 @@
+
+ #undef shl_load
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shl_load ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -22571,8 +23210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15470,7 +24118,58 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22636,8 +22275,7 @@
+@@ -22589,13 +23227,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shl_load=no
++ ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22603,8 +23242,8 @@
+ _ACEOF
+
+ else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22617,17 +23256,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+ ;
+ return 0;
+ }
+@@ -22641,8 +23280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15480,7 +24179,59 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22712,8 +22350,7 @@
+@@ -22659,14 +23297,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22679,8 +23318,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22693,17 +23332,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+ ;
+ return 0;
+ }
+@@ -22717,8 +23356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15490,7 +24241,75 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22820,8 +22457,7 @@
+@@ -22735,14 +23373,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_dld_link=no
++ ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -22760,9 +23399,9 @@
+ for ac_func in dlerror
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -22788,30 +23427,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -22825,8 +23458,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15500,7 +24319,123 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23092,8 +22728,7 @@
+@@ -22843,13 +23475,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -22861,8 +23495,8 @@
+ LIBS="$LIBS_SAVE"
+ fi
+
+-echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
+-echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
++echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_symbol_underscore+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22904,14 +23538,14 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
+-echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
++echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; }
+
+ if test x"$ac_cv_sys_symbol_underscore" = xyes; then
+ if test x"$ac_cv_func_dlopen" = xyes ||
+ test x"$ac_cv_lib_dl_dlopen" = xyes ; then
+- echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
+-echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
++echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
+ if test "${libltdl_cv_need_uscore+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22991,11 +23625,13 @@
+ ( exit $ac_status )
+ libltdl_cv_need_uscore=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+-echo "${ECHO_T}$libltdl_cv_need_uscore" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
++echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
+ fi
+ fi
+
+@@ -23013,8 +23649,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
+-echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
++echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
+ if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23045,8 +23681,8 @@
+ esac
+
+ fi
+-echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
+-echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6
++{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
++echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; }
+ if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -23067,18 +23703,19 @@
+ for ac_header in malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h dld.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23097,8 +23734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15510,7 +24445,103 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23243,8 +22878,7 @@
+@@ -23115,15 +23751,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23157,9 +23794,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -23183,25 +23821,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -23218,18 +23850,19 @@
+ for ac_header in string.h strings.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23248,8 +23881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15520,7 +24551,124 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23429,8 +23063,7 @@
+@@ -23266,15 +23898,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23308,9 +23941,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -23334,25 +23968,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -23369,9 +23997,9 @@
+ for ac_func in strchr index
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23397,30 +24025,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -23434,8 +24056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15530,7 +24678,75 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23532,8 +23165,7 @@
+@@ -23452,13 +24073,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -23472,9 +24095,9 @@
+ for ac_func in strrchr rindex
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23500,30 +24123,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -23537,8 +24154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15540,7 +24756,75 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23635,8 +23267,7 @@
+@@ -23555,13 +24171,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -23575,9 +24193,9 @@
+ for ac_func in memcpy bcopy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23603,30 +24221,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -23640,8 +24252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15550,7 +24834,75 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23737,8 +23368,7 @@
+@@ -23658,13 +24269,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -23677,9 +24290,9 @@
+ for ac_func in strcmp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23705,30 +24318,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -23742,8 +24349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15560,7 +24912,267 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24029,8 +23659,7 @@
+@@ -23760,13 +24366,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -23789,8 +24397,8 @@
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23816,17 +24424,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+- echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ 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
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23841,32 +24449,33 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ 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
+
+
++
+ if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
++ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+ GMSGFMT=":"
+ fi
+ MSGFMT=$GMSGFMT
+@@ -23875,8 +24484,8 @@
+
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23902,11 +24511,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ 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
+
+
+@@ -23914,8 +24523,8 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
++ { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+@@ -23925,8 +24534,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23939,32 +24548,34 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ 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
+
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23977,33 +24588,47 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ 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
+
+- RANLIB=$ac_ct_RANLIB
++ if test "x$ac_ct_RANLIB" = x; then
++ RANLIB=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ RANLIB=$ac_ct_RANLIB
++ fi
+ else
+ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+
+-echo "$as_me:$LINENO: checking for off_t" >&5
+-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_off_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24014,12 +24639,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef off_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((off_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (off_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -24034,8 +24660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15570,7 +25182,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24095,8 +23724,7 @@
+@@ -24052,24 +24677,25 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_off_t=no
++ ac_cv_type_off_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-echo "${ECHO_T}$ac_cv_type_off_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+ if test $ac_cv_type_off_t = yes; then
+ :
+ else
+
+ cat >>confdefs.h <<_ACEOF
+-#define off_t long
++#define off_t long int
+ _ACEOF
+
+ fi
+
+-echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24080,12 +24706,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -24100,8 +24727,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15580,7 +25240,41 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24160,8 +23788,7 @@
+@@ -24118,26 +24744,27 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_size_t=no
++ ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ if test $ac_cv_type_size_t = yes; then
+ :
+ else
+
+ cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned
++#define size_t unsigned int
+ _ACEOF
+
+ fi
+
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments. Useless!
+-echo "$as_me:$LINENO: checking for working alloca.h" >&5
+-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
++echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
+ if test "${ac_cv_working_alloca_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24165,8 +24792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15590,7 +25284,36 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24242,8 +23869,7 @@
+@@ -24183,13 +24809,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_working_alloca_h=no
++ ac_cv_working_alloca_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
++echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+ if test $ac_cv_working_alloca_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24198,8 +24825,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: checking for alloca" >&5
+-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for alloca" >&5
++echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
+ if test "${ac_cv_func_alloca_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24247,8 +24874,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15600,7 +25323,109 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24384,8 +24010,7 @@
+@@ -24265,13 +24891,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_alloca_works=no
++ ac_cv_func_alloca_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
++echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+
+ if test $ac_cv_func_alloca_works = yes; then
+
+@@ -24285,15 +24912,15 @@
+ # contain a buggy version. If you still want to use their alloca,
+ # use ar to extract alloca.o from them instead of compiling alloca.c.
+
+-ALLOCA=alloca.$ac_objext
++ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+ cat >>confdefs.h <<\_ACEOF
+ #define C_ALLOCA 1
+ _ACEOF
+
+
+-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
++echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
+ if test "${ac_cv_os_cray+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24303,7 +24930,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#if defined(CRAY) && ! defined(CRAY2)
++#if defined CRAY && ! defined CRAY2
+ webecray
+ #else
+ wenotbecray
+@@ -24319,14 +24946,14 @@
+ rm -f conftest*
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+-echo "${ECHO_T}$ac_cv_os_cray" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
++echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24352,30 +24979,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -24389,8 +25010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15610,7 +25435,99 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24523,8 +24148,7 @@
+@@ -24407,13 +25027,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+@@ -24426,8 +25048,8 @@
+ done
+ fi
+
+-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
++echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
+ if test "${ac_cv_c_stack_direction+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24440,6 +25062,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++$ac_includes_default
+ int
+ find_stack_direction ()
+ {
+@@ -24457,7 +25080,7 @@
+ int
+ main ()
+ {
+- exit (find_stack_direction () < 0);
++ return find_stack_direction () < 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -24480,11 +25103,13 @@
+ ( exit $ac_status )
+ ac_cv_c_stack_direction=-1
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
++echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define STACK_DIRECTION $ac_cv_c_stack_direction
+@@ -24498,18 +25123,19 @@
+ for ac_header in stdlib.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24528,8 +25154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15620,7 +25537,124 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24708,8 +24332,7 @@
+@@ -24546,15 +25171,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24588,9 +25214,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24614,25 +25241,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24648,9 +25269,9 @@
+ for ac_func in getpagesize
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24676,30 +25297,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -24713,8 +25328,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15630,7 +25664,143 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24955,8 +24578,7 @@
+@@ -24731,13 +25345,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -24746,8 +25362,8 @@
+ fi
+ done
+
+-echo "$as_me:$LINENO: checking for working mmap" >&5
+-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+ if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24842,15 +25458,15 @@
+ /* First, make a file with some known garbage in it. */
+ data = (char *) malloc (pagesize);
+ if (!data)
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ *(data + i) = rand ();
+ umask (0);
+ fd = creat ("conftest.mmap", 0600);
+ if (fd < 0)
+- exit (1);
++ return 1;
+ if (write (fd, data, pagesize) != pagesize)
+- exit (1);
++ return 1;
+ close (fd);
+
+ /* Next, try to mmap the file at a fixed address which already has
+@@ -24858,17 +25474,17 @@
+ we see the same garbage. */
+ fd = open ("conftest.mmap", O_RDWR);
+ if (fd < 0)
+- exit (1);
++ return 1;
+ data2 = (char *) malloc (2 * pagesize);
+ if (!data2)
+- exit (1);
+- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
++ return 1;
++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data2 + i))
+- exit (1);
++ return 1;
+
+ /* Finally, make sure that changes to the mapped area do not
+ percolate back to the file as seen by read(). (This is a bug on
+@@ -24877,14 +25493,14 @@
+ *(data2 + i) = *(data2 + i) + 1;
+ data3 = (char *) malloc (pagesize);
+ if (!data3)
+- exit (1);
++ return 1;
+ if (read (fd, data3, pagesize) != pagesize)
+- exit (1);
++ return 1;
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data3 + i))
+- exit (1);
++ return 1;
+ close (fd);
+- exit (0);
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -24907,11 +25523,13 @@
+ ( exit $ac_status )
+ ac_cv_func_mmap_fixed_mapped=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+ if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -24930,18 +25548,19 @@
+ for ac_header in limits.h locale.h nl_types.h string.h values.h alloca.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -24960,8 +25579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15640,7 +25810,124 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25149,8 +24771,7 @@
+@@ -24978,15 +25596,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25020,9 +25639,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -25046,25 +25666,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -25089,9 +25703,9 @@
+ __argz_count __argz_stringify __argz_next
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25117,30 +25731,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -25154,8 +25762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15650,7 +25937,47 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25231,8 +24852,7 @@
+@@ -25172,13 +25779,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -25188,8 +25797,8 @@
+ done
+
+
+- echo "$as_me:$LINENO: checking for stpcpy" >&5
+-echo $ECHO_N "checking for stpcpy... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for stpcpy" >&5
++echo $ECHO_N "checking for stpcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_stpcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25197,8 +25806,7 @@
+ kde_safe_cxxflags=$CXXFLAGS
+ CXXFLAGS="-Werror"
+
+-
+- 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'
+@@ -25236,8 +25844,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15660,7 +25987,40 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25302,8 +24922,7 @@
+@@ -25254,8 +25861,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_stpcpy=no
++ kde_cv_func_stpcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -25267,8 +25875,8 @@
+
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_cv_func_stpcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_stpcpy" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_func_stpcpy" >&5
++echo "${ECHO_T}$kde_cv_func_stpcpy" >&6; }
+ if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -25278,8 +25886,8 @@
+ fi
+
+ if test $ac_cv_header_locale_h = yes; then
+- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+ if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25307,8 +25915,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15670,7 +26030,68 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25412,8 +25031,7 @@
+@@ -25325,13 +25932,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-am_cv_val_LC_MESSAGES=no
++ am_cv_val_LC_MESSAGES=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+ if test $am_cv_val_LC_MESSAGES = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -25345,8 +25953,8 @@
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+ NEW_LINGUAS=
+ for lang in ${LINGUAS=$ALL_LINGUAS}; do
+ case "$ALL_LINGUAS" in
+@@ -25354,8 +25962,8 @@
+ esac
+ done
+ LINGUAS=$NEW_LINGUAS
+- echo "$as_me:$LINENO: result: $LINGUAS" >&5
+-echo "${ECHO_T}$LINGUAS" >&6
++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
++echo "${ECHO_T}$LINGUAS" >&6; }
+ fi
+
+ if test -n "$LINGUAS"; then
+@@ -25367,8 +25975,7 @@
+
+
+
+-
+- 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'
+@@ -25380,8 +25987,8 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+
+- echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+ if test "${kde_cv_stl_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25417,8 +26024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15680,7 +26101,40 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25505,8 +25123,7 @@
+@@ -25435,15 +26041,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_stl_works=no
++ kde_cv_stl_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+
+
+- echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+
+ if test "$kde_cv_stl_works" = "yes"; then
+ # back compatible
+@@ -25478,9 +26085,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 "$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
+@@ -25510,8 +26117,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15690,17 +26144,130 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25578,8 +25195,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -25528,12 +26134,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_ext
+ fi
+-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
+@@ -25545,13 +26153,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
++ { 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
+@@ -25559,77 +26166,29 @@
+ 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
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ 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'
-+ { 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
+- { (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 dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- 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 opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' dir; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ 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=$?
-@@ -25633,8 +25249,7 @@
+@@ -25638,8 +26197,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15710,17 +26277,151 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25705,8 +25320,7 @@
- cat conftest.err >&5
+@@ -25651,34 +26209,43 @@
+ ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ 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
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
+ fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
+ 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
+- 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
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25686,77 +26253,29 @@
+ 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
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
+ 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'
-+ { 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
+- { (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
+-/* 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 opendir ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' x; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ 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=$?
-@@ -25760,8 +25374,7 @@
+@@ -25765,8 +26284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15730,7 +26431,58 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25828,8 +25441,7 @@
+@@ -25778,30 +26296,40 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ ac_cv_search_opendir=$ac_res
+ 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
+- done
++ conftest$ac_exeext
++ if test "${ac_cv_search_opendir+set}" = set; then
++ break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++ :
++else
++ ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ 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
+
+ fi
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25833,8 +26361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15740,17 +26492,88 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25974,7 +25586,8 @@
+@@ -25851,8 +26378,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cv_header_stdc=no
++ ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_header_stdc = yes; then
+@@ -25909,6 +26437,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -25928,8 +26457,8 @@
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -25952,12 +26481,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ cat >>confdefs.h <<\_ACEOF
+@@ -25979,21 +26510,23 @@
+
+
+
-for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h
+
+for ac_header in sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -26007,8 +25620,7 @@
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26012,8 +26545,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15760,7 +26583,127 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26182,8 +25794,7 @@
+@@ -26030,15 +26562,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26072,9 +26605,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -26098,25 +26632,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -26130,13 +26658,13 @@
+
+
+
+-# Check whether --with-acl or --without-acl was given.
++# Check whether --with-acl was given.
+ if test "${with_acl+set}" = set; then
+- withval="$with_acl"
+-
++ withval=$with_acl;
+ else
+ with_acl=check
+-fi;
++fi
++
+
+ ACL_LIBS=""
+ if test "x$with_acl" != xno; then
+@@ -26147,8 +26675,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- 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'
+@@ -26158,17 +26685,17 @@
+
+
+ if test "${ac_cv_header_sys_acl_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for sys/acl.h" >&5
+-echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for sys/acl.h" >&5
++echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_acl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/acl.h usability" >&5
+-echo $ECHO_N "checking sys/acl.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/acl.h usability" >&5
++echo $ECHO_N "checking sys/acl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26187,8 +26714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15770,7 +26713,107 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26349,8 +25960,7 @@
+@@ -26205,15 +26731,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking sys/acl.h presence" >&5
+-echo $ECHO_N "checking sys/acl.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/acl.h presence" >&5
++echo $ECHO_N "checking sys/acl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26247,9 +26774,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -26273,25 +26801,18 @@
+ echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for sys/acl.h" >&5
+-echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sys/acl.h" >&5
++echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_acl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_sys_acl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_acl_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_acl_h" >&6; }
+
+ fi
+ if test $ac_cv_header_sys_acl_h = yes; then
+@@ -26314,8 +26835,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- 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'
+@@ -26325,17 +26845,17 @@
+
+
+ if test "${ac_cv_header_sys_xattr_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
+-echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
++echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_xattr_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5
+-echo $ECHO_N "checking sys/xattr.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5
++echo $ECHO_N "checking sys/xattr.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26354,8 +26874,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15780,7 +26823,106 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26526,8 +26136,7 @@
+@@ -26372,15 +26891,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5
+-echo $ECHO_N "checking sys/xattr.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5
++echo $ECHO_N "checking sys/xattr.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26414,9 +26934,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -26440,25 +26961,18 @@
+ echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
+-echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
++echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_xattr_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_sys_xattr_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; }
+
+ fi
+ if test $ac_cv_header_sys_xattr_h = yes; then
+@@ -26493,8 +27007,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for acl_init in -lc" >&5
+-echo $ECHO_N "checking for acl_init in -lc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for acl_init in -lc" >&5
++echo $ECHO_N "checking for acl_init in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_acl_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26507,17 +27021,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 acl_init ();
+ int
+ main ()
+ {
+-acl_init ();
++return acl_init ();
+ ;
+ return 0;
+ }
+@@ -26531,8 +27045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15790,7 +26932,60 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26607,8 +26216,7 @@
+@@ -26549,14 +27062,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_c_acl_init=no
++ ac_cv_lib_c_acl_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_acl_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_acl_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_acl_init" >&5
++echo "${ECHO_T}$ac_cv_lib_c_acl_init" >&6; }
+ if test $ac_cv_lib_c_acl_init = yes; then
+ ACL_LIBS="-lc"
+ else
+@@ -26572,8 +27086,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- 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'
+@@ -26583,17 +27096,17 @@
+
+
+ if test "${ac_cv_header_attr_libattr_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
+-echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
++echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_attr_libattr_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
++echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking attr/libattr.h usability" >&5
+-echo $ECHO_N "checking attr/libattr.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking attr/libattr.h usability" >&5
++echo $ECHO_N "checking attr/libattr.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26612,8 +27125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15800,7 +26995,106 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26776,8 +26384,7 @@
+@@ -26630,15 +27142,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking attr/libattr.h presence" >&5
+-echo $ECHO_N "checking attr/libattr.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking attr/libattr.h presence" >&5
++echo $ECHO_N "checking attr/libattr.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26672,9 +27185,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -26698,25 +27212,18 @@
+ echo "$as_me: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
+-echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for attr/libattr.h" >&5
++echo $ECHO_N "checking for attr/libattr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_attr_libattr_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_attr_libattr_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_libattr_h" >&5
++echo "${ECHO_T}$ac_cv_header_attr_libattr_h" >&6; }
+
+ fi
+ if test $ac_cv_header_attr_libattr_h = yes; then
+@@ -26743,8 +27250,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for acl_init in -lacl" >&5
+-echo $ECHO_N "checking for acl_init in -lacl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for acl_init in -lacl" >&5
++echo $ECHO_N "checking for acl_init in -lacl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_acl_acl_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26757,17 +27264,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 acl_init ();
+ int
+ main ()
+ {
+-acl_init ();
++return acl_init ();
+ ;
+ return 0;
+ }
+@@ -26781,8 +27288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15810,7 +27104,60 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26855,8 +26462,7 @@
+@@ -26799,14 +27305,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_acl_acl_init=no
++ ac_cv_lib_acl_acl_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_acl_acl_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_init" >&5
++echo "${ECHO_T}$ac_cv_lib_acl_acl_init" >&6; }
+ if test $ac_cv_lib_acl_acl_init = yes; then
+ ACL_LIBS="-lacl -lattr"
+ else
+@@ -26820,8 +27327,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- 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'
+@@ -26831,17 +27337,17 @@
+
+
+ if test "${ac_cv_header_acl_libacl_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
+-echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
++echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_acl_libacl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
++echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking acl/libacl.h usability" >&5
+-echo $ECHO_N "checking acl/libacl.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking acl/libacl.h usability" >&5
++echo $ECHO_N "checking acl/libacl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26860,8 +27366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15820,7 +27167,92 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27034,9 +26640,6 @@
+@@ -26878,15 +27383,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking acl/libacl.h presence" >&5
+-echo $ECHO_N "checking acl/libacl.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking acl/libacl.h presence" >&5
++echo $ECHO_N "checking acl/libacl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26920,9 +27426,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -26946,25 +27453,18 @@
+ echo "$as_me: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
+-echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for acl/libacl.h" >&5
++echo $ECHO_N "checking for acl/libacl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_acl_libacl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_acl_libacl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_acl_libacl_h" >&5
++echo "${ECHO_T}$ac_cv_header_acl_libacl_h" >&6; }
+
+ fi
+ if test $ac_cv_header_acl_libacl_h = yes; then
+@@ -27019,15 +27519,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -27039,9 +27538,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15830,7 +27262,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27070,8 +26673,7 @@
+@@ -27075,8 +27571,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15840,7 +27272,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27175,8 +26777,7 @@
+@@ -27093,8 +27588,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_strlcat=no
++ kde_cv_func_strlcat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -27108,11 +27604,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27133,8 +27629,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+
+
+-
+- 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'
+@@ -27180,8 +27675,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15850,7 +27319,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27255,9 +26856,6 @@
+@@ -27199,9 +27693,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_strlcat="strlcat unavailable"
++ kde_cv_proto_strlcat="strlcat unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -27215,8 +27710,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+
+ if test "x$kde_cv_func_strlcat" = xyes; then
+
+@@ -27240,15 +27735,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -27260,9 +27754,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15860,7 +27371,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27290,8 +26888,7 @@
+@@ -27295,8 +27786,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15870,7 +27381,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27394,8 +26991,7 @@
+@@ -27313,8 +27803,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_strlcpy=no
++ kde_cv_func_strlcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -27328,11 +27819,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27353,8 +27844,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+
+
+-
+- 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'
+@@ -27399,8 +27889,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15880,7 +27428,50 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27485,8 +27081,7 @@
+@@ -27418,9 +27907,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_strlcpy="strlcpy unavailable"
++ kde_cv_proto_strlcpy="strlcpy unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -27434,8 +27924,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+
+@@ -27458,8 +27948,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27476,7 +27966,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+ ;
+ return 0;
+ }
+@@ -27490,8 +27980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15890,7 +27481,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27547,8 +27142,7 @@
+@@ -27508,20 +27997,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_util_main=no
++ ac_cv_lib_util_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+ LIBUTIL="-lutil"
+ fi
+
+- echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27538,7 +28028,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+ ;
+ return 0;
+ }
+@@ -27552,8 +28042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15900,7 +27527,57 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27616,8 +27210,7 @@
+@@ -27570,21 +28059,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_compat_main=no
++ ac_cv_lib_compat_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+ LIBCOMPAT="-lcompat"
+ fi
+
+ kde_have_crypt=
+- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27597,17 +28087,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+ ;
+ return 0;
+ }
+@@ -27621,8 +28111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15910,7 +27587,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27683,8 +27276,7 @@
+@@ -27639,19 +28128,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_crypt_crypt=no
++ ac_cv_lib_crypt_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+ LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+- echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27664,17 +28154,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+ ;
+ return 0;
+ }
+@@ -27688,8 +28178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15920,7 +27645,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27777,8 +27369,7 @@
+@@ -27706,14 +28195,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_c_crypt=no
++ ac_cv_lib_c_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+ kde_have_crypt=yes
+ else
+@@ -27739,13 +28229,13 @@
+
+ fi
+
+- echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+- 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'
+@@ -27782,8 +28272,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15930,7 +27691,40 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27856,8 +27447,7 @@
+@@ -27803,7 +28292,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -27814,17 +28305,17 @@
+
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+ if test $kde_cv_socklen_t = no; then
+- echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+ if test "${kde_cv_socklen_t_equiv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ kde_cv_socklen_t_equiv=int
+- 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'
+@@ -27861,8 +28352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15940,7 +27734,61 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27941,8 +27531,7 @@
+@@ -27882,7 +28372,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ ac_ext=c
+@@ -27894,8 +28386,8 @@
+
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+ fi
+
+ cat >>confdefs.h <<_ACEOF
+@@ -27908,8 +28400,8 @@
+ _ACEOF
+
+
+- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27922,17 +28414,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -27946,8 +28438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15950,7 +27798,57 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28010,8 +27599,7 @@
+@@ -27964,21 +28455,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dnet_dnet_ntoa=no
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27991,17 +28483,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -28015,8 +28507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15960,7 +27858,71 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28106,8 +27694,7 @@
+@@ -28033,21 +28524,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++ ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+
+ fi
+- echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28074,30 +28566,24 @@
+
+ #undef inet_ntoa
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != inet_ntoa;
++return inet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -28111,8 +28597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15970,7 +27932,53 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28171,8 +27758,7 @@
+@@ -28129,17 +28614,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_inet_ntoa=no
++ ac_cv_func_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+
+ if test $ac_cv_func_inet_ntoa = no; then
+- echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28152,17 +28638,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
++return inet_ntoa ();
+ ;
+ return 0;
+ }
+@@ -28176,8 +28662,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15980,7 +27988,71 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28267,8 +27853,7 @@
+@@ -28194,21 +28679,22 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_nsl_inet_ntoa=no
++ ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ fi
+- echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28235,30 +28721,24 @@
+
+ #undef connect
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 connect ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_connect) || defined (__stub___connect)
++#if defined __stub_connect || defined __stub___connect
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != connect;
++return connect ();
+ ;
+ return 0;
+ }
+@@ -28272,8 +28752,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -15990,7 +28062,53 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28332,8 +27917,7 @@
+@@ -28290,17 +28769,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_connect=no
++ ac_cv_func_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28313,17 +28793,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 connect ();
+ int
+ main ()
+ {
+-connect ();
++return connect ();
+ ;
+ return 0;
+ }
+@@ -28337,8 +28817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16000,7 +28118,72 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28429,8 +28013,7 @@
+@@ -28355,22 +28834,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_socket_connect=no
++ ac_cv_lib_socket_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+- echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28397,30 +28877,24 @@
+
+ #undef remove
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 remove ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_remove) || defined (__stub___remove)
++#if defined __stub_remove || defined __stub___remove
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != remove;
++return remove ();
+ ;
+ return 0;
+ }
+@@ -28434,8 +28908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16010,7 +28193,53 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28494,8 +28077,7 @@
+@@ -28452,17 +28925,18 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_remove=no
++ ac_cv_func_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28475,17 +28949,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 remove ();
+ int
+ main ()
+ {
+-remove ();
++return remove ();
+ ;
+ return 0;
+ }
+@@ -28499,8 +28973,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16020,7 +28249,73 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28592,8 +28174,7 @@
+@@ -28517,14 +28990,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_posix_remove=no
++ ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -28532,8 +29006,8 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28560,30 +29034,24 @@
+
+ #undef shmat
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shmat ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != shmat;
++return shmat ();
+ ;
+ return 0;
+ }
+@@ -28597,8 +29065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16030,7 +28325,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28658,8 +28239,7 @@
+@@ -28615,18 +29082,19 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func_shmat=no
++ ac_cv_func_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+ :
+ else
+- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28639,17 +29107,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shmat ();
+ int
+ main ()
+ {
+-shmat ();
++return shmat ();
+ ;
+ return 0;
+ }
+@@ -28663,8 +29131,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16040,7 +28382,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28727,8 +28307,7 @@
+@@ -28681,14 +29148,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ipc_shmat=no
++ ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -28702,18 +29170,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -28732,8 +29201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16050,7 +28439,103 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28879,8 +28458,7 @@
+@@ -28750,15 +29218,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -28792,9 +29261,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -28818,25 +29288,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -28854,18 +29318,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -28884,8 +29349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16060,7 +28545,108 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29035,8 +28613,7 @@
+@@ -28902,15 +29366,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -28944,9 +29409,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -28970,25 +29436,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -29002,8 +29462,8 @@
+
+
+ # darwin requires a poll emulation library
+- echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29016,17 +29476,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 poll ();
+ int
+ main ()
+ {
+-poll ();
++return poll ();
+ ;
+ return 0;
+ }
+@@ -29040,8 +29500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16070,7 +28656,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29101,8 +28678,7 @@
+@@ -29058,14 +29517,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_poll_poll=no
++ ac_cv_lib_poll_poll=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+ LIB_POLL="-lpoll"
+ fi
+@@ -29076,18 +29536,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29106,8 +29567,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16080,7 +28713,99 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29249,8 +28825,7 @@
+@@ -29124,15 +29584,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29166,9 +29627,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -29192,25 +29654,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -29225,17 +29681,17 @@
+
+ # CoreAudio framework
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29254,8 +29710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16090,7 +28815,84 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29405,8 +28980,7 @@
+@@ -29272,15 +29727,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -29314,9 +29770,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -29340,25 +29797,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -29375,8 +29825,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+ kde_libs_safe="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -29410,8 +29860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16100,7 +28902,50 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29462,9 +29036,6 @@
+@@ -29425,8 +29874,8 @@
+ (exit $ac_status); }; }; then
+
+ LIBRESOLV="-lresolv"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -29437,25 +29886,25 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- 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
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_libs_safe
+
+
+
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -29467,9 +29916,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16110,7 +28955,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29498,8 +29069,7 @@
+@@ -29503,8 +29949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16120,7 +28965,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29603,8 +29173,7 @@
+@@ -29521,8 +29966,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_res_init=no
++ kde_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -29536,11 +29982,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29561,8 +30007,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+
+
+-
+- 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'
+@@ -29608,8 +30053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16130,7 +29012,63 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29704,8 +29273,7 @@
+@@ -29627,9 +30071,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_res_init="res_init unavailable"
++ kde_cv_proto_res_init="res_init unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -29643,8 +30088,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+
+ if test "x$kde_cv_func_res_init" = xyes; then
+
+@@ -29671,8 +30116,8 @@
+ LIBSOCKET="$X_EXTRA_LIBS"
+
+
+- echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29685,17 +30130,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 killpg ();
+ int
+ main ()
+ {
+-killpg ();
++return killpg ();
+ ;
+ return 0;
+ }
+@@ -29709,8 +30154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16140,7 +29078,67 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29779,8 +29347,7 @@
+@@ -29727,27 +30171,28 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ucb_killpg=no
++ ac_cv_lib_ucb_killpg=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+ LIBUCB="-lucb"
+ fi
+
+
+ case $host in *-*-lynxos* )
+- echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+ CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+- echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29760,17 +30205,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
++return gethostbyname ();
+ ;
+ return 0;
+ }
+@@ -29784,8 +30229,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16150,7 +29148,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29843,8 +29410,7 @@
+@@ -29802,22 +30246,23 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_bsd_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ LIBSOCKET="-lbsd"
+ fi
+ ;;
+ esac
+
+- echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29828,12 +30273,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -29848,8 +30294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16160,7 +29203,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29906,8 +29472,7 @@
+@@ -29866,20 +30311,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_int=no
++ ac_cv_type_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -29892,10 +30338,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -29911,8 +30358,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16170,7 +29254,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29947,8 +29512,7 @@
+@@ -29933,10 +30379,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -29952,8 +30399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16180,7 +29277,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30004,8 +29568,7 @@
+@@ -29970,30 +30416,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -30009,8 +30457,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16190,7 +29328,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30045,8 +29608,7 @@
+@@ -30031,10 +30478,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30050,8 +30498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16200,7 +29351,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30110,8 +29672,7 @@
+@@ -30068,23 +30515,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -30096,10 +30546,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30115,8 +30566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16210,20 +29408,136 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30142,10 +29703,8 @@
+@@ -30133,26 +30583,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 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)
+ 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; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30160,8 +30604,9 @@
+ 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_;
++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
+@@ -30170,22 +30615,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (int))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (int))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (int))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -30209,28 +30654,27 @@
+ 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)
+ 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; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30256,8 +29815,7 @@
+ ac_cv_sizeof_int=0
+ 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
+
+- echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -30241,12 +30685,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -30261,8 +30706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16233,7 +29547,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30319,8 +29877,7 @@
+@@ -30279,20 +30723,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_short=no
++ ac_cv_type_short=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -30305,10 +30750,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -30324,8 +30770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16243,7 +29598,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30360,8 +29917,7 @@
+@@ -30346,10 +30791,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30365,8 +30811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16253,7 +29621,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30417,8 +29973,7 @@
+@@ -30383,30 +30828,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -30422,8 +30869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16263,7 +29672,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30458,8 +30013,7 @@
+@@ -30444,10 +30890,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30463,8 +30910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16273,7 +29695,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30523,8 +30077,7 @@
+@@ -30481,23 +30927,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -30509,10 +30958,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30528,8 +30978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16283,20 +29752,136 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30555,10 +30108,8 @@
+@@ -30546,26 +30995,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 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)
+ 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; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30573,8 +31016,9 @@
+ 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_;
++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
+@@ -30583,22 +31027,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (short))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (short))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (short))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -30622,28 +31066,27 @@
+ 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)
+ 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; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
- cat >conftest.$ac_ext <<_ACEOF
-@@ -30669,8 +30220,7 @@
+ ac_cv_sizeof_short=0
+ 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
+
+- echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -30654,12 +31097,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -30674,8 +31118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16306,7 +29891,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30732,8 +30282,7 @@
+@@ -30692,20 +31135,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_long=no
++ ac_cv_type_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -30718,10 +31162,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -30737,8 +31182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16316,7 +29942,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30773,8 +30322,7 @@
+@@ -30759,10 +31203,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30778,8 +31223,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16326,7 +29965,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30830,8 +30378,7 @@
+@@ -30796,30 +31240,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -30835,8 +31281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16336,7 +30016,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30871,8 +30418,7 @@
+@@ -30857,10 +31302,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30876,8 +31322,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16346,7 +30039,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30936,8 +30482,7 @@
+@@ -30894,23 +31339,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -30922,10 +31370,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -30941,8 +31390,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16356,20 +30096,136 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30968,10 +30513,8 @@
+@@ -30959,26 +31407,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 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)
+ 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; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30986,8 +31428,9 @@
+ 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_;
++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
+@@ -30996,22 +31439,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (long))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -31035,28 +31478,27 @@
+ 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)
+ 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; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
- cat >conftest.$ac_ext <<_ACEOF
-@@ -31082,8 +30625,7 @@
+ ac_cv_sizeof_long=0
+ 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
+
+- echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31067,12 +31509,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -31087,8 +31530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16379,7 +30235,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31145,8 +30687,7 @@
+@@ -31105,20 +31547,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_char_p=no
++ ac_cv_type_char_p=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -31131,10 +31574,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -31150,8 +31594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16389,7 +30286,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31186,8 +30727,7 @@
+@@ -31172,10 +31615,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31191,8 +31635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16399,7 +30309,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31243,8 +30783,7 @@
+@@ -31209,30 +31652,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -31248,8 +31693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16409,7 +30360,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31284,8 +30823,7 @@
+@@ -31270,10 +31714,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31289,8 +31734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16419,7 +30383,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31349,8 +30887,7 @@
+@@ -31307,23 +31751,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -31335,10 +31782,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31354,8 +31802,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16429,20 +30440,144 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31381,10 +30918,8 @@
+@@ -31372,26 +31819,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) 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
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
++ { (exit 77); exit 77; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -31399,8 +31840,9 @@
+ 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_;
++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
+@@ -31409,22 +31851,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (char *))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (char *))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (char *))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -31448,30 +31890,29 @@
+ 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 *)
+ 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;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
- cat >conftest.$ac_ext <<_ACEOF
-@@ -31503,8 +31038,7 @@
+ ac_cv_sizeof_char_p=0
+ 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
+
+
+
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31484,17 +31925,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+ ;
+ return 0;
+ }
+@@ -31508,8 +31949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16452,7 +30587,59 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31575,8 +31109,7 @@
+@@ -31526,14 +31966,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+
+ LIBDL="-ldl"
+@@ -31542,8 +31983,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31556,17 +31997,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
++return shl_unload ();
+ ;
+ return 0;
+ }
+@@ -31580,8 +32021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16462,7 +30649,53 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31646,8 +31179,7 @@
+@@ -31598,14 +32038,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_dld_shl_unload=no
++ ac_cv_lib_dld_shl_unload=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+
+ LIBDL="-ldld"
+@@ -31619,8 +32060,8 @@
+
+
+
+- echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31631,12 +32072,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -31651,8 +32093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16472,7 +30705,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31709,8 +31241,7 @@
+@@ -31669,20 +32110,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_size_t=no
++ ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -31695,10 +32137,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -31714,8 +32157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16482,7 +30756,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31750,8 +31281,7 @@
+@@ -31736,10 +32178,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31755,8 +32198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16492,7 +30779,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31807,8 +31337,7 @@
+@@ -31773,30 +32215,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -31812,8 +32256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16502,7 +30830,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31848,8 +31377,7 @@
+@@ -31834,10 +32277,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31853,8 +32297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16512,7 +30853,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31913,8 +31441,7 @@
+@@ -31871,23 +32314,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -31899,10 +32345,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -31918,8 +32365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16522,20 +30910,137 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31945,10 +31472,8 @@
+@@ -31936,26 +32382,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 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)
+ 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; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -31963,8 +32403,9 @@
+ 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_;
++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
+@@ -31973,22 +32414,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (size_t))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (size_t))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (size_t))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -32012,29 +32453,28 @@
+ 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)
+ 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; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
- cat >conftest.$ac_ext <<_ACEOF
-@@ -32060,8 +31585,7 @@
+ ac_cv_sizeof_size_t=0
+ 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
+
+
+- echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32045,12 +32485,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
++if ((ac__type_new_ *) 0)
+ return 0;
+-if (sizeof (unsigned long))
++if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+@@ -32065,8 +32506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16545,7 +31050,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32123,8 +31647,7 @@
+@@ -32083,20 +32523,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_type_unsigned_long=no
++ ac_cv_type_unsigned_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++{ 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
+- # 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.
+@@ -32109,10 +32550,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+
+ ;
+@@ -32128,8 +32570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16555,7 +31101,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32164,8 +31687,7 @@
+@@ -32150,10 +32591,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -32169,8 +32611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16565,7 +31124,48 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32221,8 +31743,7 @@
+@@ -32187,30 +32628,32 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+
+ ;
+@@ -32226,8 +32669,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16575,7 +31175,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32262,8 +31783,7 @@
+@@ -32248,10 +32690,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -32267,8 +32710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16585,7 +31198,54 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32327,8 +31847,7 @@
+@@ -32285,23 +32727,26 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo= ac_hi=
++ ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -32313,10 +32758,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++ typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+
+ ;
+@@ -32332,8 +32778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16595,20 +31255,122 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32359,10 +31878,8 @@
+@@ -32350,26 +32795,20 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 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)
+ 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; }; } ;;
esac
else
- if test "$cross_compiling" = yes; then
+- 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
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
- { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }
+-else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32377,8 +32816,9 @@
+ 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_;
++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
+@@ -32387,22 +32827,22 @@
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+- exit (1);
+- if (((long) (sizeof (unsigned long))) < 0)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+ {
+- long i = longval ();
+- if (i != ((long) (sizeof (unsigned long))))
+- exit (1);
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (unsigned long))))
+- exit (1);
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
+ fprintf (f, "%lu\n", i);
+ }
+- exit (ferror (f) || fclose (f) != 0);
++ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+@@ -32426,30 +32866,29 @@
+ 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)
+ 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; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++ { (exit 77); exit 77; }; }
+ 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
+ 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
+
+
+
+- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
-@@ -32473,8 +31990,7 @@
+ /* confdefs.h. */
+ _ACEOF
+@@ -32478,8 +32917,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16618,7 +31380,50 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32555,8 +32071,7 @@
+@@ -32491,15 +32929,15 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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; }
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- 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: 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!
+@@ -32511,18 +32949,18 @@
+ { (exit 1); exit 1; }; }
+
+ fi
++
+ rm -f 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
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -32560,8 +32998,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16628,7 +31433,83 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32656,8 +32171,7 @@
+@@ -32578,8 +33015,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_val_pie_support=no
++ kde_cv_val_pie_support=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -32593,26 +33031,26 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+
+- echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+
+- # Check whether --enable-pie or --disable-pie was given.
++ # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+- enableval="$enable_pie"
+- kde_has_pie_support=$enableval
++ enableval=$enable_pie; kde_has_pie_support=$enableval
+ else
+ kde_has_pie_support=detect
+-fi;
++fi
++
+
+ if test "$kde_has_pie_support" = "detect"; then
+ kde_has_pie_support=$kde_cv_val_pie_support
+ fi
+
+- echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
++ { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
+
+ KDE_USE_FPIE=""
+ KDE_USE_PIE=""
+@@ -32631,18 +33069,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32661,8 +33100,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16638,7 +31519,122 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32837,8 +32351,7 @@
+@@ -32679,15 +33117,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32721,9 +33160,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -32747,25 +33187,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -32777,8 +33211,8 @@
+
+ done
+
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32805,30 +33239,24 @@
+
+ #undef _NSGetEnviron
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
++return _NSGetEnviron ();
+ ;
+ return 0;
+ }
+@@ -32842,8 +33270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16648,7 +31644,74 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32947,8 +32460,7 @@
+@@ -32860,13 +33287,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_func__NSGetEnviron=no
++ ac_cv_func__NSGetEnviron=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -32887,9 +33315,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -32915,30 +33343,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -32952,8 +33374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16658,7 +31721,90 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33172,8 +32684,7 @@
+@@ -32970,13 +33391,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -32993,32 +33416,32 @@
+
+
+
+-# Check whether --enable-embedded or --disable-embedded was given.
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
+- enableval="$enable_embedded"
+- kde_use_qt_emb=$enableval
++ enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ else
+ kde_use_qt_emb=no
+
+-fi;
++fi
++
+
+-# Check whether --enable-qtopia or --disable-qtopia was given.
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
+- enableval="$enable_qtopia"
+- kde_use_qt_emb_palm=$enableval
++ enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+ kde_use_qt_emb_palm=no
+
+-fi;
++fi
++
+
+-# Check whether --enable-mac or --disable-mac was given.
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
+- enableval="$enable_mac"
+- kde_use_qt_mac=$enableval
++ enableval=$enable_mac; kde_use_qt_mac=$enableval
+ else
+ kde_use_qt_mac=no
+
+-fi;
++fi
++
+
+ # used to disable x11-specific stuff on special platforms
+
+@@ -33034,8 +33457,8 @@
+
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+
+ if test "${kde_cv_have_x+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -33140,6 +33563,7 @@
+ fi
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+
+@@ -33177,8 +33601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16668,7 +31814,110 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33396,8 +32907,7 @@
+@@ -33197,7 +33620,7 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-LIBS="$ac_save_LIBS"
++ LIBS="$ac_save_LIBS"
+ # 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}/` \
+@@ -33245,6 +33668,7 @@
+ done
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -33255,7 +33679,7 @@
+ *-*-solaris*)
+ ;;
+ *)
+- rm -fr conftest.dir
++ rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+ cd conftest.dir
+ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+@@ -33263,7 +33687,7 @@
+ acfindx:
+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+ _ACEOF
+- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+@@ -33277,7 +33701,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
+- /usr/include) ;;
++ /usr/include) ac_x_includes= ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+@@ -33286,7 +33710,7 @@
+ esac
+ fi
+ cd ..
+- rm -fr conftest.dir
++ rm -f -r conftest.dir
+ fi
+
+ if test -z "$ac_x_includes"; then
+@@ -33330,12 +33754,12 @@
+ eval "$kde_cv_have_x"
+
+ if test "$have_x" != yes; then
+- echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
++ { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+ no_x=yes
+ else
+- echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
++ { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
+
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -33363,8 +33787,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.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33377,17 +33801,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
++return IceConnectionNumber ();
+ ;
+ return 0;
+ }
+@@ -33401,8 +33825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16678,7 +31927,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33473,8 +32983,7 @@
+@@ -33419,14 +33842,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ICE_IceConnectionNumber=no
++ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ LIBSM="-lSM -lICE"
+ fi
+@@ -33435,8 +33859,8 @@
+
+ LIB_X11='-lX11 $(LIBSOCKET)'
+
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33478,8 +33902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16688,7 +31967,76 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33700,8 +33209,7 @@
+@@ -33496,9 +33919,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_have_libXext=no
++ kde_cv_have_libXext=no
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -33508,8 +33932,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+
+ if test "$kde_cv_have_libXext" = "no"; then
+ { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -33655,8 +34079,8 @@
+ else
+ PTHREAD_LIBS_save="$PTHREAD_LIBS"
+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+- echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+
+ kde_save_LDFLAGS="$LDFLAGS"
+ kde_save_LIBS="$LIBS"
+@@ -33667,9 +34091,9 @@
+ ;;
+ esac
+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -33681,17 +34105,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+ ;
+ return 0;
+ }
+@@ -33705,8 +34129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16698,7 +32046,60 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33776,8 +33284,7 @@
+@@ -33723,14 +34146,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Lib=no"
++ eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -33743,8 +34168,8 @@
+ fi
+
+ if test -z "$LIBPTHREAD"; then
+- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33757,17 +34182,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+ ;
+ return 0;
+ }
+@@ -33781,8 +34206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16708,7 +32109,37 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33837,8 +33344,7 @@
+@@ -33799,14 +34223,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_pthread_pthread_create=no
++ ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+ LIBPTHREAD="-lpthread"
+ fi
+@@ -33814,8 +34239,8 @@
+ fi
+
+ if test -z "$LIBPTHREAD" ; then
+- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ kde_safe_libs=$LIBS
+ LIBS="$LIBS -lpthread"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -33842,8 +34267,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16718,7 +32149,51 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33921,8 +33427,7 @@
+@@ -33856,17 +34280,18 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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; }
+ LIBPTHREAD="-lpthread"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+- 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
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -33882,16 +34307,15 @@
+ USE_THREADS=""
+ if test -z "$LIBPTHREAD"; then
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -33926,8 +34350,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16728,7 +32203,56 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34015,8 +33520,7 @@
+@@ -33944,7 +34367,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -33958,13 +34383,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-D_THREAD_SAFE -pthread"
+ 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
+@@ -33976,16 +34401,15 @@
+ case $host_os in
+ solaris*)
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -34020,8 +34444,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16738,7 +32262,108 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34190,8 +33694,7 @@
+@@ -34038,7 +34461,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -34052,13 +34477,13 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+ USE_THREADS="-mt"
+ 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
+@@ -34085,17 +34510,17 @@
+
+
+
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+
+-# Check whether --with-extra-includes or --without-extra-includes was given.
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
+- withval="$with_extra_includes"
+- kde_use_extra_includes="$withval"
++ withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+ kde_use_extra_includes=NONE
+
+-fi;
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+ test "$kde_use_extra_includes" != "NONE"; then
+@@ -34113,21 +34538,21 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+
+-# Check whether --with-extra-libs or --without-extra-libs was given.
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
+- withval="$with_extra_libs"
+- kde_use_extra_libs=$withval
++ withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+ kde_use_extra_libs=NONE
+
+-fi;
++fi
++
+ if test -n "$kde_use_extra_libs" && \
+ test "$kde_use_extra_libs" != "NONE"; then
+
+@@ -34146,14 +34571,14 @@
+
+
+
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+
+
+
+
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34195,8 +34620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16748,7 +32373,40 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34289,8 +33792,7 @@
+@@ -34213,8 +34637,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_z=no"
++ eval "ac_cv_lib_z=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -34228,8 +34653,8 @@
+ _ACEOF
+
+ LIBZ="$ac_cv_lib_z"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: not found.
+ Possibly configure picks up an outdated version
+@@ -34249,8 +34674,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34294,8 +34719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16758,7 +32416,45 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34377,8 +33879,7 @@
+@@ -34312,9 +34736,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_png=no"
++ eval "ac_cv_lib_png=no"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -34329,19 +34754,19 @@
+
+ LIBPNG="$ac_cv_lib_png"
+
+- echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+ 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; }
+ LIBPNG=""
+
+ fi
+
+
+
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34382,8 +34807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16768,7 +32464,39 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34455,8 +33956,7 @@
+@@ -34400,8 +34824,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_jpeg_6b=no"
++ eval "ac_cv_lib_jpeg_6b=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -34412,14 +34837,14 @@
+
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_6b"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ 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: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34460,8 +34885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16778,25 +32506,410 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34509,7 +34009,7 @@
+@@ -34478,8 +34902,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "ac_cv_lib_jpeg_normal=no"
++ eval "ac_cv_lib_jpeg_normal=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -34490,11 +34915,11 @@
+
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+ LIBJPEG="$ac_cv_lib_jpeg_normal"
+- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
++ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ 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; }
+
+ LIBJPEG=
+
+@@ -34514,7 +34939,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 34512: $i/$j" >&5
-+ echo "configure: 34012: $i/$j" >&5
+- echo "configure: 34517: $i/$j" >&5
++ echo "configure: 34942: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34807,7 +34307,7 @@
+@@ -34561,14 +34986,14 @@
+
+
+
+- echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+ if test -n "$PERL"; then
+ kde_cv_path="$PERL";
+ else
+ kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -34611,8 +35036,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -34621,8 +35046,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ PERL=$kde_cv_path
+
+ fi
+@@ -34636,10 +35061,9 @@
+
+
+
+-# Check whether --enable-mt or --disable-mt was given.
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
+- enableval="$enable_mt"
+- kde_use_qt_mt=$enableval
++ enableval=$enable_mt; kde_use_qt_mt=$enableval
+ else
+
+ if test $kde_qtver = 3; then
+@@ -34649,7 +35073,8 @@
+ fi
+
+
+-fi;
++fi
++
+
+ USING_QT_MT=""
+
+@@ -34669,13 +35094,13 @@
+ else
+ kde_check_threading_default=yes
+ fi
+- # Check whether --enable-threading or --disable-threading was given.
++ # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+- enableval="$enable_threading"
+- kde_use_threading=$enableval
++ enableval=$enable_threading; kde_use_threading=$enableval
+ else
+ kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+ if test "x$kde_use_threading" = "xyes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -34747,8 +35172,8 @@
+ LIBQT="$LIBQT $LIBDL"
+ fi
+
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+
+ 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"
+@@ -34757,34 +35182,34 @@
+ qt_libraries=""
+ qt_includes=""
+
+-# Check whether --with-qt-dir or --without-qt-dir was given.
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
+- withval="$with_qt_dir"
+- ac_qt_includes="$withval"/include
++ withval=$with_qt_dir; ac_qt_includes="$withval"/include
+ ac_qt_libraries="$withval"/lib${kdelibsuff}
+ ac_qt_bindir="$withval"/bin
+
+-fi;
++fi
++
+
+
+-# Check whether --with-qt-includes or --without-qt-includes was given.
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
+- withval="$with_qt_includes"
+-
++ withval=$with_qt_includes;
+ ac_qt_includes="$withval"
+
+-fi;
++fi
++
+
+ kde_qt_libs_given=no
+
+
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
+- withval="$with_qt_libraries"
+- ac_qt_libraries="$withval"
++ withval=$with_qt_libraries; ac_qt_libraries="$withval"
+ kde_qt_libs_given=yes
+
+-fi;
++fi
++
+
+ if test "${ac_cv_have_qt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -34812,7 +35237,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 34810: $i/$j" >&5
-+ echo "configure: 34310: $i/$j" >&5
+- echo "configure: 34815: $i/$j" >&5
++ echo "configure: 35240: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -35484,8 +34984,7 @@
+@@ -34849,8 +35274,7 @@
+ ac_qt_libraries="$qt_libdir"
+
+
+-
+- 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'
+@@ -34987,13 +35411,13 @@
+ eval "$ac_cv_have_qt"
+
+ if test "$have_qt" != yes; then
+- echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
++ { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+ ac_cv_have_qt="have_qt=yes \
+ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+- echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
++ { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+
+ qt_libraries="$ac_qt_libraries"
+ qt_includes="$ac_qt_includes"
+@@ -35002,15 +35426,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+
+
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -35131,12 +35554,12 @@
+
+
+ if test "$kde_cv_qt_direct" = "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; }
+ qt_libraries=
+ 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
+
+@@ -35174,14 +35597,14 @@
+ fi
+
+
+- echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+ if test -n "$MOC"; then
+ kde_cv_path="$MOC";
+ else
+ kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -35224,8 +35647,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -35246,22 +35669,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MOC=$kde_cv_path
+
+ fi
+
+ if test -z "$UIC_NOT_NEEDED"; then
+
+- echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+ if test -n "$UIC_PATH"; then
+ kde_cv_path="$UIC_PATH";
+ else
+ kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -35304,12 +35727,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ UIC_PATH=""
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ UIC_PATH=$kde_cv_path
+
+ fi
+@@ -35339,10 +35762,10 @@
+
+ if test $kde_qtver = 3; then
+
+- echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+ kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -35365,22 +35788,22 @@
+
+
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = 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; }
+ :
+ ac_uic_supports_libpath=yes
+ 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; }
+ :
+ ac_uic_supports_libpath=no
+ fi
+
+
+- echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+ kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -35403,13 +35826,13 @@
+
+
+ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = 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; }
+ :
+ ac_uic_supports_nounload=yes
+ 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; }
+ :
+ ac_uic_supports_nounload=no
+ fi
+@@ -35440,15 +35863,14 @@
+
+
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -35489,8 +35911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16806,34 +32919,206 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35643,7 +35142,7 @@
+@@ -35507,8 +35928,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "kde_cv_qt_jpeg=yes"
++ eval "kde_cv_qt_jpeg=yes"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -35525,12 +35947,12 @@
+
+
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; 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; }
+ LIBJPEG_QT='$(LIBJPEG)'
+ 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; }
+ LIBJPEG_QT=
+ fi
+
+@@ -35560,15 +35982,15 @@
+
+
+
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
+- enableval="$enable_rpath"
+- USE_RPATH=$enableval
++ enableval=$enable_rpath; USE_RPATH=$enableval
+ else
+ USE_RPATH=yes
+-fi;
++fi
++
+
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+
+@@ -35592,11 +36014,11 @@
+
+
+
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
+
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+
+ if test "${prefix}" != NONE; then
+ kde_includes=${includedir}
+@@ -35648,7 +36070,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 35646: $i/$j" >&5
-+ echo "configure: 35145: $i/$j" >&5
+- echo "configure: 35651: $i/$j" >&5
++ echo "configure: 36073: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -35673,7 +35172,7 @@
+@@ -35678,7 +36100,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 35676: $i/$j" >&5
-+ echo "configure: 35175: $i/$j" >&5
+- echo "configure: 35681: $i/$j" >&5
++ echo "configure: 36103: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -35691,7 +35190,7 @@
+@@ -35696,7 +36118,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 35694: $i/$j" >&5
-+ echo "configure: 35193: $i/$j" >&5
+- echo "configure: 35699: $i/$j" >&5
++ echo "configure: 36121: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -35979,8 +35478,7 @@
+@@ -35755,12 +36177,12 @@
+ fi
+ if test "$exec_prefix" = NONE; then
+ ac_kde_exec_prefix="$ac_kde_prefix"
+- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+ else
+ ac_kde_exec_prefix="$exec_prefix"
+- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
++ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+ fi
+
+ kde_libraries="${libdir}"
+@@ -35769,8 +36191,8 @@
+ else
+ ac_cv_have_kde="have_kde=yes \
+ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+- echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
++ { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+
+ kde_libraries="$ac_kde_libraries"
+ kde_includes="$ac_kde_includes"
+@@ -35808,8 +36230,8 @@
+
+ if test x$ac_uic_supports_libpath = xyes; then
+
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35852,8 +36274,8 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ { { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -35887,13 +36309,12 @@
+
+
+
+- echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
++echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+
+ if test "x$GXX" = "xyes"; then
+
+-
+- ac_ext=cc
++ ac_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'
+@@ -35914,13 +36335,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "GCC visibility push" >/dev/null 2>&1; then
+
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ kde_stdc_visibility_patched=yes
+ else
+
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+ visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -35940,16 +36361,15 @@
+
+ kde_have_gcc_visibility=no
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -35984,8 +36404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16843,7 +33128,55 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36075,8 +35573,7 @@
+@@ -36002,7 +36421,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -36016,28 +36437,27 @@
+ fi
+
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ :
+
+ kde_have_gcc_visibility=yes
+- # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
++ # Check whether --enable-gcc-hidden-visibility was given.
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+- enableval="$enable_gcc_hidden_visibility"
+- kde_have_gcc_visibility=$enableval
++ enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
+ else
+ 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
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -36080,8 +36500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16853,7 +33186,45 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36169,8 +35666,7 @@
+@@ -36098,8 +36517,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_val_qt_gcc_visibility_patched=yes
++ kde_cv_val_qt_gcc_visibility_patched=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -36112,21 +36532,20 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+
+ if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+
+- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- ac_ext=cc
++ ac_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'
+@@ -36174,8 +36593,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16863,16 +33234,564 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37544,7 +37040,7 @@
+@@ -36192,8 +36610,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_val_gcc_visibility_bug=yes
++ kde_cv_val_gcc_visibility_bug=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+@@ -36208,8 +36627,8 @@
+
+
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+
+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -36225,8 +36644,8 @@
+ 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
+@@ -36237,8 +36656,8 @@
+
+
+
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE paths" >&5
++echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -36349,15 +36768,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'
+@@ -36409,8 +36827,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; 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; }
+ 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.
+@@ -36449,8 +36867,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
+
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ 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
+@@ -36458,8 +36876,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest; 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; }
+ 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
+@@ -36652,15 +37070,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'
+@@ -36712,8 +37129,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; 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; }
+ 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.
+@@ -36752,8 +37169,8 @@
+ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+ fi
+
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ 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
+@@ -36761,8 +37178,8 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest; 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; }
+ 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
+@@ -36854,22 +37271,22 @@
+ { (exit 1); exit 1; }; }
+ else
+ rm -f conftest*
+- echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
++ { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
+ fi
+
+ bindir=$kde_bindir
+
+
+
+-# Check whether --with-arts or --without-arts was given.
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
+- withval="$with_arts"
+- build_arts=$withval
++ withval=$with_arts; build_arts=$withval
+ else
+ build_arts=yes
+
+-fi;
++fi
++
+
+
+ if test "$build_arts" '!=' "no"; then
+@@ -36902,14 +37319,14 @@
+
+ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+
+- echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL"; then
+ kde_cv_path="$DCOPIDL";
+ else
+ kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -36952,8 +37369,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -36964,21 +37381,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+ if test -n "$DCOPIDL2CPP"; then
+ kde_cv_path="$DCOPIDL2CPP";
+ else
+ kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37021,8 +37438,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -37033,22 +37450,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDL2CPP=$kde_cv_path
+
+ fi
+
+ if test "$build_arts" '!=' "no"; then
+
+- echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+ if test -n "$MCOPIDL"; then
+ kde_cv_path="$MCOPIDL";
+ else
+ kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37091,8 +37508,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -37105,21 +37522,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MCOPIDL=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+ if test -n "$ARTSCCONFIG"; then
+ kde_cv_path="$ARTSCCONFIG";
+ else
+ kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37162,8 +37579,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -37176,22 +37593,22 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ ARTSCCONFIG=$kde_cv_path
+
+ fi
+
+ fi
+
+- echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+ if test -n "$MEINPROC"; then
+ kde_cv_path="$MEINPROC";
+ else
+ kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37234,12 +37651,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MEINPROC=$kde_cv_path
+
+ fi
+@@ -37268,14 +37685,14 @@
+
+ if test -n "$kde32ornewer"; then
+
+- echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+ if test -n "$KCONFIG_COMPILER"; then
+ kde_cv_path="$KCONFIG_COMPILER";
+ else
+ kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37318,8 +37735,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -37330,21 +37747,21 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ KCONFIG_COMPILER=$kde_cv_path
+
+ fi
+
+
+- echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+ if test -n "$DCOPIDLNG"; then
+ kde_cv_path="$DCOPIDLNG";
+ else
+ kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37387,8 +37804,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -37399,8 +37816,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ DCOPIDLNG=$kde_cv_path
+
+ fi
+@@ -37408,14 +37825,14 @@
+ fi
+ if test -n "$kde33ornewer"; then
+
+- echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+ if test -n "$MAKEKDEWIDGETS"; then
+ kde_cv_path="$MAKEKDEWIDGETS";
+ else
+ kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37458,8 +37875,8 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+
+ { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -37470,8 +37887,8 @@
+ { (exit 1); exit 1; }; }
+
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ MAKEKDEWIDGETS=$kde_cv_path
+
+ fi
+@@ -37479,14 +37896,14 @@
+
+ fi
+
+- echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+ if test -n "$XMLLINT"; then
+ kde_cv_path="$XMLLINT";
+ else
+ kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+@@ -37529,12 +37946,12 @@
+ fi
+
+ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++ { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ XMLLINT=""
+ else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+ XMLLINT=$kde_cv_path
+
+ fi
+@@ -37549,7 +37966,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 37547: $i/$j" >&5
-+ echo "configure: 37043: $i/$j" >&5
+- echo "configure: 37552: $i/$j" >&5
++ echo "configure: 37969: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -37781,8 +37277,7 @@
+@@ -37743,10 +38160,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- 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'
+@@ -37759,9 +38175,9 @@
+ for ac_header in X11/extensions/shape.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $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
+@@ -37786,8 +38202,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16882,7 +33801,50 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37866,8 +37361,7 @@
+@@ -37804,12 +38219,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_ext
+ fi
+-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_header" | $as_tr_cpp` 1
+@@ -37831,10 +38248,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- 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'
+@@ -37847,9 +38263,9 @@
+ for ac_header in X11/extensions/XShm.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $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
+@@ -37871,8 +38287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16892,7 +33854,65 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37959,8 +37453,7 @@
+@@ -37889,12 +38304,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_ext
+ fi
+-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_header" | $as_tr_cpp` 1
+@@ -37918,10 +38335,9 @@
+
+
+
+-
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+- 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'
+@@ -37934,18 +38350,19 @@
+ for ac_header in X11/ICE/ICElib.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-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; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -37964,8 +38381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16902,7 +33922,109 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38127,8 +37620,7 @@
+@@ -37982,15 +38398,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38024,9 +38441,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38050,25 +38468,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;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-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; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -38092,8 +38504,7 @@
+ kde_safe_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $all_includes"
+
+-
+- 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'
+@@ -38103,17 +38514,17 @@
+
+
+ if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
+-echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
++echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6; }
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/sendfile.h usability" >&5
+-echo $ECHO_N "checking sys/sendfile.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/sendfile.h usability" >&5
++echo $ECHO_N "checking sys/sendfile.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38132,8 +38543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16912,7 +34034,84 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38283,8 +37775,7 @@
+@@ -38150,15 +38560,16 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_header_compiler=no
++ ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking sys/sendfile.h presence" >&5
+-echo $ECHO_N "checking sys/sendfile.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking sys/sendfile.h presence" >&5
++echo $ECHO_N "checking sys/sendfile.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -38192,9 +38603,10 @@
+
+ ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38218,25 +38630,18 @@
+ echo "$as_me: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
++
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
+-echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sys/sendfile.h" >&5
++echo $ECHO_N "checking for sys/sendfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_sys_sendfile_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sendfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_sendfile_h" >&6; }
+
+ fi
+ if test $ac_cv_header_sys_sendfile_h = yes; then
+@@ -38255,8 +38660,8 @@
+ ac_cpp=$ac_cpp_safe
+ CPPFLAGS=$ac_CPPFLAGS_safe
+
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38288,8 +38693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16922,7 +34121,42 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38359,8 +37850,7 @@
+@@ -38306,12 +38710,13 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_time=no
++ ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -38322,15 +38727,14 @@
+
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38364,8 +38768,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16932,7 +34166,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38402,8 +37892,7 @@
+@@ -38407,8 +38810,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16942,7 +34176,41 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38460,8 +37949,7 @@
+@@ -38425,14 +38827,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_c_bigendian=no
++ ac_cv_c_bigendian=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-# It does not; compile a test program.
++ # It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+ # try to guess the endianness by grepping values into an object file
+ ac_cv_c_bigendian=unknown
+@@ -38442,11 +38845,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+@@ -38465,8 +38868,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16952,7 +34220,82 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38591,9 +38079,6 @@
+@@ -38493,7 +38895,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -38502,17 +38906,22 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++$ac_includes_default
+ int
+ main ()
+ {
++
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+- long l;
+- char c[sizeof (long)];
++ long int l;
++ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+- exit (u.c[sizeof (long) - 1] == 1);
++ return u.c[sizeof (long int) - 1] == 1;
++
++ ;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -38535,13 +38944,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in
+ yes)
+
+@@ -38576,15 +38988,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for setenv" >&5
+-echo $ECHO_N "checking for setenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for setenv" >&5
++echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_setenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -38596,9 +39007,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16962,7 +34305,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38624,8 +38109,7 @@
+@@ -38629,8 +39037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16972,7 +34315,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38726,8 +38210,7 @@
+@@ -38647,8 +39054,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_setenv=no
++ kde_cv_func_setenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38662,11 +39070,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+-echo "${ECHO_T}$kde_cv_func_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
++echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
+
+-echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
++echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_setenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38687,8 +39095,7 @@
+ if test "x$kde_cv_proto_setenv" = xunknown; then
+
+
+-
+- 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'
+@@ -38731,8 +39138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -16982,7 +34362,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38806,9 +38289,6 @@
+@@ -38750,9 +39156,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_setenv="setenv unavailable"
++ kde_cv_proto_setenv="setenv unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38766,8 +39173,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
++echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
+
+ if test "x$kde_cv_func_setenv" = xyes; then
+
+@@ -38791,15 +39198,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for unsetenv" >&5
+-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for unsetenv" >&5
++echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_unsetenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -38811,9 +39217,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16992,7 +34414,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38839,8 +38319,7 @@
+@@ -38844,8 +39247,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17002,7 +34424,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38941,8 +38420,7 @@
+@@ -38862,8 +39264,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_unsetenv=no
++ kde_cv_func_unsetenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38877,11 +39280,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
+
+-echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
++echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_unsetenv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38902,8 +39305,7 @@
+ if test "x$kde_cv_proto_unsetenv" = xunknown; then
+
+
+-
+- 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'
+@@ -38946,8 +39348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17012,7 +34471,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39021,9 +38499,6 @@
+@@ -38965,9 +39366,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_unsetenv="unsetenv unavailable"
++ kde_cv_proto_unsetenv="unsetenv unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38981,8 +39383,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
+
+ if test "x$kde_cv_func_unsetenv" = xyes; then
+
+@@ -39006,15 +39408,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for random" >&5
+-echo $ECHO_N "checking for random... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for random" >&5
++echo $ECHO_N "checking for random... $ECHO_C" >&6; }
+ if test "${kde_cv_func_random+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -39026,9 +39427,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17022,7 +34523,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39056,8 +38531,7 @@
+@@ -39061,8 +39459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17032,7 +34533,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39160,8 +38634,7 @@
+@@ -39079,8 +39476,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_random=no
++ kde_cv_func_random=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39094,11 +39492,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
+-echo "${ECHO_T}$kde_cv_func_random" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
++echo "${ECHO_T}$kde_cv_func_random" >&6; }
+
+-echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
+-echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
++echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_random+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39119,8 +39517,7 @@
+ if test "x$kde_cv_proto_random" = xunknown; then
+
+
+-
+- 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'
+@@ -39165,8 +39562,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17042,7 +34580,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39239,9 +38712,6 @@
+@@ -39184,9 +39580,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_random="random unavailable"
++ kde_cv_proto_random="random unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39200,8 +39597,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
+-echo "${ECHO_T}$kde_cv_proto_random" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
++echo "${ECHO_T}$kde_cv_proto_random" >&6; }
+
+ if test "x$kde_cv_func_random" = xyes; then
+
+@@ -39224,15 +39621,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for srandom" >&5
+-echo $ECHO_N "checking for srandom... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for srandom" >&5
++echo $ECHO_N "checking for srandom... $ECHO_C" >&6; }
+ if test "${kde_cv_func_srandom+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -39244,9 +39640,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17052,7 +34632,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39274,8 +38744,7 @@
+@@ -39279,8 +39672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17062,7 +34642,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39378,8 +38847,7 @@
+@@ -39297,8 +39689,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_srandom=no
++ kde_cv_func_srandom=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39312,11 +39705,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
+-echo "${ECHO_T}$kde_cv_func_srandom" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
++echo "${ECHO_T}$kde_cv_func_srandom" >&6; }
+
+-echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
+-echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
++echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_srandom+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39337,8 +39730,7 @@
+ if test "x$kde_cv_proto_srandom" = xunknown; then
+
+
+-
+- 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'
+@@ -39383,8 +39775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17072,7 +34689,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39459,9 +38927,6 @@
+@@ -39402,9 +39793,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_srandom="srandom unavailable"
++ kde_cv_proto_srandom="srandom unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39418,8 +39810,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
+-echo "${ECHO_T}$kde_cv_proto_srandom" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
++echo "${ECHO_T}$kde_cv_proto_srandom" >&6; }
+
+ if test "x$kde_cv_func_srandom" = xyes; then
+
+@@ -39444,15 +39836,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for mkstemps" >&5
+-echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mkstemps" >&5
++echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mkstemps+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -39464,9 +39855,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17082,7 +34741,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39495,8 +38960,7 @@
+@@ -39500,8 +39888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17092,7 +34751,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39600,8 +39064,7 @@
+@@ -39518,8 +39905,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_mkstemps=no
++ kde_cv_func_mkstemps=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39533,11 +39921,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_func_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; }
+
+-echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
+-echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
++echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_mkstemps+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39558,8 +39946,7 @@
+ if test "x$kde_cv_proto_mkstemps" = xunknown; then
+
+
+-
+- 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'
+@@ -39605,8 +39992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17102,7 +34798,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39680,9 +39143,6 @@
+@@ -39624,9 +40010,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_mkstemps="mkstemps unavailable"
++ kde_cv_proto_mkstemps="mkstemps unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39640,8 +40027,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; }
+
+ if test "x$kde_cv_func_mkstemps" = xyes; then
+
+@@ -39665,15 +40052,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for mkstemp" >&5
+-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mkstemp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -39685,9 +40071,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17112,7 +34850,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39716,8 +39176,7 @@
+@@ -39721,8 +40104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17122,7 +34860,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39821,8 +39280,7 @@
+@@ -39739,8 +40121,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_mkstemp=no
++ kde_cv_func_mkstemp=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39754,11 +40137,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkstemp" >&5
+-echo "${ECHO_T}$kde_cv_func_mkstemp" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemp" >&5
++echo "${ECHO_T}$kde_cv_func_mkstemp" >&6; }
+
+-echo "$as_me:$LINENO: checking if mkstemp needs custom prototype" >&5
+-echo $ECHO_N "checking if mkstemp needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if mkstemp needs custom prototype" >&5
++echo $ECHO_N "checking if mkstemp needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_mkstemp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39779,8 +40162,7 @@
+ if test "x$kde_cv_proto_mkstemp" = xunknown; then
+
+
+-
+- 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'
+@@ -39826,8 +40208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17132,7 +34907,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39901,9 +39359,6 @@
+@@ -39845,9 +40226,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_mkstemp="mkstemp unavailable"
++ kde_cv_proto_mkstemp="mkstemp unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39861,8 +40243,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemp" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkstemp" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemp" >&5
++echo "${ECHO_T}$kde_cv_proto_mkstemp" >&6; }
+
+ if test "x$kde_cv_func_mkstemp" = xyes; then
+
+@@ -39886,15 +40268,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for mkdtemp" >&5
+-echo $ECHO_N "checking for mkdtemp... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mkdtemp" >&5
++echo $ECHO_N "checking for mkdtemp... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mkdtemp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -39906,9 +40287,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17142,7 +34959,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39937,8 +39392,7 @@
+@@ -39942,8 +40320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17152,7 +34969,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40042,8 +39496,7 @@
+@@ -39960,8 +40337,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_mkdtemp=no
++ kde_cv_func_mkdtemp=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39975,11 +40353,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkdtemp" >&5
+-echo "${ECHO_T}$kde_cv_func_mkdtemp" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mkdtemp" >&5
++echo "${ECHO_T}$kde_cv_func_mkdtemp" >&6; }
+
+-echo "$as_me:$LINENO: checking if mkdtemp needs custom prototype" >&5
+-echo $ECHO_N "checking if mkdtemp needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if mkdtemp needs custom prototype" >&5
++echo $ECHO_N "checking if mkdtemp needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_mkdtemp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40000,8 +40378,7 @@
+ if test "x$kde_cv_proto_mkdtemp" = xunknown; then
+
+
+-
+- 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'
+@@ -40047,8 +40424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17162,20 +35016,85 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40109,7 +39562,11 @@
+@@ -40066,9 +40442,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-kde_cv_proto_mkdtemp="mkdtemp unavailable"
++ kde_cv_proto_mkdtemp="mkdtemp unavailable"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -40082,8 +40459,8 @@
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkdtemp" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkdtemp" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkdtemp" >&5
++echo "${ECHO_T}$kde_cv_proto_mkdtemp" >&6; }
+
+ if test "x$kde_cv_func_mkdtemp" = xyes; then
+
+@@ -40114,12 +40491,14 @@
+
+
+
-for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority
+
+
-+
-+
-+for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority statvfs statfs tcgetattr tcsetattr
++for ac_func in strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -40177,8 +39634,7 @@
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -40145,30 +40524,24 @@
+
+ #undef $ac_func
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
+ #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 $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+ ;
+ return 0;
+ }
+@@ -40182,8 +40555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17185,7 +35104,45 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40236,9 +39692,6 @@
+@@ -40200,13 +40572,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_var=no"
++ eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -40221,15 +40595,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for usleep" >&5
+-echo $ECHO_N "checking for usleep... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for usleep" >&5
++echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
+ if test "${kde_cv_func_usleep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -40241,9 +40614,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17195,7 +35152,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40271,8 +39724,7 @@
+@@ -40276,8 +40646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17205,7 +35162,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40375,8 +39827,7 @@
+@@ -40294,8 +40663,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_usleep=no
++ kde_cv_func_usleep=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -40309,11 +40679,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+-echo "${ECHO_T}$kde_cv_func_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
++echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
+
+-echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
++echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_usleep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40334,8 +40704,7 @@
+ if test "x$kde_cv_proto_usleep" = xunknown; then
+
+
+-
+- 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'
+@@ -40380,8 +40749,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17215,7 +35209,49 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40455,9 +39906,6 @@
+@@ -40399,9 +40767,10 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_proto_usleep="usleep unavailable"
++ kde_cv_proto_usleep="usleep unavailable"
+
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -40415,8 +40784,8 @@
+
+ fi
+
+-echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+-echo "${ECHO_T}$kde_cv_proto_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
++echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
+
+ if test "x$kde_cv_func_usleep" = xyes; then
+
+@@ -40440,15 +40809,14 @@
+
+
+
+-echo "$as_me:$LINENO: checking for gethostname" >&5
+-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for gethostname" >&5
++echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
+ if test "${kde_cv_func_gethostname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+-
+- 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'
+@@ -40460,9 +40828,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -17225,7 +35261,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40492,8 +39940,7 @@
+@@ -40497,8 +40862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -17235,7 +35271,44 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40598,8 +40045,7 @@
+@@ -40515,8 +40879,9 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-kde_cv_func_gethostname=no
++ kde_cv_func_gethostname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -40530,11 +40895,11 @@
+ fi
+
+
+-echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_func_gethostname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
++echo "${ECHO_T}$kde_cv_func_gethostname" >&6; }
+
+-echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
+-echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
++echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_gethostname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C