rev 4664 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Oct 10 21:47:14 UTC 2006
Author: chrsmrtn
Date: 2006-10-10 21:47:10 +0000 (Tue, 10 Oct 2006)
New Revision: 4664
Removed:
trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff
Modified:
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
Dump old patch now in tarball, and update buildprep.
Deleted: trunk/packages/kdebase/debian/patches/02_minipager_fixes_branch.diff
Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff 2006-10-10 21:46:45 UTC (rev 4663)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff 2006-10-10 21:47:10 UTC (rev 4664)
@@ -4112,7 +4112,7 @@
docs-am:
--- config.h.in
+++ config.h.in
-@@ -212,10 +212,14 @@
+@@ -215,10 +215,14 @@
/* Define to 1 if you have the `login_getclass' function. */
#undef HAVE_LOGIN_GETCLASS
@@ -4129,7 +4129,7 @@
/* Define if you have long long as datatype */
#undef HAVE_LONG_LONG
-@@ -656,25 +660,25 @@
+@@ -659,25 +663,25 @@
/* Define if kdm should use Sun's secure RPC for Xauth cookies. */
#undef SECURE_RPC
@@ -5891,7 +5891,7 @@
--with-java=javadir use java installed in javadir, --without-java
disables
--without-composite Disable Xcomposite support (default: check)
-@@ -1118,131 +1934,100 @@
+@@ -1120,131 +1936,100 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -6074,7 +6074,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1261,7 +2046,7 @@
+@@ -1263,7 +2048,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`
@@ -6083,7 +6083,7 @@
/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`
-@@ -1275,6 +2060,7 @@
+@@ -1277,6 +2062,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -6091,7 +6091,7 @@
} >&5
-@@ -1296,7 +2082,6 @@
+@@ -1298,7 +2084,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -6099,7 +6099,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1307,7 +2092,7 @@
+@@ -1309,7 +2094,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -6108,7 +6108,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1329,9 +2114,7 @@
+@@ -1331,9 +2116,7 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -6119,7 +6119,7 @@
;;
esac
done
-@@ -1342,8 +2125,8 @@
+@@ -1344,8 +2127,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.
@@ -6130,7 +6130,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1356,20 +2139,34 @@
+@@ -1358,20 +2141,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -6175,7 +6175,7 @@
echo
cat <<\_ASBOX
-@@ -1380,22 +2177,28 @@
+@@ -1382,22 +2179,28 @@
echo
for ac_var in $ac_subst_vars
do
@@ -6211,7 +6211,7 @@
done | sort
echo
fi
-@@ -1407,26 +2210,24 @@
+@@ -1409,26 +2212,24 @@
## ----------- ##
_ASBOX
echo
@@ -6243,7 +6243,7 @@
# Predefined preprocessor variables.
-@@ -1457,14 +2258,17 @@
+@@ -1459,14 +2260,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -6268,7 +6268,7 @@
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;}
-@@ -1480,8 +2284,8 @@
+@@ -1482,8 +2286,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -6279,7 +6279,7 @@
esac
fi
else
-@@ -1493,12 +2297,11 @@
+@@ -1495,12 +2299,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -6295,7 +6295,7 @@
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
-@@ -1523,8 +2326,7 @@
+@@ -1525,8 +2328,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -6305,7 +6305,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1541,12 +2343,6 @@
+@@ -1543,12 +2345,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -6318,7 +6318,7 @@
-@@ -1563,110 +2359,165 @@
+@@ -1565,110 +2361,165 @@
@@ -6536,7 +6536,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1676,17 +2527,17 @@
+@@ -1678,17 +2529,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6557,7 +6557,7 @@
am__api_version="1.9"
-@@ -1708,8 +2559,8 @@
+@@ -1710,8 +2561,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.
@@ -6568,7 +6568,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1731,7 +2582,7 @@
+@@ -1733,7 +2584,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6577,7 +6577,7 @@
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.
-@@ -1750,21 +2601,22 @@
+@@ -1752,21 +2603,22 @@
;;
esac
done
@@ -6605,7 +6605,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1778,8 +2630,8 @@
+@@ -1780,8 +2632,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
@@ -6616,7 +6616,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1791,8 +2643,8 @@
+@@ -1793,8 +2645,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6627,7 +6627,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1802,8 +2654,8 @@
+@@ -1804,8 +2656,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6638,7 +6638,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1845,8 +2697,8 @@
+@@ -1847,8 +2699,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6649,7 +6649,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1897,8 +2749,8 @@
+@@ -1899,8 +2751,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
@@ -6660,7 +6660,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1911,54 +2763,57 @@
+@@ -1913,54 +2765,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6739,7 +6739,16 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2029,8 +2884,8 @@
+@@ -1992,7 +2847,7 @@
+
+
+ # Define the identity of the package.
+- PACKAGE=kdebase
++ PACKAGE=kdebasea
+ VERSION="3.5.5"
+
+
+@@ -2031,8 +2886,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
@@ -6750,7 +6759,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2043,32 +2898,34 @@
+@@ -2045,32 +2900,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6792,7 +6801,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2081,27 +2938,41 @@
+@@ -2083,27 +2940,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6841,7 +6850,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2121,6 +2992,31 @@
+@@ -2123,6 +2994,31 @@
@@ -6873,7 +6882,7 @@
unset CDPATH
-@@ -2139,14 +3035,14 @@
+@@ -2141,14 +3037,14 @@
if test "x$prefix" = "xNONE"; then
@@ -6891,7 +6900,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2189,8 +3085,8 @@
+@@ -2191,8 +3087,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6902,7 +6911,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2201,8 +3097,8 @@
+@@ -2203,8 +3099,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6913,7 +6922,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2211,14 +3107,14 @@
+@@ -2213,14 +3109,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -6931,7 +6940,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2261,8 +3157,8 @@
+@@ -2263,8 +3159,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6942,7 +6951,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2273,8 +3169,8 @@
+@@ -2275,8 +3171,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6953,7 +6962,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2296,16 +3192,16 @@
+@@ -2298,16 +3194,16 @@
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -6976,7 +6985,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2318,13 +3214,13 @@
+@@ -2320,13 +3216,13 @@
@@ -6994,7 +7003,7 @@
val=
-@@ -2341,11 +3237,11 @@
+@@ -2343,11 +3239,11 @@
@@ -7008,7 +7017,7 @@
am_make=${MAKE-make}
-@@ -2355,8 +3251,8 @@
+@@ -2357,8 +3253,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7019,7 +7028,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2383,15 +3279,15 @@
+@@ -2385,15 +3281,15 @@
fi
@@ -7040,7 +7049,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2411,10 +3307,9 @@
+@@ -2413,10 +3309,9 @@
@@ -7053,7 +7062,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2434,18 +3329,18 @@
+@@ -2436,18 +3331,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -7079,7 +7088,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2454,12 +3349,12 @@
+@@ -2456,12 +3351,12 @@
else
kde_use_strict_options="no"
@@ -7096,7 +7105,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2468,20 +3363,21 @@
+@@ -2470,20 +3365,21 @@
else
kde_use_warnings="yes"
@@ -7123,7 +7132,7 @@
CFLAGS=" $CFLAGS"
-@@ -2493,8 +3389,8 @@
+@@ -2495,8 +3391,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
@@ -7134,7 +7143,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2507,32 +3403,34 @@
+@@ -2509,32 +3405,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7176,7 +7185,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2545,36 +3443,51 @@
+@@ -2547,36 +3445,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7238,7 +7247,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2587,74 +3500,34 @@
+@@ -2589,74 +3502,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7322,7 +7331,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2668,7 +3541,7 @@
+@@ -2670,7 +3543,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7331,7 +7340,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2679,6 +3552,7 @@
+@@ -2681,6 +3554,7 @@
fi
done
done
@@ -7339,7 +7348,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2696,22 +3570,23 @@
+@@ -2698,22 +3572,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7370,7 +7379,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2724,36 +3599,38 @@
+@@ -2726,36 +3601,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7417,7 +7426,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2766,29 +3643,45 @@
+@@ -2768,29 +3645,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7469,7 +7478,7 @@
fi
fi
-@@ -2801,21 +3694,35 @@
+@@ -2803,21 +3696,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7513,7 +7522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2840,47 +3747,77 @@
+@@ -2842,47 +3749,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -7613,7 +7622,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2892,19 +3829,21 @@
+@@ -2894,19 +3831,21 @@
fi
ac_exeext=$ac_cv_exeext
@@ -7642,7 +7651,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2923,22 +3862,27 @@
+@@ -2925,22 +3864,27 @@
fi
fi
fi
@@ -7682,7 +7691,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2949,9 +3893,8 @@
+@@ -2951,9 +3895,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7693,7 +7702,7 @@
break;;
* ) break;;
esac
-@@ -2965,14 +3908,14 @@
+@@ -2967,14 +3910,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7712,7 +7721,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2992,14 +3935,20 @@
+@@ -2994,14 +3937,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7737,7 +7746,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3017,12 +3966,12 @@
+@@ -3019,12 +3968,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7754,7 +7763,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3045,24 +3994,36 @@
+@@ -3047,24 +3996,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7799,7 +7808,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3071,24 +4032,28 @@
+@@ -3073,24 +4034,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7836,7 +7845,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3104,24 +4069,36 @@
+@@ -3106,24 +4071,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7881,7 +7890,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3130,285 +4107,278 @@
+@@ -3132,285 +4109,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8344,7 +8353,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3417,8 +4387,8 @@
+@@ -3419,8 +4389,8 @@
depcc="$CC" am_compiler_list=
@@ -8355,7 +8364,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3507,8 +4477,8 @@
+@@ -3509,8 +4479,8 @@
fi
fi
@@ -8366,7 +8375,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3530,8 +4500,8 @@
+@@ -3532,8 +4502,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
@@ -8377,7 +8386,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3565,8 +4535,13 @@
+@@ -3567,8 +4537,13 @@
#endif
Syntax error
_ACEOF
@@ -8393,7 +8402,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3591,9 +4566,10 @@
+@@ -3593,9 +4568,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8405,7 +8414,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3603,8 +4579,13 @@
+@@ -3605,8 +4581,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8421,7 +8430,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3631,6 +4612,7 @@
+@@ -3633,6 +4614,7 @@
ac_preproc_ok=:
break
fi
@@ -8429,7 +8438,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3648,8 +4630,8 @@
+@@ -3650,8 +4632,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8440,7 +8449,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3672,8 +4654,13 @@
+@@ -3674,8 +4656,13 @@
#endif
Syntax error
_ACEOF
@@ -8456,7 +8465,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3698,9 +4685,10 @@
+@@ -3700,9 +4687,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8468,7 +8477,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3710,8 +4698,13 @@
+@@ -3712,8 +4700,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8484,7 +8493,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3738,6 +4731,7 @@
+@@ -3740,6 +4733,7 @@
ac_preproc_ok=:
break
fi
@@ -8492,7 +8501,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3788,18 +4782,22 @@
+@@ -3790,18 +4784,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8520,7 +8529,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3812,36 +4810,38 @@
+@@ -3814,36 +4812,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8567,7 +8576,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3854,55 +4854,85 @@
+@@ -3856,55 +4856,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8671,7 +8680,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3925,24 +4955,36 @@
+@@ -3927,24 +4957,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8716,7 +8725,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3951,24 +4993,28 @@
+@@ -3953,24 +4995,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8753,7 +8762,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3984,24 +5030,36 @@
+@@ -3986,24 +5032,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8798,7 +8807,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4010,70 +5068,53 @@
+@@ -4012,70 +5070,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8893,7 +8902,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4082,61 +5123,91 @@
+@@ -4084,61 +5125,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9007,7 +9016,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4145,8 +5216,8 @@
+@@ -4147,8 +5218,8 @@
depcc="$CXX" am_compiler_list=
@@ -9018,7 +9027,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4235,8 +5306,8 @@
+@@ -4237,8 +5308,8 @@
fi
fi
@@ -9029,7 +9038,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4254,8 +5325,8 @@
+@@ -4256,8 +5327,8 @@
@@ -9040,7 +9049,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4280,24 +5351,36 @@
+@@ -4282,24 +5353,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9085,7 +9094,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4306,13 +5389,14 @@
+@@ -4308,13 +5391,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9104,7 +9113,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4354,17 +5438,16 @@
+@@ -4356,17 +5440,16 @@
fi
fi
@@ -9126,7 +9135,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4392,24 +5475,36 @@
+@@ -4394,24 +5477,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9171,7 +9180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4418,8 +5513,10 @@
+@@ -4420,8 +5515,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9183,7 +9192,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4432,29 +5529,28 @@
+@@ -4434,29 +5531,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9221,7 +9230,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4481,24 +5577,36 @@
+@@ -4483,24 +5579,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9266,7 +9275,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4507,8 +5615,10 @@
+@@ -4509,8 +5617,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9278,7 +9287,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4521,13 +5631,13 @@
+@@ -4523,13 +5633,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9296,7 +9305,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4548,16 +5658,15 @@
+@@ -4550,16 +5660,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9317,7 +9326,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4584,24 +5693,36 @@
+@@ -4586,24 +5695,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9362,7 +9371,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4610,8 +5731,10 @@
+@@ -4612,8 +5733,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9374,7 +9383,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4624,16 +5747,16 @@
+@@ -4626,16 +5749,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9395,7 +9404,7 @@
:
fi
-@@ -4648,16 +5771,15 @@
+@@ -4650,16 +5773,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"
@@ -9416,7 +9425,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4684,24 +5806,36 @@
+@@ -4686,24 +5808,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9461,7 +9470,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4710,8 +5844,10 @@
+@@ -4712,8 +5846,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9473,7 +9482,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4724,27 +5860,26 @@
+@@ -4726,27 +5862,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9508,7 +9517,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4769,24 +5904,36 @@
+@@ -4771,24 +5906,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9553,7 +9562,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4795,8 +5942,10 @@
+@@ -4797,8 +5944,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9565,7 +9574,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4809,13 +5958,13 @@
+@@ -4811,13 +5960,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9583,7 +9592,7 @@
:
fi
-@@ -4823,16 +5972,15 @@
+@@ -4825,16 +5974,15 @@
;;
esac
@@ -9604,7 +9613,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4859,24 +6007,36 @@
+@@ -4861,24 +6009,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9649,7 +9658,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4885,8 +6045,10 @@
+@@ -4887,8 +6047,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9661,7 +9670,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4899,28 +6061,27 @@
+@@ -4901,28 +6063,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9698,7 +9707,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4947,24 +6108,36 @@
+@@ -4949,24 +6110,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9743,7 +9752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4973,8 +6146,10 @@
+@@ -4975,8 +6148,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9755,7 +9764,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4987,28 +6162,27 @@
+@@ -4989,28 +6164,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9792,7 +9801,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5035,24 +6209,36 @@
+@@ -5037,24 +6211,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9837,7 +9846,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5061,8 +6247,10 @@
+@@ -5063,8 +6249,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9849,7 +9858,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5075,13 +6263,13 @@
+@@ -5077,13 +6265,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9867,7 +9876,7 @@
:
fi
-@@ -5093,13 +6281,13 @@
+@@ -5095,13 +6283,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9885,7 +9894,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5107,16 +6295,15 @@
+@@ -5109,16 +6297,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9906,7 +9915,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5143,24 +6330,36 @@
+@@ -5145,24 +6332,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9951,7 +9960,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5169,8 +6368,10 @@
+@@ -5171,8 +6370,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9963,7 +9972,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5183,13 +6384,13 @@
+@@ -5185,13 +6386,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9981,7 +9990,7 @@
:
fi
-@@ -5201,16 +6402,15 @@
+@@ -5203,16 +6404,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -10002,7 +10011,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5237,24 +6437,36 @@
+@@ -5239,24 +6439,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10047,7 +10056,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5263,8 +6475,10 @@
+@@ -5265,8 +6477,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10059,7 +10068,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5277,28 +6491,27 @@
+@@ -5279,28 +6493,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10096,7 +10105,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5325,24 +6538,36 @@
+@@ -5327,24 +6540,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10141,7 +10150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5351,8 +6576,10 @@
+@@ -5353,8 +6578,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10153,7 +10162,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5365,28 +6592,27 @@
+@@ -5367,28 +6594,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10190,7 +10199,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5413,24 +6639,36 @@
+@@ -5415,24 +6641,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10235,7 +10244,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5439,8 +6677,10 @@
+@@ -5441,8 +6679,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10247,7 +10256,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5453,28 +6693,27 @@
+@@ -5455,28 +6695,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10284,7 +10293,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5501,24 +6740,36 @@
+@@ -5503,24 +6742,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10329,7 +10338,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5527,8 +6778,10 @@
+@@ -5529,8 +6780,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10341,7 +10350,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5541,13 +6794,13 @@
+@@ -5543,13 +6796,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10359,7 +10368,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5555,37 +6808,37 @@
+@@ -5557,37 +6810,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10411,7 +10420,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5617,24 +6870,36 @@
+@@ -5619,24 +6872,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10456,7 +10465,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5643,18 +6908,19 @@
+@@ -5645,18 +6910,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10480,7 +10489,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5674,16 +6940,15 @@
+@@ -5676,16 +6942,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10501,7 +10510,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5710,24 +6975,36 @@
+@@ -5712,24 +6977,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10546,7 +10555,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5736,8 +7013,10 @@
+@@ -5738,8 +7015,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10558,7 +10567,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5750,29 +7029,28 @@
+@@ -5752,29 +7031,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10596,7 +10605,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5799,24 +7077,36 @@
+@@ -5801,24 +7079,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10641,7 +10650,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5825,8 +7115,10 @@
+@@ -5827,8 +7117,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10653,7 +10662,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5839,28 +7131,27 @@
+@@ -5841,28 +7133,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10690,7 +10699,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5887,24 +7178,36 @@
+@@ -5889,24 +7180,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10735,7 +10744,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5913,8 +7216,10 @@
+@@ -5915,8 +7218,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10747,7 +10756,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5927,28 +7232,27 @@
+@@ -5929,28 +7234,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10784,7 +10793,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5975,24 +7279,36 @@
+@@ -5977,24 +7281,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10829,7 +10838,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6001,8 +7317,10 @@
+@@ -6003,8 +7319,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10841,7 +10850,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6015,28 +7333,27 @@
+@@ -6017,28 +7335,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10878,7 +10887,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6063,24 +7380,36 @@
+@@ -6065,24 +7382,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10923,7 +10932,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6089,8 +7418,10 @@
+@@ -6091,8 +7420,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10935,7 +10944,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6103,28 +7434,27 @@
+@@ -6105,28 +7436,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10972,7 +10981,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6151,24 +7481,36 @@
+@@ -6153,24 +7483,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11017,7 +11026,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6177,8 +7519,10 @@
+@@ -6179,8 +7521,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11029,7 +11038,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6191,13 +7535,13 @@
+@@ -6193,13 +7537,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11047,7 +11056,7 @@
:
fi
-@@ -6304,13 +7648,13 @@
+@@ -6306,13 +7650,13 @@
fi
@@ -11064,7 +11073,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6340,8 +7684,13 @@
+@@ -6342,8 +7686,13 @@
#endif
Syntax error
_ACEOF
@@ -11080,7 +11089,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6366,9 +7715,10 @@
+@@ -6368,9 +7717,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11092,7 +11101,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6378,8 +7728,13 @@
+@@ -6380,8 +7730,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11108,7 +11117,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6406,6 +7761,7 @@
+@@ -6408,6 +7763,7 @@
ac_preproc_ok=:
break
fi
@@ -11116,7 +11125,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6423,8 +7779,8 @@
+@@ -6425,8 +7781,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11127,7 +11136,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6447,8 +7803,13 @@
+@@ -6449,8 +7805,13 @@
#endif
Syntax error
_ACEOF
@@ -11143,7 +11152,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6473,9 +7834,10 @@
+@@ -6475,9 +7836,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11155,7 +11164,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6485,8 +7847,13 @@
+@@ -6487,8 +7849,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11171,7 +11180,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6513,6 +7880,7 @@
+@@ -6515,6 +7882,7 @@
ac_preproc_ok=:
break
fi
@@ -11179,7 +11188,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6539,16 +7907,15 @@
+@@ -6541,16 +7909,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11200,7 +11209,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6575,24 +7942,36 @@
+@@ -6577,24 +7944,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11245,7 +11254,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6601,8 +7980,10 @@
+@@ -6603,8 +7982,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11257,7 +11266,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6615,22 +7996,21 @@
+@@ -6617,22 +7998,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11286,7 +11295,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6646,36 +8026,36 @@
+@@ -6648,36 +8028,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11333,7 +11342,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6702,24 +8082,36 @@
+@@ -6704,24 +8084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11378,7 +11387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6728,8 +8120,10 @@
+@@ -6730,8 +8122,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11390,7 +11399,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6742,29 +8136,28 @@
+@@ -6744,29 +8138,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11428,7 +11437,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6791,24 +8184,36 @@
+@@ -6793,24 +8186,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11473,7 +11482,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6817,8 +8222,10 @@
+@@ -6819,8 +8224,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11485,7 +11494,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6831,13 +8238,13 @@
+@@ -6833,13 +8240,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11503,7 +11512,7 @@
:
fi
-@@ -6847,13 +8254,13 @@
+@@ -6849,13 +8256,13 @@
@@ -11521,7 +11530,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6866,13 +8273,13 @@
+@@ -6868,13 +8275,13 @@
@@ -11539,7 +11548,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6883,216 +8290,36 @@
+@@ -6885,216 +8292,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11775,7 +11784,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7111,12 +8338,12 @@
+@@ -7113,12 +8340,12 @@
esac
else
enable_shared=yes
@@ -11792,7 +11801,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7135,18 +8362,19 @@
+@@ -7137,18 +8364,19 @@
esac
else
enable_static=no
@@ -11817,7 +11826,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7167,8 +8395,8 @@
+@@ -7169,8 +8397,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11828,7 +11837,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7184,14 +8412,13 @@
+@@ -7186,14 +8414,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11847,7 +11856,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7210,10 +8437,11 @@
+@@ -7212,10 +8439,11 @@
esac
else
enable_fast_install=yes
@@ -11862,7 +11871,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7237,7 +8465,7 @@
+@@ -7239,7 +8467,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
@@ -11871,7 +11880,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7266,37 +8494,184 @@
+@@ -7268,37 +8496,184 @@
fi
SED=$lt_cv_path_SED
@@ -12073,7 +12082,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7325,11 +8700,11 @@
+@@ -7327,11 +8702,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12089,7 +12098,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7342,7 +8717,7 @@
+@@ -7344,7 +8719,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,
@@ -12098,7 +12107,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'*)
-@@ -7362,21 +8737,21 @@
+@@ -7364,21 +8739,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12127,7 +12136,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7386,29 +8761,38 @@
+@@ -7388,29 +8763,38 @@
;;
esac
fi
@@ -12174,7 +12183,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7416,56 +8800,63 @@
+@@ -7418,56 +8802,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12272,7 +12281,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7492,44 +8883,36 @@
+@@ -7494,44 +8885,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12327,7 +12336,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7545,7 +8928,7 @@
+@@ -7547,7 +8930,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12336,7 +12345,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
-@@ -7561,43 +8944,27 @@
+@@ -7563,43 +8946,27 @@
esac
;;
@@ -12393,7 +12402,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
-@@ -7616,32 +8983,22 @@
+@@ -7618,32 +8985,22 @@
;;
openbsd*)
@@ -12429,7 +12438,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]'
-@@ -7662,17 +9019,20 @@
+@@ -7664,17 +9021,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12453,7 +12462,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7681,14 +9041,17 @@
+@@ -7683,14 +9043,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12474,16 +12483,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7715,7 +9078,7 @@
+@@ -7717,7 +9080,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7718 "configure"' > conftest.$ac_ext
-+ echo '#line 9081 "configure"' > conftest.$ac_ext
+- echo '#line 7720 "configure"' > conftest.$ac_ext
++ echo '#line 9083 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7758,14 +9121,13 @@
+@@ -7760,14 +9123,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12500,7 +12509,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7777,7 +9139,6 @@
+@@ -7779,7 +9141,6 @@
esac
;;
*64-bit*)
@@ -12508,7 +12517,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7802,8 +9163,8 @@
+@@ -7804,8 +9165,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12519,7 +12528,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7829,24 +9190,36 @@
+@@ -7831,24 +9192,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12564,7 +12573,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7855,9 +9228,10 @@
+@@ -7857,9 +9230,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12577,7 +12586,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7866,13 +9240,33 @@
+@@ -7868,13 +9242,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12613,7 +12622,7 @@
esac
-@@ -7880,8 +9274,8 @@
+@@ -7882,8 +9276,8 @@
@@ -12624,7 +12633,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7905,24 +9299,36 @@
+@@ -7907,24 +9301,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12669,7 +12678,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7931,9 +9337,10 @@
+@@ -7933,9 +9339,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12682,7 +12691,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7989,6 +9396,7 @@
+@@ -7991,6 +9398,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12690,7 +12699,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8008,18 +9416,27 @@
+@@ -8010,18 +9418,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12724,7 +12733,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8032,12 +9449,14 @@
+@@ -8034,12 +9451,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12742,7 +12751,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8060,9 +9479,9 @@
+@@ -8062,9 +9481,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12755,7 +12764,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8076,24 +9495,36 @@
+@@ -8078,24 +9497,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12800,7 +12809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8102,12 +9533,14 @@
+@@ -8104,12 +9535,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12819,7 +12828,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8122,18 +9555,19 @@
+@@ -8124,18 +9557,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12847,7 +12856,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8144,24 +9578,36 @@
+@@ -8146,24 +9580,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12892,7 +12901,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8170,15 +9616,16 @@
+@@ -8172,15 +9618,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12915,7 +12924,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8187,8 +9634,13 @@
+@@ -8189,8 +9636,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12931,7 +12940,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8212,9 +9664,10 @@
+@@ -8214,9 +9666,10 @@
ac_header_preproc=no
fi
@@ -12944,7 +12953,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8238,25 +9691,19 @@
+@@ -8240,25 +9693,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;}
@@ -12977,7 +12986,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8268,219 +9715,538 @@
+@@ -8270,219 +9717,538 @@
done
@@ -13090,7 +13099,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8363:" \
+-echo "$as_me:8365:" \
- "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
@@ -13697,7 +13706,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -8509,13 +10275,13 @@
+@@ -8511,13 +10277,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13714,7 +13723,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8544,20 +10310,70 @@
+@@ -8546,20 +10312,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13791,7 +13800,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.
-@@ -8568,19 +10384,19 @@
+@@ -8570,19 +10386,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13817,7 +13826,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8594,9 +10410,6 @@
+@@ -8596,9 +10412,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13827,7 +13836,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'"
-@@ -8618,14 +10431,30 @@
+@@ -8620,14 +10433,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'"
;;
@@ -13860,7 +13869,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8643,14 +10472,17 @@
+@@ -8645,14 +10474,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13880,7 +13889,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8768,15 +10600,15 @@
+@@ -8770,15 +10602,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
@@ -13902,7 +13911,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8790,8 +10622,8 @@
+@@ -8792,8 +10624,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13913,7 +13922,7 @@
objdir=$lt_cv_objdir
-@@ -8812,7 +10644,7 @@
+@@ -8814,7 +10646,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13922,7 +13931,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8832,7 +10664,7 @@
+@@ -8834,7 +10666,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13931,7 +13940,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8842,8 +10674,8 @@
+@@ -8844,8 +10676,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
@@ -13942,7 +13951,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8856,32 +10688,34 @@
+@@ -8858,32 +10690,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13984,7 +13993,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8894,27 +10728,41 @@
+@@ -8896,27 +10730,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14033,7 +14042,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8922,8 +10770,8 @@
+@@ -8924,8 +10772,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
@@ -14044,7 +14053,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8936,32 +10784,34 @@
+@@ -8938,32 +10786,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14086,7 +14095,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8974,27 +10824,41 @@
+@@ -8976,27 +10826,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14135,7 +14144,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -9002,8 +10866,8 @@
+@@ -9004,8 +10868,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
@@ -14146,7 +14155,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9016,32 +10880,34 @@
+@@ -9018,32 +10882,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14188,7 +14197,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9054,27 +10920,41 @@
+@@ -9056,27 +10922,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14237,7 +14246,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9089,6 +10969,7 @@
+@@ -9091,6 +10971,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14245,7 +14254,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9108,21 +10989,32 @@
+@@ -9110,21 +10991,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14282,7 +14291,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9142,7 +11034,7 @@
+@@ -9144,7 +11036,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14291,7 +14300,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
-@@ -9174,17 +11066,17 @@
+@@ -9176,17 +11068,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14315,7 +14324,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9204,7 +11096,7 @@
+@@ -9206,7 +11098,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14324,7 +14333,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
-@@ -9236,11 +11128,11 @@
+@@ -9238,11 +11130,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14340,7 +14349,7 @@
fi
else
-@@ -9255,21 +11147,21 @@
+@@ -9257,21 +11149,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14369,7 +14378,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9299,68 +11191,25 @@
+@@ -9301,68 +11193,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14453,7 +14462,7 @@
## CAVEAT EMPTOR:
-@@ -9374,8 +11223,8 @@
+@@ -9376,8 +11225,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14464,7 +14473,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9389,26 +11238,28 @@
+@@ -9391,26 +11240,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 \
@@ -14472,13 +14481,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:9395: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11244: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9397: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11246: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9399: \$? = $ac_status" >&5
-+ echo "$as_me:11248: \$? = $ac_status" >&5
+- echo "$as_me:9401: \$? = $ac_status" >&5
++ echo "$as_me:11250: \$? = $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
@@ -14500,7 +14509,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9422,8 +11273,8 @@
+@@ -9424,8 +11275,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14511,7 +14520,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9461,6 +11312,11 @@
+@@ -9463,6 +11314,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14523,7 +14532,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9477,7 +11333,7 @@
+@@ -9479,7 +11335,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14532,7 +14541,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9503,6 +11359,16 @@
+@@ -9505,6 +11361,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14549,7 +14558,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9514,7 +11380,7 @@
+@@ -9516,7 +11382,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.
@@ -14558,7 +14567,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9537,13 +11403,20 @@
+@@ -9539,13 +11405,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14581,7 +14590,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9558,15 +11431,15 @@
+@@ -9560,15 +11433,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14603,7 +14612,7 @@
;;
sunos4*)
-@@ -9575,7 +11448,7 @@
+@@ -9577,7 +11450,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14612,7 +14621,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9588,6 +11461,17 @@
+@@ -9590,6 +11463,17 @@
fi
;;
@@ -14630,7 +14639,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9599,16 +11483,16 @@
+@@ -9601,16 +11485,16 @@
esac
fi
@@ -14651,7 +14660,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9622,26 +11506,28 @@
+@@ -9624,26 +11508,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 \
@@ -14659,13 +14668,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:9628: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11512: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9630: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9632: \$? = $ac_status" >&5
-+ echo "$as_me:11516: \$? = $ac_status" >&5
+- echo "$as_me:9634: \$? = $ac_status" >&5
++ echo "$as_me:11518: \$? = $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
@@ -14687,7 +14696,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9654,7 +11540,7 @@
+@@ -9656,7 +11542,7 @@
fi
fi
@@ -14696,7 +14705,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9664,8 +11550,50 @@
+@@ -9666,8 +11552,50 @@
;;
esac
@@ -14749,7 +14758,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9676,60 +11604,58 @@
+@@ -9678,60 +11606,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14770,13 +14779,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:9695: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11616: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9697: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11618: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9699: \$? = $ac_status" >&5
-+ echo "$as_me:11620: \$? = $ac_status" >&5
+- echo "$as_me:9701: \$? = $ac_status" >&5
++ echo "$as_me:11622: \$? = $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
@@ -14828,7 +14837,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9739,8 +11665,8 @@
+@@ -9741,8 +11667,8 @@
need_locks=no
fi
@@ -14839,7 +14848,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9778,6 +11704,16 @@
+@@ -9780,6 +11706,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14856,7 +14865,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9788,6 +11724,10 @@
+@@ -9790,6 +11726,10 @@
with_gnu_ld=no
fi
;;
@@ -14867,7 +14876,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9798,6 +11738,27 @@
+@@ -9800,6 +11740,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14895,7 +14904,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9835,7 +11796,7 @@
+@@ -9837,7 +11798,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14904,7 +14913,7 @@
else
ld_shlibs=no
fi
-@@ -9845,13 +11806,13 @@
+@@ -9847,13 +11808,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'
@@ -14921,7 +14930,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
-@@ -9860,23 +11821,70 @@
+@@ -9862,23 +11823,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14997,7 +15006,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9890,13 +11898,40 @@
+@@ -9892,13 +11900,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15040,7 +15049,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9906,24 +11941,19 @@
+@@ -9908,24 +11943,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15072,7 +15081,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9935,7 +11965,7 @@
+@@ -9937,7 +11967,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -15081,7 +15090,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9957,9 +11987,21 @@
+@@ -9959,9 +11989,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
@@ -15105,7 +15114,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9976,7 +12018,7 @@
+@@ -9978,7 +12020,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15114,7 +15123,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`
-@@ -9995,8 +12037,12 @@
+@@ -9997,8 +12039,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15127,7 +15136,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10004,22 +12050,23 @@
+@@ -10006,22 +12052,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15158,7 +15167,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10035,24 +12082,36 @@
+@@ -10037,24 +12084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15203,7 +15212,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10066,19 +12125,20 @@
+@@ -10068,19 +12127,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15229,7 +15238,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10097,24 +12157,36 @@
+@@ -10099,24 +12159,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15274,7 +15283,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10128,8 +12200,10 @@
+@@ -10130,8 +12202,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15286,7 +15295,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10138,13 +12212,11 @@
+@@ -10140,13 +12214,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15303,7 +15312,7 @@
fi
fi
;;
-@@ -10157,7 +12229,7 @@
+@@ -10159,7 +12231,7 @@
ld_shlibs=no
;;
@@ -15312,7 +15321,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10167,13 +12239,13 @@
+@@ -10169,13 +12241,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15329,7 +15338,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.
-@@ -10183,52 +12255,52 @@
+@@ -10185,52 +12257,52 @@
;;
darwin* | rhapsody*)
@@ -15422,7 +15431,7 @@
fi
;;
-@@ -10262,8 +12334,8 @@
+@@ -10264,8 +12336,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15433,7 +15442,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10271,7 +12343,7 @@
+@@ -10273,7 +12345,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15442,7 +15451,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
-@@ -10285,47 +12357,62 @@
+@@ -10287,47 +12359,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15529,7 +15538,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10339,7 +12426,7 @@
+@@ -10341,7 +12428,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15538,7 +15547,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'
-@@ -10349,7 +12436,7 @@
+@@ -10351,7 +12438,7 @@
link_all_deplibs=yes
;;
@@ -15547,7 +15556,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10372,7 +12459,8 @@
+@@ -10374,7 +12461,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
@@ -15557,7 +15566,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10382,7 +12470,7 @@
+@@ -10384,7 +12472,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15566,7 +15575,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10393,14 +12481,14 @@
+@@ -10395,14 +12483,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15583,7 +15592,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'
-@@ -10412,13 +12500,13 @@
+@@ -10414,13 +12502,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15599,7 +15608,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10426,21 +12514,15 @@
+@@ -10428,21 +12516,15 @@
hardcode_libdir_separator=:
;;
@@ -15625,7 +15634,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'
-@@ -10449,8 +12531,18 @@
+@@ -10451,8 +12533,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15646,7 +15655,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10459,7 +12551,7 @@
+@@ -10461,7 +12553,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.
@@ -15655,7 +15664,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10507,36 +12599,45 @@
+@@ -10509,36 +12601,45 @@
fi
;;
@@ -15722,7 +15731,7 @@
;;
uts4*)
-@@ -10551,15 +12652,10 @@
+@@ -10553,15 +12654,10 @@
esac
fi
@@ -15740,7 +15749,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10577,8 +12673,8 @@
+@@ -10579,8 +12675,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.
@@ -15751,7 +15760,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10592,6 +12688,7 @@
+@@ -10594,6 +12690,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15759,7 +15768,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10614,20 +12711,20 @@
+@@ -10616,20 +12713,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15785,7 +15794,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10637,7 +12734,20 @@
+@@ -10639,7 +12736,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15807,7 +15816,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10702,7 +12812,7 @@
+@@ -10704,7 +12814,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15816,7 +15825,7 @@
;;
beos*)
-@@ -10711,7 +12821,7 @@
+@@ -10713,7 +12823,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15825,7 +15834,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10727,7 +12837,7 @@
+@@ -10729,7 +12839,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15834,7 +15843,7 @@
need_version=no
need_lib_prefix=no
-@@ -10739,7 +12849,8 @@
+@@ -10741,7 +12851,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15844,7 +15853,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10769,7 +12880,7 @@
+@@ -10771,7 +12882,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15853,7 +15862,7 @@
;;
esac
;;
-@@ -10792,7 +12903,7 @@
+@@ -10794,7 +12905,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15862,7 +15871,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"`
-@@ -10815,20 +12926,17 @@
+@@ -10817,20 +12928,17 @@
dynamic_linker=no
;;
@@ -15894,7 +15903,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10846,14 +12954,19 @@
+@@ -10848,14 +12956,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15916,7 +15925,7 @@
esac
;;
-@@ -10873,9 +12986,9 @@
+@@ -10875,9 +12988,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15928,7 +15937,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10890,7 +13003,7 @@
+@@ -10892,7 +13005,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15937,7 +15946,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10901,7 +13014,7 @@
+@@ -10903,7 +13016,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15946,7 +15955,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10913,6 +13026,18 @@
+@@ -10915,6 +13028,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15965,7 +15974,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10956,29 +13081,26 @@
+@@ -10958,29 +13083,26 @@
;;
# This must be Linux ELF.
@@ -16002,7 +16011,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,
-@@ -10988,6 +13110,18 @@
+@@ -10990,6 +13112,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16021,7 +16030,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10997,7 +13131,7 @@
+@@ -10999,7 +13133,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16030,7 +16039,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11025,8 +13159,13 @@
+@@ -11027,8 +13161,13 @@
openbsd*)
version_type=sunos
@@ -16045,7 +16054,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
-@@ -11046,7 +13185,7 @@
+@@ -11048,7 +13187,7 @@
os2*)
libname_spec='$name'
@@ -16054,7 +16063,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11064,13 +13203,6 @@
+@@ -11066,13 +13205,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16068,7 +16077,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11096,7 +13228,7 @@
+@@ -11098,7 +13230,7 @@
need_version=yes
;;
@@ -16077,7 +16086,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'
-@@ -11129,6 +13261,29 @@
+@@ -11131,6 +13263,29 @@
fi
;;
@@ -16107,7 +16116,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11140,16 +13295,21 @@
+@@ -11142,16 +13297,21 @@
dynamic_linker=no
;;
esac
@@ -16135,7 +16144,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11169,8 +13329,8 @@
+@@ -11171,8 +13331,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16146,7 +16155,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11183,29 +13343,29 @@
+@@ -11185,29 +13345,29 @@
striplib=
old_striplib=
@@ -16186,7 +16195,7 @@
;;
esac
fi
-@@ -11237,8 +13397,8 @@
+@@ -11239,8 +13399,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16197,7 +16206,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11251,40 +13411,52 @@
+@@ -11253,40 +13413,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16262,7 +16271,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11293,14 +13465,15 @@
+@@ -11295,14 +13467,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16282,7 +16291,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11314,8 +13487,8 @@
+@@ -11316,8 +13489,8 @@
;;
*)
@@ -16293,7 +16302,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11342,53 +13515,59 @@
+@@ -11344,53 +13517,59 @@
#undef shl_load
@@ -16372,7 +16381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11397,18 +13576,19 @@
+@@ -11399,18 +13578,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16398,7 +16407,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11421,40 +13601,52 @@
+@@ -11423,40 +13603,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16463,7 +16472,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11463,19 +13655,20 @@
+@@ -11465,19 +13657,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16490,7 +16499,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11502,53 +13695,59 @@
+@@ -11504,53 +13697,59 @@
#undef dlopen
@@ -16569,7 +16578,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11557,18 +13756,19 @@
+@@ -11559,18 +13758,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16595,7 +16604,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11581,40 +13781,52 @@
+@@ -11583,40 +13783,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16660,7 +16669,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11623,19 +13835,20 @@
+@@ -11625,19 +13837,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16687,7 +16696,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11648,40 +13861,52 @@
+@@ -11650,40 +13863,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16752,7 +16761,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11690,19 +13915,20 @@
+@@ -11692,19 +13917,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16779,7 +16788,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11715,40 +13941,52 @@
+@@ -11717,40 +13943,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16844,7 +16853,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11757,14 +13995,15 @@
+@@ -11759,14 +13997,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16864,7 +16873,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11799,13 +14038,13 @@
+@@ -11801,13 +14040,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16881,16 +16890,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11815,7 +14054,7 @@
+@@ -11817,7 +14056,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11818 "configure"
-+#line 14057 "configure"
+-#line 11820 "configure"
++#line 14059 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11872,6 +14111,8 @@
+@@ -11874,6 +14113,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16899,7 +16908,7 @@
exit (status);
}
-@@ -11881,12 +14122,12 @@
+@@ -11883,12 +14124,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16914,7 +16923,7 @@
esac
else :
# compilation failed
-@@ -11897,13 +14138,13 @@
+@@ -11899,13 +14140,13 @@
fi
@@ -16933,16 +16942,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11913,7 +14154,7 @@
+@@ -11915,7 +14156,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11916 "configure"
-+#line 14157 "configure"
+-#line 11918 "configure"
++#line 14159 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11970,6 +14211,8 @@
+@@ -11972,6 +14213,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16951,7 +16960,7 @@
exit (status);
}
-@@ -11979,12 +14222,12 @@
+@@ -11981,12 +14224,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16966,7 +16975,7 @@
esac
else :
# compilation failed
-@@ -11995,8 +14238,8 @@
+@@ -11997,8 +14240,8 @@
fi
@@ -16977,7 +16986,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12017,19 +14260,19 @@
+@@ -12019,19 +14262,19 @@
fi
@@ -17005,7 +17014,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12038,58 +14281,21 @@
+@@ -12040,58 +14283,21 @@
fi
;;
@@ -17071,7 +17080,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12104,7 +14310,8 @@
+@@ -12106,7 +14312,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.
@@ -17081,7 +17090,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 \
-@@ -12218,11 +14425,11 @@
+@@ -12220,11 +14427,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17095,7 +17104,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12252,6 +14459,12 @@
+@@ -12254,6 +14461,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17108,7 +17117,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12263,6 +14476,9 @@
+@@ -12265,6 +14478,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17118,7 +17127,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12282,7 +14498,7 @@
+@@ -12284,7 +14500,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17127,7 +17136,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12313,7 +14529,7 @@
+@@ -12315,7 +14531,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17136,7 +17145,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12328,7 +14544,7 @@
+@@ -12330,7 +14546,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17145,7 +17154,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12555,7 +14771,10 @@
+@@ -12557,7 +14773,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.
@@ -17157,7 +17166,7 @@
fi
-@@ -12568,11 +14787,11 @@
+@@ -12570,11 +14789,11 @@
CC="$lt_save_CC"
@@ -17173,7 +17182,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12590,6 +14809,9 @@
+@@ -12592,6 +14811,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17183,7 +17192,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12620,8 +14842,10 @@
+@@ -12622,8 +14844,10 @@
case $tagname in
CXX)
@@ -17196,7 +17205,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12640,6 +14864,7 @@
+@@ -12642,6 +14866,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17204,7 +17213,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12657,7 +14882,7 @@
+@@ -12659,7 +14884,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17213,7 +17222,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12667,17 +14892,34 @@
+@@ -12669,17 +14894,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17249,7 +17258,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12688,18 +14930,27 @@
+@@ -12690,18 +14932,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17280,7 +17289,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12713,18 +14964,18 @@
+@@ -12715,18 +14966,18 @@
# Set up default GNU C++ configuration
@@ -17305,7 +17314,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12753,11 +15004,11 @@
+@@ -12755,11 +15006,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17321,7 +17330,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12770,7 +15021,7 @@
+@@ -12772,7 +15023,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,
@@ -17330,7 +17339,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'*)
-@@ -12790,21 +15041,21 @@
+@@ -12792,21 +15043,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17359,7 +17368,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12814,8 +15065,8 @@
+@@ -12816,8 +15067,8 @@
;;
esac
fi
@@ -17370,7 +17379,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12823,8 +15074,8 @@
+@@ -12825,8 +15076,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
@@ -17381,7 +17390,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12850,7 +15101,7 @@
+@@ -12852,7 +15103,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.
@@ -17390,7 +17399,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12865,8 +15116,8 @@
+@@ -12867,8 +15118,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17401,7 +17410,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12881,8 +15132,23 @@
+@@ -12883,8 +15134,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17427,7 +17436,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12899,7 +15165,7 @@
+@@ -12901,7 +15167,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17436,7 +17445,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`
-@@ -12918,8 +15184,12 @@
+@@ -12920,8 +15186,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17449,7 +17458,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12928,15 +15198,16 @@
+@@ -12930,15 +15200,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17470,7 +17479,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.
-@@ -12958,24 +15229,36 @@
+@@ -12960,24 +15231,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17515,7 +17524,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12989,20 +15272,21 @@
+@@ -12991,20 +15274,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17541,7 +17550,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13021,24 +15305,36 @@
+@@ -13023,24 +15307,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17586,7 +17595,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13052,8 +15348,10 @@
+@@ -13054,8 +15350,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17598,7 +17607,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13062,16 +15360,26 @@
+@@ -13064,16 +15362,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17630,7 +17639,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13085,12 +15393,12 @@
+@@ -13087,12 +15395,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'
@@ -17645,7 +17654,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
-@@ -13099,70 +15407,81 @@
+@@ -13101,70 +15409,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17779,7 +17788,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13173,14 +15492,14 @@
+@@ -13175,14 +15494,14 @@
;;
esac
;;
@@ -17796,7 +17805,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13197,12 +15516,12 @@
+@@ -13199,12 +15518,12 @@
# location of the library.
case $cc_basename in
@@ -17812,7 +17821,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13211,11 +15530,11 @@
+@@ -13213,11 +15532,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.
@@ -17826,7 +17835,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13225,33 +15544,22 @@
+@@ -13227,33 +15546,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17867,7 +17876,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13262,17 +15570,20 @@
+@@ -13264,17 +15572,20 @@
esac
case $cc_basename in
@@ -17894,7 +17903,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13288,12 +15599,15 @@
+@@ -13290,12 +15601,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17914,7 +17923,7 @@
;;
esac
fi
-@@ -13304,11 +15618,25 @@
+@@ -13306,11 +15620,25 @@
;;
esac
;;
@@ -17942,7 +17951,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13319,9 +15647,9 @@
+@@ -13321,9 +15649,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17954,7 +17963,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13330,16 +15658,16 @@
+@@ -13332,16 +15660,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17975,7 +17984,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13357,20 +15685,44 @@
+@@ -13359,20 +15687,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18026,7 +18035,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13398,7 +15750,7 @@
+@@ -13400,7 +15752,7 @@
;;
mvs*)
case $cc_basename in
@@ -18035,7 +18044,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13408,7 +15760,7 @@
+@@ -13410,7 +15762,7 @@
;;
esac
;;
@@ -18044,7 +18053,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=
-@@ -13419,15 +15771,31 @@
+@@ -13421,15 +15773,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::"'
;;
@@ -18078,7 +18087,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13437,14 +15805,14 @@
+@@ -13439,14 +15807,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18096,7 +18105,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13462,7 +15830,7 @@
+@@ -13464,7 +15832,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18105,7 +18114,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13481,13 +15849,13 @@
+@@ -13483,13 +15851,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18121,7 +18130,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13496,17 +15864,17 @@
+@@ -13498,17 +15866,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18143,7 +18152,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13525,7 +15893,7 @@
+@@ -13527,7 +15895,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18152,7 +18161,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13546,27 +15914,14 @@
+@@ -13548,27 +15916,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18182,7 +18191,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13579,36 +15934,33 @@
+@@ -13581,36 +15936,33 @@
;;
solaris*)
case $cc_basename in
@@ -18231,7 +18240,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13616,9 +15968,9 @@
+@@ -13618,9 +15970,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18243,7 +18252,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13628,9 +15980,9 @@
+@@ -13630,9 +15982,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
@@ -18255,7 +18264,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13639,9 +15991,9 @@
+@@ -13641,9 +15993,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18267,7 +18276,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13654,12 +16006,63 @@
+@@ -13656,12 +16008,63 @@
;;
esac
;;
@@ -18333,7 +18342,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13679,8 +16082,8 @@
+@@ -13681,8 +16084,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18344,7 +18353,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13716,7 +16119,7 @@
+@@ -13718,7 +16121,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.
@@ -18353,7 +18362,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13756,7 +16159,7 @@
+@@ -13758,7 +16161,7 @@
fi
;;
@@ -18362,7 +18371,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13792,6 +16195,29 @@
+@@ -13794,6 +16197,29 @@
$rm -f confest.$objext
@@ -18392,7 +18401,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13800,8 +16226,8 @@
+@@ -13802,8 +16228,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18403,7 +18412,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13839,6 +16265,10 @@
+@@ -13841,6 +16267,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18414,7 +18423,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13847,7 +16277,7 @@
+@@ -13849,7 +16279,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18423,7 +18432,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13872,18 +16302,28 @@
+@@ -13874,18 +16304,28 @@
;;
chorus*)
case $cc_basename in
@@ -18455,7 +18464,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13891,22 +16331,22 @@
+@@ -13893,22 +16333,22 @@
;;
esac
;;
@@ -18484,7 +18493,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13919,9 +16359,13 @@
+@@ -13921,9 +16361,13 @@
;;
esac
;;
@@ -18499,7 +18508,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13930,20 +16374,26 @@
+@@ -13932,20 +16376,26 @@
;;
esac
;;
@@ -18530,7 +18539,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13960,25 +16410,25 @@
+@@ -13962,25 +16412,25 @@
;;
mvs*)
case $cc_basename in
@@ -18561,7 +18570,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13992,24 +16442,15 @@
+@@ -13994,24 +16444,15 @@
;;
psos*)
;;
@@ -18588,7 +18597,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14019,12 +16460,12 @@
+@@ -14021,12 +16462,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18603,7 +18612,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14034,7 +16475,7 @@
+@@ -14036,7 +16477,7 @@
;;
tandem*)
case $cc_basename in
@@ -18612,7 +18621,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14042,7 +16483,14 @@
+@@ -14044,7 +16485,14 @@
;;
esac
;;
@@ -18628,7 +18637,7 @@
;;
vxworks*)
;;
-@@ -14052,16 +16500,16 @@
+@@ -14054,16 +16502,16 @@
esac
fi
@@ -18649,7 +18658,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14075,26 +16523,28 @@
+@@ -14077,26 +16525,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 \
@@ -18657,13 +18666,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:14081: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16529: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14083: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16531: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14085: \$? = $ac_status" >&5
-+ echo "$as_me:16533: \$? = $ac_status" >&5
+- echo "$as_me:14087: \$? = $ac_status" >&5
++ echo "$as_me:16535: \$? = $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
@@ -18685,7 +18694,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14107,7 +16557,7 @@
+@@ -14109,7 +16559,7 @@
fi
fi
@@ -18694,7 +18703,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14117,8 +16567,50 @@
+@@ -14119,8 +16569,50 @@
;;
esac
@@ -18747,7 +18756,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14129,60 +16621,58 @@
+@@ -14131,60 +16623,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18768,13 +18777,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:14148: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16633: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14150: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14152: \$? = $ac_status" >&5
-+ echo "$as_me:16637: \$? = $ac_status" >&5
+- echo "$as_me:14154: \$? = $ac_status" >&5
++ echo "$as_me:16639: \$? = $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
@@ -18826,7 +18835,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14192,8 +16682,8 @@
+@@ -14194,8 +16684,8 @@
need_locks=no
fi
@@ -18837,7 +18846,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14210,22 +16700,20 @@
+@@ -14212,22 +16702,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18866,7 +18875,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14243,8 +16731,8 @@
+@@ -14245,8 +16733,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.
@@ -18877,7 +18886,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14258,6 +16746,7 @@
+@@ -14260,6 +16748,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18885,7 +18894,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14280,20 +16769,20 @@
+@@ -14282,20 +16771,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18911,7 +18920,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14303,7 +16792,20 @@
+@@ -14305,7 +16794,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18933,7 +18942,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14368,7 +16870,7 @@
+@@ -14370,7 +16872,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18942,7 +18951,7 @@
;;
beos*)
-@@ -14377,7 +16879,7 @@
+@@ -14379,7 +16881,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18951,7 +18960,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14393,7 +16895,7 @@
+@@ -14395,7 +16897,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18960,7 +18969,7 @@
need_version=no
need_lib_prefix=no
-@@ -14405,7 +16907,8 @@
+@@ -14407,7 +16909,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18970,7 +18979,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14435,7 +16938,7 @@
+@@ -14437,7 +16940,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18979,7 +18988,7 @@
;;
esac
;;
-@@ -14458,7 +16961,7 @@
+@@ -14460,7 +16963,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18988,7 +18997,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"`
-@@ -14481,20 +16984,17 @@
+@@ -14483,20 +16986,17 @@
dynamic_linker=no
;;
@@ -19020,7 +19029,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14512,14 +17012,19 @@
+@@ -14514,14 +17014,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19042,7 +19051,7 @@
esac
;;
-@@ -14539,9 +17044,9 @@
+@@ -14541,9 +17046,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19054,7 +19063,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14556,7 +17061,7 @@
+@@ -14558,7 +17063,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19063,7 +19072,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14567,7 +17072,7 @@
+@@ -14569,7 +17074,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19072,7 +19081,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14579,6 +17084,18 @@
+@@ -14581,6 +17086,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19091,7 +19100,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14622,29 +17139,26 @@
+@@ -14624,29 +17141,26 @@
;;
# This must be Linux ELF.
@@ -19128,7 +19137,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,
-@@ -14654,6 +17168,18 @@
+@@ -14656,6 +17170,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19147,7 +19156,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14663,7 +17189,7 @@
+@@ -14665,7 +17191,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19156,7 +19165,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14691,8 +17217,13 @@
+@@ -14693,8 +17219,13 @@
openbsd*)
version_type=sunos
@@ -19171,7 +19180,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
-@@ -14712,7 +17243,7 @@
+@@ -14714,7 +17245,7 @@
os2*)
libname_spec='$name'
@@ -19180,7 +19189,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14730,13 +17261,6 @@
+@@ -14732,13 +17263,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19194,7 +19203,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14762,7 +17286,7 @@
+@@ -14764,7 +17288,7 @@
need_version=yes
;;
@@ -19203,7 +19212,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'
-@@ -14795,6 +17319,29 @@
+@@ -14797,6 +17321,29 @@
fi
;;
@@ -19233,7 +19242,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14806,16 +17353,21 @@
+@@ -14808,16 +17355,21 @@
dynamic_linker=no
;;
esac
@@ -19261,7 +19270,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14835,8 +17387,8 @@
+@@ -14837,8 +17389,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19272,7 +19281,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14847,998 +17399,173 @@
+@@ -14849,998 +17401,173 @@
enable_fast_install=needless
fi
@@ -20047,7 +20056,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15484 "configure"
+-#line 15486 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20145,7 +20154,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15582 "configure"
+-#line 15584 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20410,7 +20419,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -15857,7 +17584,7 @@
+@@ -15859,7 +17586,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20419,7 +20428,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15872,7 +17599,7 @@
+@@ -15874,7 +17601,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -20428,7 +20437,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16074,7 +17801,10 @@
+@@ -16076,7 +17803,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.
@@ -20440,7 +20449,7 @@
fi
-@@ -16146,29 +17876,55 @@
+@@ -16148,29 +17878,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20504,7 +20513,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16176,21 +17932,21 @@
+@@ -16178,21 +17934,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20536,7 +20545,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16199,8 +17955,8 @@
+@@ -16201,8 +17957,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20547,7 +20556,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16238,6 +17994,11 @@
+@@ -16240,6 +17996,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20559,7 +20568,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16254,7 +18015,7 @@
+@@ -16256,7 +18017,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20568,7 +20577,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16280,6 +18041,16 @@
+@@ -16282,6 +18043,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20585,7 +20594,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16291,7 +18062,7 @@
+@@ -16293,7 +18064,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.
@@ -20594,7 +20603,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16314,14 +18085,21 @@
+@@ -16316,14 +18087,21 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20619,7 +20628,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
-@@ -16335,15 +18113,15 @@
+@@ -16337,15 +18115,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20641,7 +20650,7 @@
;;
sunos4*)
-@@ -16352,7 +18130,7 @@
+@@ -16354,7 +18132,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20650,7 +20659,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16365,6 +18143,17 @@
+@@ -16367,6 +18145,17 @@
fi
;;
@@ -20668,7 +20677,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16376,16 +18165,16 @@
+@@ -16378,16 +18167,16 @@
esac
fi
@@ -20689,7 +20698,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16399,26 +18188,28 @@
+@@ -16401,26 +18190,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 \
@@ -20697,13 +20706,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:16405: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18194: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16407: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16409: \$? = $ac_status" >&5
-+ echo "$as_me:18198: \$? = $ac_status" >&5
+- echo "$as_me:16411: \$? = $ac_status" >&5
++ echo "$as_me:18200: \$? = $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
@@ -20725,7 +20734,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16431,7 +18222,7 @@
+@@ -16433,7 +18224,7 @@
fi
fi
@@ -20734,7 +20743,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16441,8 +18232,50 @@
+@@ -16443,8 +18234,50 @@
;;
esac
@@ -20787,7 +20796,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16453,60 +18286,58 @@
+@@ -16455,60 +18288,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20808,13 +20817,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:16472: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18298: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16474: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18300: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16476: \$? = $ac_status" >&5
-+ echo "$as_me:18302: \$? = $ac_status" >&5
+- echo "$as_me:16478: \$? = $ac_status" >&5
++ echo "$as_me:18304: \$? = $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
@@ -20866,7 +20875,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16516,8 +18347,8 @@
+@@ -16518,8 +18349,8 @@
need_locks=no
fi
@@ -20877,7 +20886,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16555,6 +18386,16 @@
+@@ -16557,6 +18388,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20894,7 +20903,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16565,6 +18406,10 @@
+@@ -16567,6 +18408,10 @@
with_gnu_ld=no
fi
;;
@@ -20905,7 +20914,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16575,6 +18420,27 @@
+@@ -16577,6 +18422,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20933,7 +20942,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16612,7 +18478,7 @@
+@@ -16614,7 +18480,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20942,7 +20951,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16622,13 +18488,13 @@
+@@ -16624,13 +18490,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'
@@ -20959,7 +20968,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
-@@ -16637,23 +18503,70 @@
+@@ -16639,23 +18505,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21036,7 +21045,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16667,13 +18580,40 @@
+@@ -16669,13 +18582,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21079,7 +21088,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16683,24 +18623,19 @@
+@@ -16685,24 +18625,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21111,7 +21120,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16712,7 +18647,7 @@
+@@ -16714,7 +18649,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21120,7 +21129,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16734,9 +18669,21 @@
+@@ -16736,9 +18671,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
@@ -21144,7 +21153,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16753,7 +18700,7 @@
+@@ -16755,7 +18702,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21153,7 +21162,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`
-@@ -16772,8 +18719,12 @@
+@@ -16774,8 +18721,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21166,7 +21175,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16781,45 +18732,58 @@
+@@ -16783,45 +18734,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21240,7 +21249,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16833,19 +18797,20 @@
+@@ -16835,19 +18799,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21266,7 +21275,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16854,24 +18819,36 @@
+@@ -16856,24 +18821,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21311,7 +21320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16885,8 +18862,10 @@
+@@ -16887,8 +18864,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21323,7 +21332,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16895,13 +18874,11 @@
+@@ -16897,13 +18876,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21340,7 +21349,7 @@
fi
fi
;;
-@@ -16914,7 +18891,7 @@
+@@ -16916,7 +18893,7 @@
ld_shlibs_F77=no
;;
@@ -21349,7 +21358,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16924,68 +18901,68 @@
+@@ -16926,68 +18903,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21462,7 +21471,7 @@
fi
;;
-@@ -17019,8 +18996,8 @@
+@@ -17021,8 +18998,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21473,7 +21482,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17028,7 +19005,7 @@
+@@ -17030,7 +19007,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21482,7 +21491,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
-@@ -17042,47 +19019,62 @@
+@@ -17044,47 +19021,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21569,7 +21578,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17096,7 +19088,7 @@
+@@ -17098,7 +19090,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21578,7 +21587,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'
-@@ -17106,7 +19098,7 @@
+@@ -17108,7 +19100,7 @@
link_all_deplibs_F77=yes
;;
@@ -21587,7 +21596,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
-@@ -17129,7 +19121,8 @@
+@@ -17131,7 +19123,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
@@ -21597,7 +21606,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17139,7 +19132,7 @@
+@@ -17141,7 +19134,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21606,7 +21615,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17150,14 +19143,14 @@
+@@ -17152,14 +19145,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21623,7 +21632,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'
-@@ -17169,13 +19162,13 @@
+@@ -17171,13 +19164,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21639,7 +21648,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17183,21 +19176,15 @@
+@@ -17185,21 +19178,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21665,7 +21674,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'
-@@ -17206,8 +19193,18 @@
+@@ -17208,8 +19195,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21686,7 +21695,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17216,7 +19213,7 @@
+@@ -17218,7 +19215,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.
@@ -21695,7 +21704,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17264,36 +19261,45 @@
+@@ -17266,36 +19263,45 @@
fi
;;
@@ -21762,7 +21771,7 @@
;;
uts4*)
-@@ -17308,15 +19314,10 @@
+@@ -17310,15 +19316,10 @@
esac
fi
@@ -21780,7 +21789,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17334,8 +19335,8 @@
+@@ -17336,8 +19337,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.
@@ -21791,7 +21800,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17349,6 +19350,7 @@
+@@ -17351,6 +19352,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21799,7 +21808,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17371,20 +19373,20 @@
+@@ -17373,20 +19375,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21825,7 +21834,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17394,7 +19396,20 @@
+@@ -17396,7 +19398,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21847,7 +21856,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17459,7 +19474,7 @@
+@@ -17461,7 +19476,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21856,7 +21865,7 @@
;;
beos*)
-@@ -17468,7 +19483,7 @@
+@@ -17470,7 +19485,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21865,7 +21874,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17484,7 +19499,7 @@
+@@ -17486,7 +19501,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21874,7 +21883,7 @@
need_version=no
need_lib_prefix=no
-@@ -17496,7 +19511,8 @@
+@@ -17498,7 +19513,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21884,7 +21893,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17526,7 +19542,7 @@
+@@ -17528,7 +19544,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21893,7 +21902,7 @@
;;
esac
;;
-@@ -17549,7 +19565,7 @@
+@@ -17551,7 +19567,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21902,7 +21911,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"`
-@@ -17572,20 +19588,17 @@
+@@ -17574,20 +19590,17 @@
dynamic_linker=no
;;
@@ -21934,7 +21943,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17603,14 +19616,19 @@
+@@ -17605,14 +19618,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21956,7 +21965,7 @@
esac
;;
-@@ -17630,9 +19648,9 @@
+@@ -17632,9 +19650,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21968,7 +21977,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17647,7 +19665,7 @@
+@@ -17649,7 +19667,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21977,7 +21986,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17658,7 +19676,7 @@
+@@ -17660,7 +19678,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21986,7 +21995,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17670,6 +19688,18 @@
+@@ -17672,6 +19690,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22005,7 +22014,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17713,29 +19743,26 @@
+@@ -17715,29 +19745,26 @@
;;
# This must be Linux ELF.
@@ -22042,7 +22051,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,
-@@ -17745,6 +19772,18 @@
+@@ -17747,6 +19774,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22061,7 +22070,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17754,7 +19793,7 @@
+@@ -17756,7 +19795,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22070,7 +22079,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17782,8 +19821,13 @@
+@@ -17784,8 +19823,13 @@
openbsd*)
version_type=sunos
@@ -22085,7 +22094,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
-@@ -17803,7 +19847,7 @@
+@@ -17805,7 +19849,7 @@
os2*)
libname_spec='$name'
@@ -22094,7 +22103,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17821,13 +19865,6 @@
+@@ -17823,13 +19867,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22108,7 +22117,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17853,7 +19890,7 @@
+@@ -17855,7 +19892,7 @@
need_version=yes
;;
@@ -22117,7 +22126,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'
-@@ -17886,6 +19923,29 @@
+@@ -17888,6 +19925,29 @@
fi
;;
@@ -22147,7 +22156,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17897,16 +19957,21 @@
+@@ -17899,16 +19959,21 @@
dynamic_linker=no
;;
esac
@@ -22175,7 +22184,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17926,8 +19991,8 @@
+@@ -17928,8 +19993,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22186,7 +22195,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17938,36 +20003,6 @@
+@@ -17940,36 +20005,6 @@
enable_fast_install=needless
fi
@@ -22223,7 +22232,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17982,7 +20017,8 @@
+@@ -17984,7 +20019,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.
@@ -22233,7 +22242,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 \
-@@ -18082,6 +20118,12 @@
+@@ -18084,6 +20120,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22246,7 +22255,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18093,6 +20135,9 @@
+@@ -18095,6 +20137,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22256,7 +22265,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18112,7 +20157,7 @@
+@@ -18114,7 +20159,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22265,7 +22274,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18143,7 +20188,7 @@
+@@ -18145,7 +20190,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22274,7 +22283,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18158,7 +20203,7 @@
+@@ -18160,7 +20205,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22283,7 +22292,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18360,7 +20405,10 @@
+@@ -18362,7 +20407,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.
@@ -22295,7 +22304,7 @@
fi
-@@ -18381,7 +20429,6 @@
+@@ -18383,7 +20431,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22303,7 +22312,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18393,26 +20440,55 @@
+@@ -18395,26 +20442,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22360,7 +22369,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
-@@ -18424,8 +20500,8 @@
+@@ -18426,8 +20502,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22371,7 +22380,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18439,26 +20515,28 @@
+@@ -18441,26 +20517,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 \
@@ -22379,13 +22388,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:18445: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20521: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18447: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20523: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18449: \$? = $ac_status" >&5
-+ echo "$as_me:20525: \$? = $ac_status" >&5
+- echo "$as_me:18451: \$? = $ac_status" >&5
++ echo "$as_me:20527: \$? = $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
@@ -22407,7 +22416,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18472,8 +20550,8 @@
+@@ -18474,8 +20552,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22418,7 +22427,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18511,6 +20589,11 @@
+@@ -18513,6 +20591,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22430,7 +22439,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18527,7 +20610,7 @@
+@@ -18529,7 +20612,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22439,7 +22448,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18553,6 +20636,16 @@
+@@ -18555,6 +20638,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22456,7 +22465,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18564,7 +20657,7 @@
+@@ -18566,7 +20659,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.
@@ -22465,7 +22474,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18587,13 +20680,20 @@
+@@ -18589,13 +20682,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22488,7 +22497,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18608,15 +20708,15 @@
+@@ -18610,15 +20710,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22510,7 +22519,7 @@
;;
sunos4*)
-@@ -18625,7 +20725,7 @@
+@@ -18627,7 +20727,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22519,7 +22528,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18638,6 +20738,17 @@
+@@ -18640,6 +20740,17 @@
fi
;;
@@ -22537,7 +22546,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18649,16 +20760,16 @@
+@@ -18651,16 +20762,16 @@
esac
fi
@@ -22558,7 +22567,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18672,26 +20783,28 @@
+@@ -18674,26 +20785,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 \
@@ -22566,13 +22575,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:18678: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20789: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18680: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20791: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18682: \$? = $ac_status" >&5
-+ echo "$as_me:20793: \$? = $ac_status" >&5
+- echo "$as_me:18684: \$? = $ac_status" >&5
++ echo "$as_me:20795: \$? = $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
@@ -22594,7 +22603,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18704,7 +20817,7 @@
+@@ -18706,7 +20819,7 @@
fi
fi
@@ -22603,7 +22612,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18714,8 +20827,50 @@
+@@ -18716,8 +20829,50 @@
;;
esac
@@ -22656,7 +22665,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18726,60 +20881,58 @@
+@@ -18728,60 +20883,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22677,13 +22686,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:18745: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20893: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18747: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20895: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18749: \$? = $ac_status" >&5
-+ echo "$as_me:20897: \$? = $ac_status" >&5
+- echo "$as_me:18751: \$? = $ac_status" >&5
++ echo "$as_me:20899: \$? = $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
@@ -22735,7 +22744,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18789,8 +20942,8 @@
+@@ -18791,8 +20944,8 @@
need_locks=no
fi
@@ -22746,7 +22755,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18828,6 +20981,16 @@
+@@ -18830,6 +20983,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22763,7 +22772,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18838,6 +21001,10 @@
+@@ -18840,6 +21003,10 @@
with_gnu_ld=no
fi
;;
@@ -22774,7 +22783,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18848,6 +21015,27 @@
+@@ -18850,6 +21017,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22802,7 +22811,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18885,7 +21073,7 @@
+@@ -18887,7 +21075,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22811,7 +22820,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18895,13 +21083,13 @@
+@@ -18897,13 +21085,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'
@@ -22828,7 +22837,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
-@@ -18910,23 +21098,70 @@
+@@ -18912,23 +21100,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22905,7 +22914,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18940,13 +21175,40 @@
+@@ -18942,13 +21177,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22948,7 +22957,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18956,24 +21218,19 @@
+@@ -18958,24 +21220,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22980,7 +22989,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18985,7 +21242,7 @@
+@@ -18987,7 +21244,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22989,7 +22998,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19007,9 +21264,21 @@
+@@ -19009,9 +21266,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
@@ -23013,7 +23022,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19026,7 +21295,7 @@
+@@ -19028,7 +21297,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -23022,7 +23031,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`
-@@ -19045,8 +21314,12 @@
+@@ -19047,8 +21316,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23035,7 +23044,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19054,22 +21327,23 @@
+@@ -19056,22 +21329,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23066,7 +23075,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19085,24 +21359,36 @@
+@@ -19087,24 +21361,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23111,7 +23120,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19116,19 +21402,20 @@
+@@ -19118,19 +21404,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23137,7 +23146,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19147,24 +21434,36 @@
+@@ -19149,24 +21436,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23182,7 +23191,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19178,8 +21477,10 @@
+@@ -19180,8 +21479,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23194,7 +23203,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19188,13 +21489,11 @@
+@@ -19190,13 +21491,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23211,7 +23220,7 @@
fi
fi
;;
-@@ -19207,7 +21506,7 @@
+@@ -19209,7 +21508,7 @@
ld_shlibs_GCJ=no
;;
@@ -23220,7 +23229,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19217,68 +21516,68 @@
+@@ -19219,68 +21518,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23333,7 +23342,7 @@
fi
;;
-@@ -19312,8 +21611,8 @@
+@@ -19314,8 +21613,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23344,7 +23353,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19321,7 +21620,7 @@
+@@ -19323,7 +21622,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23353,7 +23362,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
-@@ -19335,47 +21634,62 @@
+@@ -19337,47 +21636,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23440,7 +23449,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19389,7 +21703,7 @@
+@@ -19391,7 +21705,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23449,7 +23458,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'
-@@ -19399,7 +21713,7 @@
+@@ -19401,7 +21715,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23458,7 +23467,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
-@@ -19422,7 +21736,8 @@
+@@ -19424,7 +21738,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
@@ -23468,7 +23477,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19432,7 +21747,7 @@
+@@ -19434,7 +21749,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23477,7 +23486,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19443,14 +21758,14 @@
+@@ -19445,14 +21760,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23494,7 +23503,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'
-@@ -19462,13 +21777,13 @@
+@@ -19464,13 +21779,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23510,7 +23519,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19476,21 +21791,15 @@
+@@ -19478,21 +21793,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23536,7 +23545,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'
-@@ -19499,8 +21808,18 @@
+@@ -19501,8 +21810,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23557,7 +23566,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19509,7 +21828,7 @@
+@@ -19511,7 +21830,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.
@@ -23566,7 +23575,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19557,37 +21876,46 @@
+@@ -19559,37 +21878,46 @@
fi
;;
@@ -23635,7 +23644,7 @@
uts4*)
archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-@@ -19601,15 +21929,10 @@
+@@ -19603,15 +21931,10 @@
esac
fi
@@ -23653,7 +23662,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19627,8 +21950,8 @@
+@@ -19629,8 +21952,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.
@@ -23664,7 +23673,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19642,6 +21965,7 @@
+@@ -19644,6 +21967,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23672,7 +23681,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19664,20 +21988,20 @@
+@@ -19666,20 +21990,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23698,7 +23707,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19687,7 +22011,20 @@
+@@ -19689,7 +22013,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23720,7 +23729,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19752,7 +22089,7 @@
+@@ -19754,7 +22091,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23729,7 +23738,7 @@
;;
beos*)
-@@ -19761,7 +22098,7 @@
+@@ -19763,7 +22100,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23738,7 +23747,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19777,7 +22114,7 @@
+@@ -19779,7 +22116,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23747,7 +23756,7 @@
need_version=no
need_lib_prefix=no
-@@ -19789,7 +22126,8 @@
+@@ -19791,7 +22128,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23757,7 +23766,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19819,7 +22157,7 @@
+@@ -19821,7 +22159,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23766,7 +23775,7 @@
;;
esac
;;
-@@ -19842,7 +22180,7 @@
+@@ -19844,7 +22182,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23775,7 +23784,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"`
-@@ -19865,20 +22203,17 @@
+@@ -19867,20 +22205,17 @@
dynamic_linker=no
;;
@@ -23807,7 +23816,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19896,14 +22231,19 @@
+@@ -19898,14 +22233,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23829,7 +23838,7 @@
esac
;;
-@@ -19923,9 +22263,9 @@
+@@ -19925,9 +22265,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23841,13 +23850,10 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19933,1137 +22273,349 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-- else
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+@@ -19938,1134 +22278,346 @@
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
@@ -24730,9 +24736,6 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
@@ -24949,7 +24952,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20868 "configure"
+-#line 20870 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -25137,7 +25140,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20966 "configure"
+-#line 20968 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -25291,7 +25294,7 @@
fi
-@@ -21080,7 +22632,8 @@
+@@ -21082,7 +22634,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.
@@ -25301,7 +25304,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 \
-@@ -21180,6 +22733,12 @@
+@@ -21182,6 +22735,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25314,7 +25317,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21191,6 +22750,9 @@
+@@ -21193,6 +22752,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25324,7 +25327,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21210,7 +22772,7 @@
+@@ -21212,7 +22774,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25333,7 +25336,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21241,7 +22803,7 @@
+@@ -21243,7 +22805,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25342,7 +25345,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21256,7 +22818,7 @@
+@@ -21258,7 +22820,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -25351,7 +25354,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21458,7 +23020,10 @@
+@@ -21460,7 +23022,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.
@@ -25363,7 +25366,7 @@
fi
-@@ -21478,7 +23043,6 @@
+@@ -21480,7 +23045,6 @@
RC)
@@ -25371,7 +25374,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21497,15 +23061,42 @@
+@@ -21499,15 +23063,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -25414,7 +25417,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21521,7 +23112,8 @@
+@@ -21523,7 +23114,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.
@@ -25424,7 +25427,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 \
-@@ -21621,6 +23213,12 @@
+@@ -21623,6 +23215,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25437,7 +25440,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21632,6 +23230,9 @@
+@@ -21634,6 +23232,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25447,7 +25450,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21651,7 +23252,7 @@
+@@ -21653,7 +23254,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25456,7 +25459,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21682,7 +23283,7 @@
+@@ -21684,7 +23285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25465,7 +25468,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21697,7 +23298,7 @@
+@@ -21699,7 +23300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25474,7 +25477,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21899,7 +23500,10 @@
+@@ -21901,7 +23502,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.
@@ -25486,7 +25489,7 @@
fi
-@@ -21946,7 +23550,7 @@
+@@ -21948,7 +23552,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25495,7 +25498,7 @@
# Prevent multiple expansion
-@@ -22001,8 +23605,8 @@
+@@ -22003,8 +23607,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25506,7 +25509,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22028,17 +23632,17 @@
+@@ -22030,17 +23634,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -25530,7 +25533,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22053,32 +23657,33 @@
+@@ -22055,32 +23659,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25572,7 +25575,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22087,8 +23692,8 @@
+@@ -22089,8 +23694,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -25583,7 +25586,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22114,11 +23719,11 @@
+@@ -22116,11 +23721,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -25599,7 +25602,7 @@
fi
-@@ -22126,8 +23731,8 @@
+@@ -22128,8 +23733,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25610,7 +25613,7 @@
XGETTEXT=":"
fi
fi
-@@ -22137,8 +23742,7 @@
+@@ -22139,8 +23744,7 @@
@@ -25620,7 +25623,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22150,8 +23754,8 @@
+@@ -22152,8 +23756,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25631,7 +25634,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22179,24 +23783,36 @@
+@@ -22181,24 +23785,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25676,7 +25679,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22205,15 +23821,16 @@
+@@ -22207,15 +23823,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25697,7 +25700,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22242,15 +23859,14 @@
+@@ -22244,15 +23861,14 @@
@@ -25716,7 +25719,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22262,9 +23878,6 @@
+@@ -22264,9 +23880,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25726,7 +25729,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22290,24 +23903,36 @@
+@@ -22292,24 +23905,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25771,7 +25774,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22316,9 +23941,10 @@
+@@ -22318,9 +23943,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25784,7 +25787,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22331,11 +23957,11 @@
+@@ -22333,11 +23959,11 @@
fi
@@ -25800,7 +25803,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22356,8 +23982,7 @@
+@@ -22358,8 +23984,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -25810,7 +25813,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22395,24 +24020,36 @@
+@@ -22397,24 +24022,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25855,7 +25858,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22422,10 +24059,11 @@
+@@ -22424,10 +24061,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25869,7 +25872,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22438,8 +24076,8 @@
+@@ -22440,8 +24078,8 @@
fi
@@ -25880,7 +25883,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22463,15 +24101,14 @@
+@@ -22465,15 +24103,14 @@
@@ -25899,7 +25902,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22483,9 +24120,6 @@
+@@ -22485,9 +24122,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25909,7 +25912,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22510,24 +24144,36 @@
+@@ -22512,24 +24146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25954,7 +25957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22536,9 +24182,10 @@
+@@ -22538,9 +24184,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25967,7 +25970,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22551,11 +24198,11 @@
+@@ -22553,11 +24200,11 @@
fi
@@ -25983,7 +25986,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22576,8 +24223,7 @@
+@@ -22578,8 +24225,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -25993,7 +25996,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22614,24 +24260,36 @@
+@@ -22616,24 +24262,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26038,7 +26041,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22641,10 +24299,11 @@
+@@ -22643,10 +24301,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26052,7 +26055,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22657,8 +24316,8 @@
+@@ -22659,8 +24318,8 @@
fi
@@ -26063,7 +26066,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22681,8 +24340,8 @@
+@@ -22683,8 +24342,8 @@
@@ -26074,7 +26077,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22699,30 +24358,42 @@
+@@ -22701,30 +24360,42 @@
int
main ()
{
@@ -26126,7 +26129,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22731,20 +24402,21 @@
+@@ -22733,20 +24404,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26154,7 +26157,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22761,30 +24433,42 @@
+@@ -22763,30 +24435,42 @@
int
main ()
{
@@ -26206,7 +26209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22793,21 +24477,22 @@
+@@ -22795,21 +24479,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26235,7 +26238,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22820,40 +24505,52 @@
+@@ -22822,40 +24507,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26300,7 +26303,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22862,19 +24559,20 @@
+@@ -22864,19 +24561,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26327,7 +26330,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22887,40 +24585,52 @@
+@@ -22889,40 +24587,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26392,7 +26395,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22929,14 +24639,15 @@
+@@ -22931,14 +24641,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26412,7 +26415,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22962,13 +24673,13 @@
+@@ -22964,13 +24675,13 @@
fi
@@ -26429,7 +26432,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22997,24 +24708,36 @@
+@@ -22999,24 +24710,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26474,7 +26477,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23026,8 +24749,10 @@
+@@ -23028,8 +24751,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26486,7 +26489,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23037,17 +24762,17 @@
+@@ -23039,17 +24764,17 @@
fi
@@ -26509,7 +26512,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23076,24 +24801,36 @@
+@@ -23078,24 +24803,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26554,7 +26557,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23105,8 +24842,10 @@
+@@ -23107,8 +24844,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26566,7 +26569,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23117,8 +24856,8 @@
+@@ -23119,8 +24858,8 @@
fi
@@ -26577,7 +26580,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23131,8 +24870,8 @@
+@@ -23133,8 +24872,8 @@
_ACEOF
@@ -26588,7 +26591,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23145,40 +24884,52 @@
+@@ -23147,40 +24886,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26653,7 +26656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23187,21 +24938,22 @@
+@@ -23189,21 +24940,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26682,7 +26685,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23214,40 +24966,52 @@
+@@ -23216,40 +24968,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26747,7 +26750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23256,21 +25020,22 @@
+@@ -23258,21 +25022,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26776,7 +26779,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23297,53 +25062,59 @@
+@@ -23299,53 +25064,59 @@
#undef inet_ntoa
@@ -26855,7 +26858,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23352,17 +25123,18 @@
+@@ -23354,17 +25125,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26880,7 +26883,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23375,40 +25147,52 @@
+@@ -23377,40 +25149,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26945,7 +26948,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23417,21 +25201,22 @@
+@@ -23419,21 +25203,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26974,7 +26977,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23458,53 +25243,59 @@
+@@ -23460,53 +25245,59 @@
#undef connect
@@ -27053,7 +27056,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23513,17 +25304,18 @@
+@@ -23515,17 +25306,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27078,7 +27081,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23536,40 +25328,52 @@
+@@ -23538,40 +25330,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27143,7 +27146,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23578,22 +25382,23 @@
+@@ -23580,22 +25384,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27173,7 +27176,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23620,53 +25425,59 @@
+@@ -23622,53 +25427,59 @@
#undef remove
@@ -27252,7 +27255,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23675,17 +25486,18 @@
+@@ -23677,17 +25488,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27277,7 +27280,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23698,40 +25510,52 @@
+@@ -23700,40 +25512,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27342,7 +27345,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23740,14 +25564,15 @@
+@@ -23742,14 +25566,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27362,7 +27365,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23755,8 +25580,8 @@
+@@ -23757,8 +25582,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27373,7 +27376,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23783,53 +25608,59 @@
+@@ -23785,53 +25610,59 @@
#undef shmat
@@ -27452,7 +27455,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23838,18 +25669,19 @@
+@@ -23840,18 +25671,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27478,7 +27481,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23862,40 +25694,52 @@
+@@ -23864,40 +25696,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27543,7 +27546,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23904,14 +25748,15 @@
+@@ -23906,14 +25750,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27563,7 +27566,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23925,18 +25770,19 @@
+@@ -23927,18 +25772,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27591,7 +27594,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23947,24 +25793,36 @@
+@@ -23949,24 +25795,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27636,7 +27639,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23973,15 +25831,16 @@
+@@ -23975,15 +25833,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27659,7 +27662,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23990,8 +25849,13 @@
+@@ -23992,8 +25851,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27675,7 +27678,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24015,9 +25879,10 @@
+@@ -24017,9 +25881,10 @@
ac_header_preproc=no
fi
@@ -27688,7 +27691,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24041,25 +25906,19 @@
+@@ -24043,25 +25908,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;}
@@ -27721,7 +27724,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24077,18 +25936,19 @@
+@@ -24079,18 +25938,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27749,7 +27752,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24099,24 +25959,36 @@
+@@ -24101,24 +25961,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27794,7 +27797,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24125,15 +25997,16 @@
+@@ -24127,15 +25999,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27817,7 +27820,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24142,8 +26015,13 @@
+@@ -24144,8 +26017,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27833,7 +27836,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24167,9 +26045,10 @@
+@@ -24169,9 +26047,10 @@
ac_header_preproc=no
fi
@@ -27846,7 +27849,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24193,25 +26072,19 @@
+@@ -24195,25 +26074,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;}
@@ -27879,7 +27882,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24225,8 +26098,8 @@
+@@ -24227,8 +26100,8 @@
# darwin requires a poll emulation library
@@ -27890,7 +27893,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24239,40 +26112,52 @@
+@@ -24241,40 +26114,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27955,7 +27958,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24281,14 +26166,15 @@
+@@ -24283,14 +26168,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27975,7 +27978,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24299,18 +26185,19 @@
+@@ -24301,18 +26187,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28003,7 +28006,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24321,24 +26208,36 @@
+@@ -24323,24 +26210,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28048,7 +28051,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24347,15 +26246,16 @@
+@@ -24349,15 +26248,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28071,7 +28074,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24364,8 +26264,13 @@
+@@ -24366,8 +26266,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28087,7 +28090,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24389,9 +26294,10 @@
+@@ -24391,9 +26296,10 @@
ac_header_preproc=no
fi
@@ -28100,7 +28103,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24415,25 +26321,19 @@
+@@ -24417,25 +26323,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;}
@@ -28133,7 +28136,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24448,17 +26348,17 @@
+@@ -24450,17 +26350,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28157,7 +28160,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24469,24 +26369,36 @@
+@@ -24471,24 +26371,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -28202,7 +28205,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24495,15 +26407,16 @@
+@@ -24497,15 +26409,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28225,7 +28228,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24512,8 +26425,13 @@
+@@ -24514,8 +26427,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -28241,7 +28244,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24537,9 +26455,10 @@
+@@ -24539,9 +26457,10 @@
ac_header_preproc=no
fi
@@ -28254,7 +28257,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24563,25 +26482,18 @@
+@@ -24565,25 +26484,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;}
@@ -28285,7 +28288,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24598,8 +26510,8 @@
+@@ -24600,8 +26512,8 @@
@@ -28296,7 +28299,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24625,31 +26537,43 @@
+@@ -24627,31 +26539,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28350,7 +28353,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24660,25 +26584,25 @@
+@@ -24662,25 +26586,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28383,7 +28386,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24690,9 +26614,6 @@
+@@ -24692,9 +26616,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28393,7 +28396,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24718,24 +26639,36 @@
+@@ -24720,24 +26641,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28438,7 +28441,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24744,9 +26677,10 @@
+@@ -24746,9 +26679,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28451,7 +28454,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24759,11 +26693,11 @@
+@@ -24761,11 +26695,11 @@
fi
@@ -28467,7 +28470,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24784,8 +26718,7 @@
+@@ -24786,8 +26720,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -28477,7 +28480,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24823,24 +26756,36 @@
+@@ -24825,24 +26758,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28522,7 +28525,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24850,10 +26795,11 @@
+@@ -24852,10 +26797,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28536,7 +28539,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24866,8 +26812,8 @@
+@@ -24868,8 +26814,8 @@
fi
@@ -28547,7 +28550,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24894,8 +26840,8 @@
+@@ -24896,8 +26842,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -28558,7 +28561,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24908,40 +26854,52 @@
+@@ -24910,40 +26856,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28623,7 +28626,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24950,27 +26908,28 @@
+@@ -24952,27 +26910,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28662,7 +28665,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24983,40 +26942,52 @@
+@@ -24985,40 +26944,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28727,7 +28730,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25025,22 +26996,23 @@
+@@ -25027,22 +26998,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28757,7 +28760,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25051,36 +27023,49 @@
+@@ -25053,36 +27025,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28817,7 +28820,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25089,23 +27074,23 @@
+@@ -25091,23 +27076,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28852,7 +28855,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -25115,10 +27100,12 @@
+@@ -25117,10 +27102,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28866,7 +28869,7 @@
test_array [0] = 0
;
-@@ -25126,24 +27113,36 @@
+@@ -25128,24 +27115,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28911,7 +28914,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25156,10 +27155,12 @@
+@@ -25158,10 +27157,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28925,7 +28928,7 @@
test_array [0] = 0
;
-@@ -25167,24 +27168,36 @@
+@@ -25169,24 +27170,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28970,7 +28973,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25193,30 +27206,33 @@
+@@ -25195,30 +27208,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29013,7 +29016,7 @@
test_array [0] = 0
;
-@@ -25224,24 +27240,36 @@
+@@ -25226,24 +27242,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29058,7 +29061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25254,10 +27282,12 @@
+@@ -25256,10 +27284,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29072,7 +29075,7 @@
test_array [0] = 0
;
-@@ -25265,24 +27295,36 @@
+@@ -25267,24 +27297,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29117,7 +29120,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25291,24 +27333,27 @@
+@@ -25293,24 +27335,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29155,7 +29158,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25319,10 +27364,12 @@
+@@ -25321,10 +27366,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29169,7 +29172,7 @@
test_array [0] = 0
;
-@@ -25330,24 +27377,36 @@
+@@ -25332,24 +27379,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29214,7 +29217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25356,26 +27415,24 @@
+@@ -25358,26 +27417,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29251,7 +29254,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25383,8 +27440,10 @@
+@@ -25385,8 +27442,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29264,7 +29267,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25393,35 +27452,44 @@
+@@ -25395,35 +27454,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29322,7 +29325,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25432,28 +27500,31 @@
+@@ -25434,28 +27502,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29346,8 +29349,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_int=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
@@ -29366,7 +29369,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25464,36 +27535,49 @@
+@@ -25466,36 +27537,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29426,7 +29429,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25502,23 +27586,23 @@
+@@ -25504,23 +27588,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29461,7 +29464,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -25528,10 +27612,12 @@
+@@ -25530,10 +27614,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29475,7 +29478,7 @@
test_array [0] = 0
;
-@@ -25539,24 +27625,36 @@
+@@ -25541,24 +27627,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29520,7 +29523,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25569,10 +27667,12 @@
+@@ -25571,10 +27669,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29534,7 +29537,7 @@
test_array [0] = 0
;
-@@ -25580,24 +27680,36 @@
+@@ -25582,24 +27682,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29579,7 +29582,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25606,30 +27718,33 @@
+@@ -25608,30 +27720,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29622,7 +29625,7 @@
test_array [0] = 0
;
-@@ -25637,24 +27752,36 @@
+@@ -25639,24 +27754,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29667,7 +29670,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25667,10 +27794,12 @@
+@@ -25669,10 +27796,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29681,7 +29684,7 @@
test_array [0] = 0
;
-@@ -25678,24 +27807,36 @@
+@@ -25680,24 +27809,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29726,7 +29729,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25704,24 +27845,27 @@
+@@ -25706,24 +27847,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29764,7 +29767,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25732,10 +27876,12 @@
+@@ -25734,10 +27878,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29778,7 +29781,7 @@
test_array [0] = 0
;
-@@ -25743,24 +27889,36 @@
+@@ -25745,24 +27891,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29823,7 +29826,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25769,26 +27927,24 @@
+@@ -25771,26 +27929,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29860,7 +29863,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25796,8 +27952,10 @@
+@@ -25798,8 +27954,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29873,7 +29876,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25806,35 +27964,44 @@
+@@ -25808,35 +27966,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29931,7 +29934,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25845,28 +28012,31 @@
+@@ -25847,28 +28014,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29955,8 +29958,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_short=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -29975,7 +29978,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25877,36 +28047,49 @@
+@@ -25879,36 +28049,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30035,7 +30038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25915,23 +28098,23 @@
+@@ -25917,23 +28100,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30070,7 +30073,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -25941,10 +28124,12 @@
+@@ -25943,10 +28126,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30084,7 +30087,7 @@
test_array [0] = 0
;
-@@ -25952,24 +28137,36 @@
+@@ -25954,24 +28139,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30129,7 +30132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25982,10 +28179,12 @@
+@@ -25984,10 +28181,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30143,7 +30146,7 @@
test_array [0] = 0
;
-@@ -25993,24 +28192,36 @@
+@@ -25995,24 +28194,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30188,7 +30191,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26019,30 +28230,33 @@
+@@ -26021,30 +28232,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30231,7 +30234,7 @@
test_array [0] = 0
;
-@@ -26050,24 +28264,36 @@
+@@ -26052,24 +28266,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30276,7 +30279,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26080,10 +28306,12 @@
+@@ -26082,10 +28308,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30290,7 +30293,7 @@
test_array [0] = 0
;
-@@ -26091,24 +28319,36 @@
+@@ -26093,24 +28321,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30335,7 +30338,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26117,24 +28357,27 @@
+@@ -26119,24 +28359,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30373,7 +30376,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26145,10 +28388,12 @@
+@@ -26147,10 +28390,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30387,7 +30390,7 @@
test_array [0] = 0
;
-@@ -26156,24 +28401,36 @@
+@@ -26158,24 +28403,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30432,7 +30435,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26182,26 +28439,24 @@
+@@ -26184,26 +28441,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30469,7 +30472,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26209,8 +28464,10 @@
+@@ -26211,8 +28466,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30482,7 +30485,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26219,35 +28476,44 @@
+@@ -26221,35 +28478,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30540,7 +30543,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26258,28 +28524,31 @@
+@@ -26260,28 +28526,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30564,8 +30567,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -30584,7 +30587,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26290,36 +28559,49 @@
+@@ -26292,36 +28561,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30644,7 +30647,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26328,23 +28610,23 @@
+@@ -26330,23 +28612,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30679,7 +30682,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -26354,10 +28636,12 @@
+@@ -26356,10 +28638,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30693,7 +30696,7 @@
test_array [0] = 0
;
-@@ -26365,24 +28649,36 @@
+@@ -26367,24 +28651,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30738,7 +30741,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26395,10 +28691,12 @@
+@@ -26397,10 +28693,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30752,7 +30755,7 @@
test_array [0] = 0
;
-@@ -26406,24 +28704,36 @@
+@@ -26408,24 +28706,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30797,7 +30800,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26432,30 +28742,33 @@
+@@ -26434,30 +28744,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30840,7 +30843,7 @@
test_array [0] = 0
;
-@@ -26463,24 +28776,36 @@
+@@ -26465,24 +28778,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30885,7 +30888,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26493,10 +28818,12 @@
+@@ -26495,10 +28820,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30899,7 +30902,7 @@
test_array [0] = 0
;
-@@ -26504,24 +28831,36 @@
+@@ -26506,24 +28833,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30944,7 +30947,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26530,24 +28869,27 @@
+@@ -26532,24 +28871,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30982,7 +30985,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26558,10 +28900,12 @@
+@@ -26560,10 +28902,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30996,7 +30999,7 @@
test_array [0] = 0
;
-@@ -26569,24 +28913,36 @@
+@@ -26571,24 +28915,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31041,7 +31044,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26595,26 +28951,24 @@
+@@ -26597,26 +28953,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31078,7 +31081,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26622,8 +28976,10 @@
+@@ -26624,8 +28978,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31091,7 +31094,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26632,35 +28988,44 @@
+@@ -26634,35 +28990,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31149,7 +31152,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26671,30 +29036,33 @@
+@@ -26673,30 +29038,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31173,8 +31176,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_char_p=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
@@ -31195,7 +31198,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26707,40 +29075,52 @@
+@@ -26709,40 +29077,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31260,7 +31263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26749,14 +29129,15 @@
+@@ -26751,14 +29131,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31280,7 +31283,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26765,8 +29146,8 @@
+@@ -26767,8 +29148,8 @@
fi
@@ -31291,7 +31294,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26779,40 +29160,52 @@
+@@ -26781,40 +29162,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31356,7 +31359,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26821,14 +29214,15 @@
+@@ -26823,14 +29216,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31376,7 +31379,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26842,8 +29236,8 @@
+@@ -26844,8 +29238,8 @@
@@ -31387,7 +31390,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26854,36 +29248,49 @@
+@@ -26856,36 +29250,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31447,7 +31450,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26892,23 +29299,23 @@
+@@ -26894,23 +29301,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31482,7 +31485,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -26918,10 +29325,12 @@
+@@ -26920,10 +29327,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31496,7 +31499,7 @@
test_array [0] = 0
;
-@@ -26929,24 +29338,36 @@
+@@ -26931,24 +29340,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31541,7 +31544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26959,10 +29380,12 @@
+@@ -26961,10 +29382,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31555,7 +31558,7 @@
test_array [0] = 0
;
-@@ -26970,24 +29393,36 @@
+@@ -26972,24 +29395,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31600,7 +31603,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26996,30 +29431,33 @@
+@@ -26998,30 +29433,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31643,7 +31646,7 @@
test_array [0] = 0
;
-@@ -27027,24 +29465,36 @@
+@@ -27029,24 +29467,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31688,7 +31691,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27057,10 +29507,12 @@
+@@ -27059,10 +29509,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31702,7 +31705,7 @@
test_array [0] = 0
;
-@@ -27068,24 +29520,36 @@
+@@ -27070,24 +29522,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31747,7 +31750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27094,24 +29558,27 @@
+@@ -27096,24 +29560,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31785,7 +31788,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27122,10 +29589,12 @@
+@@ -27124,10 +29591,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31799,7 +31802,7 @@
test_array [0] = 0
;
-@@ -27133,24 +29602,36 @@
+@@ -27135,24 +29604,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31844,7 +31847,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27159,26 +29640,24 @@
+@@ -27161,26 +29642,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31881,7 +31884,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27186,8 +29665,10 @@
+@@ -27188,8 +29667,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31894,7 +31897,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27196,35 +29677,44 @@
+@@ -27198,35 +29679,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31952,7 +31955,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27235,29 +29725,32 @@
+@@ -27237,29 +29727,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31976,8 +31979,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_size_t=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
@@ -31997,7 +32000,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27268,36 +29761,49 @@
+@@ -27270,36 +29763,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32057,7 +32060,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27306,23 +29812,23 @@
+@@ -27308,23 +29814,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32092,7 +32095,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -27332,10 +29838,12 @@
+@@ -27334,10 +29840,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32106,7 +32109,7 @@
test_array [0] = 0
;
-@@ -27343,24 +29851,36 @@
+@@ -27345,24 +29853,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32151,7 +32154,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27373,10 +29893,12 @@
+@@ -27375,10 +29895,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32165,7 +32168,7 @@
test_array [0] = 0
;
-@@ -27384,24 +29906,36 @@
+@@ -27386,24 +29908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32210,7 +32213,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27410,30 +29944,33 @@
+@@ -27412,30 +29946,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32253,7 +32256,7 @@
test_array [0] = 0
;
-@@ -27441,24 +29978,36 @@
+@@ -27443,24 +29980,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32298,7 +32301,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27471,10 +30020,12 @@
+@@ -27473,10 +30022,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32312,7 +32315,7 @@
test_array [0] = 0
;
-@@ -27482,24 +30033,36 @@
+@@ -27484,24 +30035,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32357,7 +32360,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27508,24 +30071,27 @@
+@@ -27510,24 +30073,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32395,7 +32398,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27536,10 +30102,12 @@
+@@ -27538,10 +30104,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32409,7 +32412,7 @@
test_array [0] = 0
;
-@@ -27547,24 +30115,36 @@
+@@ -27549,24 +30117,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32454,7 +32457,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27573,26 +30153,24 @@
+@@ -27575,26 +30155,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32491,7 +32494,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27600,8 +30178,10 @@
+@@ -27602,8 +30180,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32504,7 +32507,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27610,35 +30190,44 @@
+@@ -27612,35 +30192,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32562,7 +32565,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27649,30 +30238,33 @@
+@@ -27651,30 +30240,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32586,8 +32589,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_unsigned_long=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
@@ -32608,7 +32611,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27693,36 +30285,48 @@
+@@ -27695,36 +30287,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32669,17 +32672,17 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27734,18 +30338,18 @@
+@@ -27736,18 +30340,18 @@
{ (exit 1); exit 1; }; }
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- echo "$as_me:$LINENO: checking for PIE support" >&5
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking for PIE support" >&5
+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
if test "${kde_cv_val_pie_support+set}" = set; then
@@ -32693,7 +32696,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27775,24 +30379,36 @@
+@@ -27777,24 +30381,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32738,7 +32741,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27801,9 +30417,10 @@
+@@ -27803,9 +30419,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32751,7 +32754,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27816,26 +30433,26 @@
+@@ -27818,26 +30435,26 @@
fi
@@ -32788,7 +32791,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27854,18 +30471,19 @@
+@@ -27856,18 +30473,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32816,7 +32819,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27876,24 +30494,36 @@
+@@ -27878,24 +30496,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32861,7 +32864,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27902,15 +30532,16 @@
+@@ -27904,15 +30534,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32884,7 +32887,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27919,8 +30550,13 @@
+@@ -27921,8 +30552,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -32900,7 +32903,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27944,9 +30580,10 @@
+@@ -27946,9 +30582,10 @@
ac_header_preproc=no
fi
@@ -32913,7 +32916,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27970,25 +30607,19 @@
+@@ -27972,25 +30609,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;}
@@ -32946,7 +32949,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28000,8 +30631,8 @@
+@@ -28002,8 +30633,8 @@
done
@@ -32957,7 +32960,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28028,53 +30659,59 @@
+@@ -28030,53 +30661,59 @@
#undef _NSGetEnviron
@@ -33036,7 +33039,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28083,13 +30720,14 @@
+@@ -28085,13 +30722,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33055,7 +33058,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28110,9 +30748,9 @@
+@@ -28112,9 +30750,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33068,7 +33071,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28138,53 +30776,59 @@
+@@ -28140,53 +30778,59 @@
#undef $ac_func
@@ -33147,7 +33150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28193,13 +30837,15 @@
+@@ -28195,13 +30839,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33167,7 +33170,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28216,32 +30862,32 @@
+@@ -28218,32 +30864,32 @@
@@ -33212,7 +33215,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28257,8 +30903,8 @@
+@@ -28259,8 +30905,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33223,7 +33226,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28295,8 +30941,13 @@
+@@ -28297,8 +30943,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -33239,7 +33242,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28363,6 +31014,7 @@
+@@ -28365,6 +31016,7 @@
fi
done
fi
@@ -33247,7 +33250,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28392,24 +31044,36 @@
+@@ -28394,24 +31046,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33292,7 +33295,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28420,7 +31084,7 @@
+@@ -28422,7 +31086,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33301,7 +33304,7 @@
# 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}/` \
-@@ -28468,7 +31132,8 @@
+@@ -28470,7 +31134,8 @@
done
done
fi
@@ -33311,7 +33314,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28478,21 +31143,26 @@
+@@ -28480,21 +31145,26 @@
*-*-solaris*)
;;
*)
@@ -33346,7 +33349,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28500,7 +31170,7 @@
+@@ -28502,7 +31172,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
@@ -33355,7 +33358,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28509,7 +31179,7 @@
+@@ -28511,7 +31181,7 @@
esac
fi
cd ..
@@ -33364,7 +33367,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28553,12 +31223,12 @@
+@@ -28555,12 +31225,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -33381,7 +33384,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28586,8 +31256,8 @@
+@@ -28588,8 +31258,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.
@@ -33392,7 +33395,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28600,40 +31270,52 @@
+@@ -28602,40 +31272,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33457,7 +33460,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28642,14 +31324,15 @@
+@@ -28644,14 +31326,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33477,7 +33480,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28658,8 +31341,8 @@
+@@ -28660,8 +31343,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -33488,7 +33491,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28693,24 +31376,36 @@
+@@ -28695,24 +31378,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33533,7 +33536,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28719,10 +31414,11 @@
+@@ -28721,10 +31416,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33547,7 +33550,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28731,8 +31427,8 @@
+@@ -28733,8 +31429,8 @@
fi
@@ -33558,7 +33561,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28878,8 +31574,8 @@
+@@ -28880,8 +31576,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33569,7 +33572,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28890,9 +31586,9 @@
+@@ -28892,9 +31588,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33582,7 +33585,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28904,40 +31600,52 @@
+@@ -28906,40 +31602,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33647,7 +33650,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28946,14 +31654,16 @@
+@@ -28948,14 +31656,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33668,7 +33671,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28966,8 +31676,8 @@
+@@ -28968,8 +31678,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -33679,7 +33682,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28980,40 +31690,52 @@
+@@ -28982,40 +31692,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33744,7 +33747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29022,14 +31744,15 @@
+@@ -29024,14 +31746,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33764,7 +33767,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29037,8 +31760,8 @@
+@@ -29039,8 +31762,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -33775,7 +33778,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29057,40 +31780,53 @@
+@@ -29059,40 +31782,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33842,7 +33845,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29105,16 +31841,15 @@
+@@ -29107,16 +31843,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33863,7 +33866,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29141,24 +31876,36 @@
+@@ -29143,24 +31878,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33908,7 +33911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29167,8 +31914,10 @@
+@@ -29169,8 +31916,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33920,7 +33923,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29181,13 +31930,13 @@
+@@ -29183,13 +31932,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33938,7 +33941,7 @@
:
fi
-@@ -29199,16 +31948,15 @@
+@@ -29201,16 +31950,15 @@
case $host_os in
solaris*)
@@ -33959,7 +33962,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29235,24 +31983,36 @@
+@@ -29237,24 +31985,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34004,7 +34007,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29261,8 +32021,10 @@
+@@ -29263,8 +32023,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34016,7 +34019,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29275,13 +32037,13 @@
+@@ -29277,13 +32039,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34034,7 +34037,7 @@
:
fi
-@@ -29308,17 +32070,17 @@
+@@ -29310,17 +32072,17 @@
@@ -34058,7 +34061,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29336,21 +32098,21 @@
+@@ -29338,21 +32100,21 @@
fi
@@ -34088,7 +34091,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29369,14 +32131,14 @@
+@@ -29371,14 +32133,14 @@
@@ -34107,7 +34110,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29410,24 +32172,36 @@
+@@ -29412,24 +32174,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34152,7 +34155,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29436,9 +32210,10 @@
+@@ -29438,9 +32212,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34165,7 +34168,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29451,8 +32226,8 @@
+@@ -29453,8 +32228,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34176,7 +34179,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29472,8 +32247,8 @@
+@@ -29474,8 +32249,8 @@
@@ -34187,7 +34190,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29509,24 +32284,36 @@
+@@ -29511,24 +32286,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34232,7 +34235,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29535,10 +32322,11 @@
+@@ -29537,10 +32324,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34246,7 +34249,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29552,19 +32340,19 @@
+@@ -29554,19 +32342,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -34272,7 +34275,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29597,24 +32385,36 @@
+@@ -29599,24 +32387,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34317,7 +34320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29623,9 +32423,10 @@
+@@ -29625,9 +32425,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34330,7 +34333,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29635,14 +32436,14 @@
+@@ -29637,14 +32438,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34351,7 +34354,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29675,24 +32476,36 @@
+@@ -29677,24 +32478,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34396,7 +34399,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29701,9 +32514,10 @@
+@@ -29703,9 +32516,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34409,7 +34412,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29713,11 +32527,11 @@
+@@ -29715,11 +32529,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34425,16 +34428,16 @@
LIBJPEG=
-@@ -29737,7 +32551,7 @@
+@@ -29739,7 +32553,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29740: $i/$j" >&5
-+ echo "configure: 32554: $i/$j" >&5
+- echo "configure: 29742: $i/$j" >&5
++ echo "configure: 32556: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29784,14 +32598,14 @@
+@@ -29786,14 +32600,14 @@
@@ -34452,7 +34455,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29834,8 +32648,8 @@
+@@ -29836,8 +32650,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34463,7 +34466,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29844,8 +32658,8 @@
+@@ -29846,8 +32660,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34474,7 +34477,7 @@
PERL=$kde_cv_path
fi
-@@ -29859,10 +32673,9 @@
+@@ -29861,10 +32675,9 @@
@@ -34487,7 +34490,7 @@
else
if test $kde_qtver = 3; then
-@@ -29872,7 +32685,8 @@
+@@ -29874,7 +32687,8 @@
fi
@@ -34497,7 +34500,7 @@
USING_QT_MT=""
-@@ -29892,13 +32706,13 @@
+@@ -29894,13 +32708,13 @@
else
kde_check_threading_default=yes
fi
@@ -34515,7 +34518,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29970,8 +32784,8 @@
+@@ -29972,8 +32786,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -34526,7 +34529,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29980,34 +32794,34 @@
+@@ -29982,34 +32796,34 @@
qt_libraries=""
qt_includes=""
@@ -34541,14 +34544,14 @@
-fi;
+fi
++
-# Check whether --with-qt-includes or --without-qt-includes was given.
--if test "${with_qt_includes+set}" = set; then
++# Check whether --with-qt-includes was given.
+ if test "${with_qt_includes+set}" = set; then
- withval="$with_qt_includes"
-
-+# Check whether --with-qt-includes was given.
-+if test "${with_qt_includes+set}" = set; then
+-
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -34573,16 +34576,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30035,7 +32849,7 @@
+@@ -30037,7 +32851,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30038: $i/$j" >&5
-+ echo "configure: 32852: $i/$j" >&5
+- echo "configure: 30040: $i/$j" >&5
++ echo "configure: 32854: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30072,8 +32886,7 @@
+@@ -30074,8 +32888,7 @@
ac_qt_libraries="$qt_libdir"
@@ -34592,7 +34595,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30210,13 +33023,13 @@
+@@ -30212,13 +33025,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -34610,7 +34613,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30225,15 +33038,14 @@
+@@ -30227,15 +33040,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -34629,7 +34632,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30354,12 +33166,12 @@
+@@ -30356,12 +33168,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34646,7 +34649,7 @@
fi
-@@ -30397,14 +33209,14 @@
+@@ -30399,14 +33211,14 @@
fi
@@ -34664,7 +34667,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30447,8 +33259,8 @@
+@@ -30449,8 +33261,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34675,7 +34678,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30469,22 +33281,22 @@
+@@ -30471,22 +33283,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34703,7 +34706,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30527,12 +33339,12 @@
+@@ -30529,12 +33341,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34720,7 +34723,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30562,10 +33374,10 @@
+@@ -30564,10 +33376,10 @@
if test $kde_qtver = 3; then
@@ -34734,7 +34737,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30588,22 +33400,22 @@
+@@ -30590,22 +33402,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34764,7 +34767,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30626,13 +33438,13 @@
+@@ -30628,13 +33440,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34782,7 +34785,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30663,15 +33475,14 @@
+@@ -30665,15 +33477,14 @@
if test -n "$LIBJPEG"; then
@@ -34801,7 +34804,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30704,24 +33515,36 @@
+@@ -30706,24 +33517,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34846,7 +34849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30730,9 +33553,10 @@
+@@ -30732,9 +33555,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34859,7 +34862,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30748,12 +33572,12 @@
+@@ -30750,12 +33574,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34876,7 +34879,7 @@
LIBJPEG_QT=
fi
-@@ -30784,15 +33608,15 @@
+@@ -30786,15 +33610,15 @@
@@ -34898,7 +34901,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30816,11 +33640,11 @@
+@@ -30818,11 +33642,11 @@
@@ -34914,34 +34917,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30872,7 +33696,7 @@
+@@ -30874,7 +33698,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30875: $i/$j" >&5
-+ echo "configure: 33699: $i/$j" >&5
+- echo "configure: 30877: $i/$j" >&5
++ echo "configure: 33701: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30902,7 +33726,7 @@
+@@ -30904,7 +33728,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30905: $i/$j" >&5
-+ echo "configure: 33729: $i/$j" >&5
+- echo "configure: 30907: $i/$j" >&5
++ echo "configure: 33731: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30920,7 +33744,7 @@
+@@ -30922,7 +33746,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30923: $i/$j" >&5
-+ echo "configure: 33747: $i/$j" >&5
+- echo "configure: 30925: $i/$j" >&5
++ echo "configure: 33749: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30979,12 +33803,12 @@
+@@ -30981,12 +33805,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34958,7 +34961,7 @@
fi
kde_libraries="${libdir}"
-@@ -30993,8 +33817,8 @@
+@@ -30995,8 +33819,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34969,7 +34972,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31032,8 +33856,8 @@
+@@ -31034,8 +33858,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -34980,7 +34983,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31076,8 +33900,8 @@
+@@ -31078,8 +33902,8 @@
fi
@@ -34991,7 +34994,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31109,10 +33933,9 @@
+@@ -31111,10 +33935,9 @@
@@ -35004,7 +35007,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31126,13 +33949,14 @@
+@@ -31128,13 +33951,14 @@
fi
@@ -35022,28 +35025,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31243,15 +34067,14 @@
+@@ -31245,15 +34069,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'
-@@ -31303,8 +34126,8 @@
+@@ -31305,8 +34128,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35054,7 +35057,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31343,8 +34166,8 @@
+@@ -31345,8 +34168,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35065,7 +35068,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31352,8 +34175,8 @@
+@@ -31354,8 +34177,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35076,28 +35079,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31546,15 +34369,14 @@
+@@ -31548,15 +34371,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'
-@@ -31606,8 +34428,8 @@
+@@ -31608,8 +34430,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35108,7 +35111,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31646,8 +34468,8 @@
+@@ -31648,8 +34470,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35119,7 +35122,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31655,8 +34477,8 @@
+@@ -31657,8 +34479,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35130,7 +35133,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31748,22 +34570,22 @@
+@@ -31750,22 +34572,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35159,7 +35162,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31796,14 +34618,14 @@
+@@ -31798,14 +34620,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35177,7 +35180,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31846,8 +34668,8 @@
+@@ -31848,8 +34670,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35188,7 +35191,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31858,21 +34680,21 @@
+@@ -31860,21 +34682,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35215,7 +35218,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31915,8 +34737,8 @@
+@@ -31917,8 +34739,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35226,7 +35229,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31927,22 +34749,22 @@
+@@ -31929,22 +34751,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35254,7 +35257,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31985,8 +34807,8 @@
+@@ -31987,8 +34809,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35265,7 +35268,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31999,21 +34821,21 @@
+@@ -32001,21 +34823,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35292,7 +35295,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32056,8 +34878,8 @@
+@@ -32058,8 +34880,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35303,7 +35306,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32070,22 +34892,22 @@
+@@ -32072,22 +34894,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35331,7 +35334,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32128,12 +34950,12 @@
+@@ -32130,12 +34952,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35348,7 +35351,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32162,14 +34984,14 @@
+@@ -32164,14 +34986,14 @@
if test -n "$kde32ornewer"; then
@@ -35366,7 +35369,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32212,8 +35034,8 @@
+@@ -32214,8 +35036,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35377,7 +35380,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32224,21 +35046,21 @@
+@@ -32226,21 +35048,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35404,7 +35407,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32281,8 +35103,8 @@
+@@ -32283,8 +35105,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35415,7 +35418,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32293,8 +35115,8 @@
+@@ -32295,8 +35117,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35426,7 +35429,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32302,14 +35124,14 @@
+@@ -32304,14 +35126,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -35444,7 +35447,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32352,8 +35174,8 @@
+@@ -32354,8 +35176,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35455,7 +35458,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32364,8 +35186,8 @@
+@@ -32366,8 +35188,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35466,7 +35469,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32373,14 +35195,14 @@
+@@ -32375,14 +35197,14 @@
fi
@@ -35484,7 +35487,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32423,12 +35245,12 @@
+@@ -32425,12 +35247,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35501,16 +35504,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32443,7 +35265,7 @@
+@@ -32445,7 +35267,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32446: $i/$j" >&5
-+ echo "configure: 35268: $i/$j" >&5
+- echo "configure: 32448: $i/$j" >&5
++ echo "configure: 35270: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32605,13 +35427,12 @@
+@@ -32607,13 +35429,12 @@
@@ -35527,7 +35530,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32632,13 +35453,13 @@
+@@ -32634,13 +35455,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -35545,7 +35548,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32658,16 +35479,15 @@
+@@ -32660,16 +35481,15 @@
kde_have_gcc_visibility=no
@@ -35566,7 +35569,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32694,24 +35514,36 @@
+@@ -32696,24 +35516,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35611,7 +35614,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32720,8 +35552,10 @@
+@@ -32722,8 +35554,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35623,7 +35626,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -32734,28 +35568,27 @@
+@@ -32736,28 +35570,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35644,10 +35647,10 @@
kde_have_gcc_visibility=no
-fi;
+fi
-+
- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
@@ -35661,7 +35664,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32790,24 +35623,36 @@
+@@ -32792,24 +35625,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35706,7 +35709,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32816,9 +35661,10 @@
+@@ -32818,9 +35663,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35719,7 +35722,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -32830,21 +35676,20 @@
+@@ -32832,21 +35678,20 @@
fi
@@ -35746,7 +35749,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32884,24 +35729,36 @@
+@@ -32886,24 +35731,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35791,7 +35794,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32910,9 +35767,10 @@
+@@ -32912,9 +35769,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35804,7 +35807,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32926,8 +35784,8 @@
+@@ -32928,8 +35786,8 @@
fi
@@ -35815,7 +35818,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32943,8 +35801,8 @@
+@@ -32945,8 +35803,8 @@
fi
else
@@ -35826,7 +35829,7 @@
:
fi
-@@ -32957,10 +35815,9 @@
+@@ -32959,10 +35817,9 @@
want_pam=
@@ -35839,7 +35842,7 @@
want_pam=yes
pam_service=kde
elif test "x$withval" = "xno"; then
-@@ -32972,13 +35829,14 @@
+@@ -32974,13 +35831,14 @@
else
pam_service=kde
@@ -35857,7 +35860,7 @@
if test "${ac_cv_lib_pam_pam_start+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32991,40 +35849,52 @@
+@@ -32993,40 +35851,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35922,7 +35925,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33033,28 +35903,29 @@
+@@ -33035,28 +35905,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35962,7 +35965,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33065,24 +35936,36 @@
+@@ -33067,24 +35938,36 @@
#include <security/pam_appl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36007,7 +36010,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33091,15 +35974,16 @@
+@@ -33093,15 +35976,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36030,7 +36033,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33108,8 +35992,13 @@
+@@ -33110,8 +35994,13 @@
/* end confdefs.h. */
#include <security/pam_appl.h>
_ACEOF
@@ -36046,7 +36049,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33133,9 +36022,10 @@
+@@ -33135,9 +36024,10 @@
ac_header_preproc=no
fi
@@ -36059,7 +36062,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33159,42 +36049,35 @@
+@@ -33161,42 +36051,35 @@
echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -36113,7 +36116,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33205,24 +36088,36 @@
+@@ -33207,24 +36090,36 @@
#include <pam/pam_appl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36158,7 +36161,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33231,15 +36126,16 @@
+@@ -33233,15 +36128,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36181,7 +36184,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33248,8 +36144,13 @@
+@@ -33250,8 +36146,13 @@
/* end confdefs.h. */
#include <pam/pam_appl.h>
_ACEOF
@@ -36197,7 +36200,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33273,9 +36174,10 @@
+@@ -33275,9 +36176,10 @@
ac_header_preproc=no
fi
@@ -36210,7 +36213,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33299,25 +36201,18 @@
+@@ -33301,25 +36203,18 @@
echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -36241,7 +36244,7 @@
fi
if test $ac_cv_header_pam_pam_appl_h = yes; then
-@@ -33364,8 +36259,8 @@
+@@ -33366,8 +36261,8 @@
fi
@@ -36252,7 +36255,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33388,11 +36283,11 @@
+@@ -33390,11 +36285,11 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "const struct pam_message" >/dev/null 2>&1; then
@@ -36268,7 +36271,7 @@
cat >>confdefs.h <<\_ACEOF
#define PAM_MESSAGE_NONCONST 1
-@@ -33403,8 +36298,8 @@
+@@ -33405,8 +36300,8 @@
rm -f conftest*
else
@@ -36279,7 +36282,7 @@
fi
rm -f conftest*
-@@ -33416,8 +36311,8 @@
+@@ -33418,8 +36313,8 @@
@@ -36290,7 +36293,7 @@
if test "${ac_cv_lib_shadow_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33430,40 +36325,52 @@
+@@ -33432,40 +36327,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36355,7 +36358,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33472,21 +36379,22 @@
+@@ -33474,21 +36381,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36384,7 +36387,7 @@
if test "${ac_cv_lib_gen_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33499,40 +36407,52 @@
+@@ -33501,40 +36409,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36449,7 +36452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33541,21 +36461,22 @@
+@@ -33543,21 +36463,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36478,7 +36481,7 @@
if test "${ac_cv_func_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33582,53 +36503,59 @@
+@@ -33584,53 +36505,59 @@
#undef getspent
@@ -36557,7 +36560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33637,13 +36564,14 @@
+@@ -33639,13 +36566,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36576,7 +36579,7 @@
if test $ac_cv_func_getspent = yes; then
ac_use_shadow=yes
else
-@@ -33659,14 +36587,13 @@
+@@ -33661,14 +36589,13 @@
@@ -36595,7 +36598,7 @@
use_shadow=yes
else
use_shadow=no
-@@ -33676,19 +36603,20 @@
+@@ -33678,19 +36605,20 @@
use_shadow="$ac_use_shadow"
@@ -36621,7 +36624,7 @@
LIBSHADOW=
LIBGEN=
fi
-@@ -33728,10 +36656,9 @@
+@@ -33730,10 +36658,9 @@
@@ -36634,7 +36637,7 @@
KDM_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
-@@ -33746,10 +36673,11 @@
+@@ -33748,10 +36675,11 @@
KDM_PAM_SERVICE="$pam_service"
fi
@@ -36649,7 +36652,7 @@
cat >>confdefs.h <<_ACEOF
#define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
-@@ -33760,10 +36688,9 @@
+@@ -33762,10 +36690,9 @@
@@ -36662,7 +36665,7 @@
KCHECKPASS_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
-@@ -33778,10 +36705,11 @@
+@@ -33780,10 +36707,11 @@
KCHECKPASS_PAM_SERVICE="$pam_service"
fi
@@ -36677,7 +36680,7 @@
cat >>confdefs.h <<_ACEOF
#define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
-@@ -33792,10 +36720,9 @@
+@@ -33794,10 +36722,9 @@
@@ -36690,7 +36693,7 @@
KSCREENSAVER_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
-@@ -33810,10 +36737,11 @@
+@@ -33812,10 +36739,11 @@
KSCREENSAVER_PAM_SERVICE="$pam_service"
fi
@@ -36705,7 +36708,7 @@
cat >>confdefs.h <<_ACEOF
#define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
-@@ -33831,9 +36759,9 @@
+@@ -33833,9 +36761,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`
@@ -36718,7 +36721,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33855,24 +36783,36 @@
+@@ -33857,24 +36785,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36763,7 +36766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33881,12 +36821,14 @@
+@@ -33883,12 +36823,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36782,7 +36785,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -33898,13 +36840,12 @@
+@@ -33900,13 +36842,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -36798,7 +36801,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33912,126 +36853,99 @@
+@@ -33914,126 +36855,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36976,7 +36979,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34039,122 +36953,96 @@
+@@ -34041,122 +36955,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37150,7 +37153,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34178,24 +37066,36 @@
+@@ -34180,24 +37068,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37195,7 +37198,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34204,9 +37104,10 @@
+@@ -34206,9 +37106,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37208,7 +37211,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -34262,6 +37163,7 @@
+@@ -34264,6 +37165,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -37216,7 +37219,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -34281,18 +37183,27 @@
+@@ -34283,18 +37185,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -37250,7 +37253,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34305,12 +37216,14 @@
+@@ -34307,12 +37218,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -37268,7 +37271,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34363,18 +37276,19 @@
+@@ -34365,18 +37278,19 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37296,7 +37299,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34385,24 +37299,36 @@
+@@ -34387,24 +37301,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37341,7 +37344,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34411,15 +37337,16 @@
+@@ -34413,15 +37339,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37364,7 +37367,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34428,8 +37355,13 @@
+@@ -34430,8 +37357,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37380,7 +37383,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34453,9 +37385,10 @@
+@@ -34455,9 +37387,10 @@
ac_header_preproc=no
fi
@@ -37393,7 +37396,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34479,25 +37412,19 @@
+@@ -34481,25 +37414,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;}
@@ -37426,7 +37429,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34510,17 +37437,17 @@
+@@ -34512,17 +37439,17 @@
done
if test "${ac_cv_header_pty_h+set}" = set; then
@@ -37450,7 +37453,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34531,24 +37458,36 @@
+@@ -34533,24 +37460,36 @@
#include <pty.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37495,7 +37498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34557,15 +37496,16 @@
+@@ -34559,15 +37498,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37518,7 +37521,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34574,8 +37514,13 @@
+@@ -34576,8 +37516,13 @@
/* end confdefs.h. */
#include <pty.h>
_ACEOF
@@ -37534,7 +37537,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34599,9 +37544,10 @@
+@@ -34601,9 +37546,10 @@
ac_header_preproc=no
fi
@@ -37547,7 +37550,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34625,31 +37571,24 @@
+@@ -34627,31 +37573,24 @@
echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
@@ -37586,7 +37589,7 @@
if test "${ac_cv_func_ptsname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34676,53 +37615,59 @@
+@@ -34678,53 +37617,59 @@
#undef ptsname
@@ -37665,7 +37668,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34731,18 +37676,19 @@
+@@ -34733,18 +37678,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37691,7 +37694,7 @@
if test "${ac_cv_lib_Alib_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34759,30 +37705,42 @@
+@@ -34761,30 +37707,42 @@
int
main ()
{
@@ -37743,7 +37746,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34791,21 +37749,22 @@
+@@ -34793,21 +37751,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37772,7 +37775,7 @@
if test "${ac_cv_func_clnttcp_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34832,53 +37791,59 @@
+@@ -34834,53 +37793,59 @@
#undef clnttcp_create
@@ -37851,7 +37854,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34887,19 +37852,20 @@
+@@ -34889,19 +37854,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37878,7 +37881,7 @@
if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34912,40 +37878,52 @@
+@@ -34914,40 +37880,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37943,7 +37946,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34954,14 +37932,15 @@
+@@ -34956,14 +37934,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37963,7 +37966,7 @@
if test $ac_cv_lib_nsl_clnttcp_create = yes; then
LIBRPC="-lnsl"
fi
-@@ -34970,8 +37949,8 @@
+@@ -34972,8 +37951,8 @@
@@ -37974,7 +37977,7 @@
if test "${ac_cv_lib_ossaudio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34988,30 +37967,42 @@
+@@ -34990,30 +37969,42 @@
int
main ()
{
@@ -38026,7 +38029,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35020,22 +38011,23 @@
+@@ -35022,22 +38013,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38056,7 +38059,7 @@
if test "${ac_cv_lib_cfg_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35052,30 +38044,42 @@
+@@ -35054,30 +38046,42 @@
int
main ()
{
@@ -38108,7 +38111,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35084,20 +38088,21 @@
+@@ -35086,20 +38090,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38136,7 +38139,7 @@
if test "${ac_cv_lib_odm_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35114,30 +38119,42 @@
+@@ -35116,30 +38121,42 @@
int
main ()
{
@@ -38188,7 +38191,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35146,14 +38163,15 @@
+@@ -35148,14 +38165,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38208,7 +38211,7 @@
if test $ac_cv_lib_odm_main = yes; then
LIBODM="-lodm"
fi
-@@ -35161,8 +38179,8 @@
+@@ -35163,8 +38181,8 @@
kde_have_setupterm=yes
@@ -38219,7 +38222,7 @@
if test "${ac_cv_lib_curses_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35175,40 +38193,52 @@
+@@ -35177,40 +38195,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38284,7 +38287,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35217,19 +38247,20 @@
+@@ -35219,19 +38249,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38311,7 +38314,7 @@
if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35242,40 +38273,52 @@
+@@ -35244,40 +38275,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38376,7 +38379,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35284,19 +38327,20 @@
+@@ -35286,19 +38329,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38403,7 +38406,7 @@
if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35309,40 +38353,52 @@
+@@ -35311,40 +38355,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38468,7 +38471,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35351,14 +38407,15 @@
+@@ -35353,14 +38409,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38488,7 +38491,7 @@
if test $ac_cv_lib_mytinfo_setupterm = yes; then
LIBCURSES=-lmytinfo
else
-@@ -35380,8 +38437,8 @@
+@@ -35382,8 +38439,8 @@
fi
@@ -38499,7 +38502,7 @@
if test "${ac_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35408,53 +38465,59 @@
+@@ -35410,53 +38467,59 @@
#undef res_init
@@ -38578,7 +38581,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35463,18 +38526,19 @@
+@@ -35465,18 +38528,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38604,7 +38607,7 @@
if test "${ac_cv_lib_resolv_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35487,40 +38551,52 @@
+@@ -35489,40 +38553,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38669,7 +38672,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35529,14 +38605,15 @@
+@@ -35531,14 +38607,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38689,7 +38692,7 @@
if test $ac_cv_lib_resolv_res_init = yes; then
LIBRESOLV="-lresolv"
fi
-@@ -35545,7 +38622,7 @@
+@@ -35547,7 +38624,7 @@
@@ -38698,7 +38701,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35554,8 +38631,8 @@
+@@ -35556,8 +38633,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -38709,7 +38712,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35579,24 +38656,36 @@
+@@ -35581,24 +38658,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38754,7 +38757,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35605,12 +38694,13 @@
+@@ -35607,12 +38696,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38772,7 +38775,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35633,9 +38723,11 @@
+@@ -35635,9 +38725,11 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -38787,7 +38790,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35645,13 +38737,27 @@
+@@ -35647,13 +38739,27 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <float.h>
@@ -38819,7 +38822,7 @@
test_array [0] = 0
;
-@@ -35659,48 +38765,70 @@
+@@ -35661,48 +38767,70 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38907,7 +38910,7 @@
if test "${ac_cv_type_uid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35722,8 +38850,8 @@
+@@ -35724,8 +38852,8 @@
rm -f conftest*
fi
@@ -38918,7 +38921,7 @@
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -35737,8 +38865,8 @@
+@@ -35739,8 +38867,8 @@
fi
@@ -38929,7 +38932,7 @@
if test "${ac_cv_type_getgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35752,7 +38880,7 @@
+@@ -35754,7 +38882,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Thanks to Mike Rendell for this test. */
@@ -38938,7 +38941,7 @@
#define NGID 256
#undef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
-@@ -35762,7 +38890,7 @@
+@@ -35764,7 +38892,7 @@
{
gid_t gidset[NGID];
int i, n;
@@ -38947,7 +38950,7 @@
val.lval = -1;
for (i = 0; i < NGID; i++)
-@@ -35770,18 +38898,28 @@
+@@ -35772,18 +38900,28 @@
n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
gidset);
/* Exit non-zero if getgroups seems to require an array of ints. This
@@ -38982,7 +38985,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35794,8 +38932,10 @@
+@@ -35796,8 +38934,10 @@
( exit $ac_status )
ac_cv_type_getgroups=int
fi
@@ -38994,7 +38997,7 @@
if test $ac_cv_type_getgroups = cross; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35816,8 +38956,8 @@
+@@ -35818,8 +38958,8 @@
fi
fi
@@ -39005,7 +39008,7 @@
cat >>confdefs.h <<_ACEOF
#define GETGROUPS_T $ac_cv_type_getgroups
-@@ -35825,8 +38965,8 @@
+@@ -35827,8 +38967,8 @@
@@ -39016,7 +39019,7 @@
if test "${ac_cv_type_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35837,36 +38977,49 @@
+@@ -35839,36 +38979,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39076,7 +39079,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35875,23 +39028,23 @@
+@@ -35877,23 +39030,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39111,7 +39114,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -35901,10 +39054,12 @@
+@@ -35903,10 +39056,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39125,7 +39128,7 @@
test_array [0] = 0
;
-@@ -35912,24 +39067,36 @@
+@@ -35914,24 +39069,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39170,7 +39173,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35942,10 +39109,12 @@
+@@ -35944,10 +39111,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39184,7 +39187,7 @@
test_array [0] = 0
;
-@@ -35953,24 +39122,36 @@
+@@ -35955,24 +39124,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39229,7 +39232,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35979,30 +39160,33 @@
+@@ -35981,30 +39162,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39272,7 +39275,7 @@
test_array [0] = 0
;
-@@ -36010,24 +39194,36 @@
+@@ -36012,24 +39196,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39317,7 +39320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36040,10 +39236,12 @@
+@@ -36042,10 +39238,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39331,7 +39334,7 @@
test_array [0] = 0
;
-@@ -36051,24 +39249,36 @@
+@@ -36053,24 +39251,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39376,7 +39379,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36077,24 +39287,27 @@
+@@ -36079,24 +39289,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39414,7 +39417,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -36105,10 +39318,12 @@
+@@ -36107,10 +39320,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39428,7 +39431,7 @@
test_array [0] = 0
;
-@@ -36116,24 +39331,36 @@
+@@ -36118,24 +39333,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39473,7 +39476,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36142,26 +39369,24 @@
+@@ -36144,26 +39371,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39510,7 +39513,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36169,8 +39394,10 @@
+@@ -36171,8 +39396,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39523,7 +39526,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -36179,35 +39406,44 @@
+@@ -36181,35 +39408,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -39581,7 +39584,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36218,29 +39454,32 @@
+@@ -36220,29 +39456,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -39605,8 +39608,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_char=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
@@ -39626,7 +39629,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36251,36 +39490,49 @@
+@@ -36253,36 +39492,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39686,7 +39689,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36289,23 +39541,23 @@
+@@ -36291,23 +39543,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39721,7 +39724,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -36315,10 +39567,12 @@
+@@ -36317,10 +39569,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39735,7 +39738,7 @@
test_array [0] = 0
;
-@@ -36326,24 +39580,36 @@
+@@ -36328,24 +39582,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39780,7 +39783,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36356,10 +39622,12 @@
+@@ -36358,10 +39624,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39794,7 +39797,7 @@
test_array [0] = 0
;
-@@ -36367,24 +39635,36 @@
+@@ -36369,24 +39637,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39839,7 +39842,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36393,30 +39673,33 @@
+@@ -36395,30 +39675,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39882,7 +39885,7 @@
test_array [0] = 0
;
-@@ -36424,24 +39707,36 @@
+@@ -36426,24 +39709,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39927,7 +39930,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36454,10 +39749,12 @@
+@@ -36456,10 +39751,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39941,7 +39944,7 @@
test_array [0] = 0
;
-@@ -36465,24 +39762,36 @@
+@@ -36467,24 +39764,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39986,7 +39989,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36491,24 +39800,27 @@
+@@ -36493,24 +39802,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40024,7 +40027,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -36519,10 +39831,12 @@
+@@ -36521,10 +39833,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40038,7 +40041,7 @@
test_array [0] = 0
;
-@@ -36530,24 +39844,36 @@
+@@ -36532,24 +39846,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40083,7 +40086,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36556,26 +39882,24 @@
+@@ -36558,26 +39884,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40120,7 +40123,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36583,8 +39907,10 @@
+@@ -36585,8 +39909,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40133,7 +40136,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -36593,35 +39919,44 @@
+@@ -36595,35 +39921,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40191,7 +40194,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36632,29 +39967,32 @@
+@@ -36634,29 +39969,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -40215,8 +40218,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_short=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -40236,7 +40239,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36665,36 +40003,49 @@
+@@ -36667,36 +40005,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40296,7 +40299,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36703,23 +40054,23 @@
+@@ -36705,23 +40056,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40331,7 +40334,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -36729,10 +40080,12 @@
+@@ -36731,10 +40082,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40345,7 +40348,7 @@
test_array [0] = 0
;
-@@ -36740,24 +40093,36 @@
+@@ -36742,24 +40095,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40390,7 +40393,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36770,10 +40135,12 @@
+@@ -36772,10 +40137,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40404,7 +40407,7 @@
test_array [0] = 0
;
-@@ -36781,24 +40148,36 @@
+@@ -36783,24 +40150,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40449,7 +40452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36807,30 +40186,33 @@
+@@ -36809,30 +40188,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40492,7 +40495,7 @@
test_array [0] = 0
;
-@@ -36838,24 +40220,36 @@
+@@ -36840,24 +40222,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40537,7 +40540,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36868,10 +40262,12 @@
+@@ -36870,10 +40264,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40551,7 +40554,7 @@
test_array [0] = 0
;
-@@ -36879,24 +40275,36 @@
+@@ -36881,24 +40277,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40596,7 +40599,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36905,24 +40313,27 @@
+@@ -36907,24 +40315,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40634,7 +40637,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -36933,10 +40344,12 @@
+@@ -36935,10 +40346,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40648,7 +40651,7 @@
test_array [0] = 0
;
-@@ -36944,24 +40357,36 @@
+@@ -36946,24 +40359,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40693,7 +40696,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36970,26 +40395,24 @@
+@@ -36972,26 +40397,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40730,7 +40733,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36997,8 +40420,10 @@
+@@ -36999,8 +40422,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40743,7 +40746,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -37007,35 +40432,44 @@
+@@ -37009,35 +40434,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40801,7 +40804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37046,29 +40480,32 @@
+@@ -37048,29 +40482,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -40825,8 +40828,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_int=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
@@ -40846,7 +40849,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37079,36 +40516,49 @@
+@@ -37081,36 +40518,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40906,7 +40909,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37117,23 +40567,23 @@
+@@ -37119,23 +40569,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40941,7 +40944,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -37143,10 +40593,12 @@
+@@ -37145,10 +40595,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40955,7 +40958,7 @@
test_array [0] = 0
;
-@@ -37154,24 +40606,36 @@
+@@ -37156,24 +40608,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41000,7 +41003,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37184,10 +40648,12 @@
+@@ -37186,10 +40650,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41014,7 +41017,7 @@
test_array [0] = 0
;
-@@ -37195,24 +40661,36 @@
+@@ -37197,24 +40663,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41059,7 +41062,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37221,30 +40699,33 @@
+@@ -37223,30 +40701,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41102,7 +41105,7 @@
test_array [0] = 0
;
-@@ -37252,24 +40733,36 @@
+@@ -37254,24 +40735,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41147,7 +41150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37282,10 +40775,12 @@
+@@ -37284,10 +40777,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41161,7 +41164,7 @@
test_array [0] = 0
;
-@@ -37293,24 +40788,36 @@
+@@ -37295,24 +40790,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41206,7 +41209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37319,24 +40826,27 @@
+@@ -37321,24 +40828,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41244,7 +41247,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -37347,10 +40857,12 @@
+@@ -37349,10 +40859,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41258,7 +41261,7 @@
test_array [0] = 0
;
-@@ -37358,24 +40870,36 @@
+@@ -37360,24 +40872,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41303,7 +41306,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37384,26 +40908,24 @@
+@@ -37386,26 +40910,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41340,7 +41343,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37411,8 +40933,10 @@
+@@ -37413,8 +40935,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -41353,7 +41356,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -37421,35 +40945,44 @@
+@@ -37423,35 +40947,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -41411,7 +41414,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37460,29 +40993,32 @@
+@@ -37462,29 +40995,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -41435,8 +41438,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -41456,7 +41459,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37499,7 +41035,8 @@
+@@ -37501,7 +41037,8 @@
int
main ()
{
@@ -41466,7 +41469,7 @@
bogus endian macros
#endif
-@@ -37508,24 +41045,36 @@
+@@ -37510,24 +41047,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41511,7 +41514,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37551,24 +41100,36 @@
+@@ -37553,24 +41102,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41556,7 +41559,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37577,14 +41138,15 @@
+@@ -37579,14 +41140,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41575,7 +41578,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -37594,11 +41156,11 @@
+@@ -37596,11 +41158,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41591,7 +41594,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -37609,24 +41171,36 @@
+@@ -37611,24 +41173,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41636,7 +41639,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37645,8 +41219,10 @@
+@@ -37647,8 +41221,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41648,7 +41651,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -37654,27 +41230,41 @@
+@@ -37656,27 +41232,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41697,7 +41700,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37687,13 +41277,16 @@
+@@ -37689,13 +41279,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -41718,7 +41721,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -37735,9 +41328,9 @@
+@@ -37737,9 +41330,9 @@
for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -41731,7 +41734,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37763,53 +41356,59 @@
+@@ -37765,53 +41358,59 @@
#undef $ac_func
@@ -41810,7 +41813,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37818,13 +41417,15 @@
+@@ -37820,13 +41419,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41830,7 +41833,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37835,15 +41436,14 @@
+@@ -37837,15 +41438,14 @@
@@ -41849,7 +41852,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37855,9 +41455,6 @@
+@@ -37857,9 +41457,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41859,7 +41862,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37883,24 +41480,36 @@
+@@ -37885,24 +41482,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41904,7 +41907,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37909,9 +41518,10 @@
+@@ -37911,9 +41520,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41917,7 +41920,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -37924,11 +41534,11 @@
+@@ -37926,11 +41536,11 @@
fi
@@ -41933,7 +41936,7 @@
if test "${kde_cv_proto_mkstemps+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37949,8 +41559,7 @@
+@@ -37951,8 +41561,7 @@
if test "x$kde_cv_proto_mkstemps" = xunknown; then
@@ -41943,7 +41946,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37988,24 +41597,36 @@
+@@ -37990,24 +41599,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41988,7 +41991,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38015,10 +41636,11 @@
+@@ -38017,10 +41638,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42002,7 +42005,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -38031,8 +41653,8 @@
+@@ -38033,8 +41655,8 @@
fi
@@ -42013,7 +42016,7 @@
if test "x$kde_cv_func_mkstemps" = xyes; then
-@@ -38056,15 +41678,14 @@
+@@ -38058,15 +41680,14 @@
@@ -42032,7 +42035,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38076,9 +41697,6 @@
+@@ -38078,9 +41699,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42042,7 +42045,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38101,24 +41719,36 @@
+@@ -38103,24 +41721,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42087,7 +42090,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38127,9 +41757,10 @@
+@@ -38129,9 +41759,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42100,7 +42103,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38142,11 +41773,11 @@
+@@ -38144,11 +41775,11 @@
fi
@@ -42116,7 +42119,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38167,8 +41798,7 @@
+@@ -38169,8 +41800,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -42126,7 +42129,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38203,24 +41833,36 @@
+@@ -38205,24 +41835,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42171,7 +42174,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38230,10 +41872,11 @@
+@@ -38232,10 +41874,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42185,7 +42188,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -38246,8 +41889,8 @@
+@@ -38248,8 +41891,8 @@
fi
@@ -42196,7 +42199,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -38271,15 +41914,14 @@
+@@ -38273,15 +41916,14 @@
@@ -42215,7 +42218,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38291,9 +41933,6 @@
+@@ -38293,9 +41935,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42225,7 +42228,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38316,24 +41955,36 @@
+@@ -38318,24 +41957,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42270,7 +42273,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38342,9 +41993,10 @@
+@@ -38344,9 +41995,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42283,7 +42286,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38357,11 +42009,11 @@
+@@ -38359,11 +42011,11 @@
fi
@@ -42299,7 +42302,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38382,8 +42034,7 @@
+@@ -38384,8 +42036,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -42309,7 +42312,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38418,24 +42069,36 @@
+@@ -38420,24 +42071,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42354,7 +42357,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38445,10 +42108,11 @@
+@@ -38447,10 +42110,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42368,7 +42371,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -38461,8 +42125,8 @@
+@@ -38463,8 +42127,8 @@
fi
@@ -42379,7 +42382,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -38486,15 +42150,14 @@
+@@ -38488,15 +42152,14 @@
@@ -42398,7 +42401,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38506,9 +42169,6 @@
+@@ -38508,9 +42171,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42408,7 +42411,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38536,24 +42196,36 @@
+@@ -38538,24 +42198,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42453,7 +42456,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38562,9 +42234,10 @@
+@@ -38564,9 +42236,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42466,7 +42469,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38577,11 +42250,11 @@
+@@ -38579,11 +42252,11 @@
fi
@@ -42482,7 +42485,7 @@
if test "${kde_cv_proto_getdomainname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38602,8 +42275,7 @@
+@@ -38604,8 +42277,7 @@
if test "x$kde_cv_proto_getdomainname" = xunknown; then
@@ -42492,7 +42495,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38644,24 +42316,36 @@
+@@ -38646,24 +42318,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42537,7 +42540,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38671,10 +42355,11 @@
+@@ -38673,10 +42357,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42551,7 +42554,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -38687,8 +42372,8 @@
+@@ -38689,8 +42374,8 @@
fi
@@ -42562,7 +42565,7 @@
if test "x$kde_cv_func_getdomainname" = xyes; then
-@@ -38712,15 +42397,14 @@
+@@ -38714,15 +42399,14 @@
@@ -42581,7 +42584,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38732,9 +42416,6 @@
+@@ -38734,9 +42418,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42591,7 +42594,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38761,24 +42442,36 @@
+@@ -38763,24 +42444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42636,7 +42639,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38787,9 +42480,10 @@
+@@ -38789,9 +42482,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42649,7 +42652,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38802,11 +42496,11 @@
+@@ -38804,11 +42498,11 @@
fi
@@ -42665,7 +42668,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38827,8 +42521,7 @@
+@@ -38829,8 +42523,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -42675,7 +42678,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38867,24 +42560,36 @@
+@@ -38869,24 +42562,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42720,7 +42723,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38894,10 +42599,11 @@
+@@ -38896,10 +42601,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42734,7 +42737,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -38910,8 +42616,8 @@
+@@ -38912,8 +42618,8 @@
fi
@@ -42745,7 +42748,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -38935,15 +42641,14 @@
+@@ -38937,15 +42643,14 @@
@@ -42764,7 +42767,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38955,9 +42660,6 @@
+@@ -38957,9 +42662,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42774,7 +42777,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38982,24 +42684,36 @@
+@@ -38984,24 +42686,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42819,7 +42822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39008,9 +42722,10 @@
+@@ -39010,9 +42724,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42832,7 +42835,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39023,11 +42738,11 @@
+@@ -39025,11 +42740,11 @@
fi
@@ -42848,7 +42851,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39048,8 +42763,7 @@
+@@ -39050,8 +42765,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -42858,7 +42861,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39086,24 +42800,36 @@
+@@ -39088,24 +42802,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42903,7 +42906,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39113,10 +42839,11 @@
+@@ -39115,10 +42841,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42917,7 +42920,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -39129,8 +42856,8 @@
+@@ -39131,8 +42858,8 @@
fi
@@ -42928,7 +42931,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -39154,15 +42881,14 @@
+@@ -39156,15 +42883,14 @@
@@ -42947,7 +42950,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39174,9 +42900,6 @@
+@@ -39176,9 +42902,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42957,7 +42960,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39201,24 +42924,36 @@
+@@ -39203,24 +42926,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43002,7 +43005,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39227,9 +42962,10 @@
+@@ -39229,9 +42964,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43015,7 +43018,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39242,11 +42978,11 @@
+@@ -39244,11 +42980,11 @@
fi
@@ -43031,7 +43034,7 @@
if test "${kde_cv_proto_random+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39267,8 +43003,7 @@
+@@ -39269,8 +43005,7 @@
if test "x$kde_cv_proto_random" = xunknown; then
@@ -43041,7 +43044,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39305,24 +43040,36 @@
+@@ -39307,24 +43042,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43086,7 +43089,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39332,10 +43079,11 @@
+@@ -39334,10 +43081,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43100,7 +43103,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -39348,8 +43096,8 @@
+@@ -39350,8 +43098,8 @@
fi
@@ -43111,7 +43114,7 @@
if test "x$kde_cv_func_random" = xyes; then
-@@ -39372,15 +43120,14 @@
+@@ -39374,15 +43122,14 @@
@@ -43130,7 +43133,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39392,9 +43139,6 @@
+@@ -39394,9 +43141,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -43140,7 +43143,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39419,24 +43163,36 @@
+@@ -39421,24 +43165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43185,7 +43188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39445,9 +43201,10 @@
+@@ -39447,9 +43203,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43198,7 +43201,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39460,11 +43217,11 @@
+@@ -39462,11 +43219,11 @@
fi
@@ -43214,7 +43217,7 @@
if test "${kde_cv_proto_srandom+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39485,8 +43242,7 @@
+@@ -39487,8 +43244,7 @@
if test "x$kde_cv_proto_srandom" = xunknown; then
@@ -43224,7 +43227,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39523,24 +43279,36 @@
+@@ -39525,24 +43281,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43269,7 +43272,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39550,10 +43318,11 @@
+@@ -39552,10 +43320,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43283,7 +43286,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -39566,8 +43335,8 @@
+@@ -39568,8 +43337,8 @@
fi
@@ -43294,7 +43297,7 @@
if test "x$kde_cv_func_srandom" = xyes; then
-@@ -39591,8 +43360,8 @@
+@@ -39593,8 +43362,8 @@
@@ -43305,7 +43308,7 @@
if test "${ac_cv_have_s_issock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39618,24 +43387,36 @@
+@@ -39620,24 +43389,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43350,7 +43353,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39644,15 +43425,16 @@
+@@ -39646,15 +43427,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43371,7 +43374,7 @@
if test "$ac_cv_have_s_issock" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -39666,8 +43448,8 @@
+@@ -39668,8 +43450,8 @@
@@ -43382,7 +43385,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39703,16 +43485,16 @@
+@@ -39705,16 +43487,16 @@
fi
@@ -43403,7 +43406,7 @@
case "$host_os" in
linux*) utmp_support=yes;
-@@ -39724,8 +43506,8 @@
+@@ -39726,8 +43508,8 @@
*) utmp_support=no;
esac
@@ -43414,7 +43417,7 @@
if test "$utmp_support" = yes; then
-@@ -39736,8 +43518,8 @@
+@@ -39738,8 +43520,8 @@
fi
@@ -43425,7 +43428,7 @@
if test "${kde_cv_utmp_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -39768,18 +43550,18 @@
+@@ -39770,18 +43552,18 @@
_ACEOF
@@ -43450,7 +43453,7 @@
if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39792,40 +43574,52 @@
+@@ -39794,40 +43576,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43515,7 +43518,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39834,14 +43628,15 @@
+@@ -39836,14 +43630,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43535,7 +43538,7 @@
if test $ac_cv_lib_kstat_kstat_open = yes; then
LIBKSTAT=-lkstat
else
-@@ -39858,17 +43653,17 @@
+@@ -39860,17 +43655,17 @@
fi
if test "${ac_cv_header_libdevinfo_h+set}" = set; then
@@ -43559,7 +43562,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39879,24 +43674,36 @@
+@@ -39881,24 +43676,36 @@
#include <libdevinfo.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43604,7 +43607,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39905,15 +43712,16 @@
+@@ -39907,15 +43714,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43627,7 +43630,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39922,8 +43730,13 @@
+@@ -39924,8 +43732,13 @@
/* end confdefs.h. */
#include <libdevinfo.h>
_ACEOF
@@ -43643,7 +43646,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39947,9 +43760,10 @@
+@@ -39949,9 +43762,10 @@
ac_header_preproc=no
fi
@@ -43656,7 +43659,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39973,25 +43787,18 @@
+@@ -39975,25 +43789,18 @@
echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
@@ -43687,7 +43690,7 @@
fi
if test $ac_cv_header_libdevinfo_h = yes; then
-@@ -40003,8 +43810,8 @@
+@@ -40005,8 +43812,8 @@
if test "$kde_have_libdevinfo_h" = "yes"; then
kde_have_libdevinfo_lib=yes
@@ -43698,7 +43701,7 @@
if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40017,40 +43824,52 @@
+@@ -40019,40 +43826,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43763,7 +43766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40059,14 +43878,15 @@
+@@ -40061,14 +43880,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43783,7 +43786,7 @@
if test $ac_cv_lib_devinfo_di_init = yes; then
LIBDEVINFO=-ldevinfo
else
-@@ -40086,18 +43906,18 @@
+@@ -40088,18 +43908,18 @@
@@ -43808,7 +43811,7 @@
if test "x$ac_java_dir" = "xno"; then
kde_java_bindir=no
-@@ -40533,8 +44353,7 @@
+@@ -40535,8 +44355,7 @@
if test -n "$jni_includes"; then
@@ -43818,7 +43821,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -40568,24 +44387,36 @@
+@@ -40570,24 +44389,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43863,7 +43866,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40594,9 +44425,10 @@
+@@ -40596,9 +44427,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43876,7 +43879,7 @@
if test $kde_jni_works = no; then
{ { echo "$as_me:$LINENO: error: Incorrect version of $kde_java_includedir/jni.h.
-@@ -40638,8 +44470,8 @@
+@@ -40640,8 +44472,8 @@
else
JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi
@@ -43887,7 +43890,7 @@
else
-@@ -40647,8 +44479,8 @@
+@@ -40649,8 +44481,8 @@
#define PATH_JAVA "$kde_java_bindir/java"
_ACEOF
@@ -43898,7 +43901,7 @@
fi
elif test -d "/Library/Java/Home"; then
kde_java_bindir="/Library/Java/Home/bin"
-@@ -40664,11 +44496,11 @@
+@@ -40666,11 +44498,11 @@
#define PATH_JAVA "$kde_java_bindir/java"
_ACEOF
@@ -43914,7 +43917,7 @@
fi
-@@ -40687,8 +44519,8 @@
+@@ -40689,8 +44521,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
@@ -43925,7 +43928,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40703,35 +44535,36 @@
+@@ -40705,35 +44537,36 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43970,7 +43973,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40746,32 +44579,33 @@
+@@ -40748,32 +44581,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44012,7 +44015,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40786,27 +44620,28 @@
+@@ -40788,27 +44622,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44047,7 +44050,7 @@
fi
if test -z "$MD5SUM" ; then
{ echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
-@@ -40828,8 +44663,7 @@
+@@ -40830,8 +44665,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44057,7 +44060,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -40839,17 +44673,17 @@
+@@ -40841,17 +44675,17 @@
if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
@@ -44081,7 +44084,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40860,24 +44694,36 @@
+@@ -40862,24 +44696,36 @@
#include <X11/extensions/XTest.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44126,7 +44129,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40886,15 +44732,16 @@
+@@ -40888,15 +44734,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44149,7 +44152,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40903,8 +44750,13 @@
+@@ -40905,8 +44752,13 @@
/* end confdefs.h. */
#include <X11/extensions/XTest.h>
_ACEOF
@@ -44165,7 +44168,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40928,9 +44780,10 @@
+@@ -40930,9 +44782,10 @@
ac_header_preproc=no
fi
@@ -44178,7 +44181,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40954,30 +44807,23 @@
+@@ -40956,30 +44809,23 @@
echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
@@ -44216,7 +44219,7 @@
if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40990,40 +44836,52 @@
+@@ -40992,40 +44838,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44281,7 +44284,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41032,14 +44890,15 @@
+@@ -41034,14 +44892,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44301,7 +44304,7 @@
if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41067,8 +44926,7 @@
+@@ -41069,8 +44928,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44311,7 +44314,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41077,8 +44935,8 @@
+@@ -41079,8 +44937,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -44322,7 +44325,7 @@
if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41093,24 +44951,36 @@
+@@ -41095,24 +44953,36 @@
#include <X11/XKBlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44367,7 +44370,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41119,15 +44989,16 @@
+@@ -41121,15 +44991,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44390,7 +44393,7 @@
if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41140,40 +45011,52 @@
+@@ -41142,40 +45013,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44455,7 +44458,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41182,14 +45065,15 @@
+@@ -41184,14 +45067,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44475,7 +44478,7 @@
if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41198,8 +45082,8 @@
+@@ -41200,8 +45084,8 @@
fi
@@ -44486,7 +44489,7 @@
if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41212,40 +45096,52 @@
+@@ -41214,40 +45098,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44551,7 +44554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41254,14 +45150,15 @@
+@@ -41256,14 +45152,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44571,7 +44574,7 @@
if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41287,10 +45184,9 @@
+@@ -41289,10 +45186,9 @@
@@ -44583,7 +44586,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41303,9 +45199,9 @@
+@@ -41305,9 +45201,9 @@
for ac_header in X11/Xcursor/Xcursor.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44596,7 +44599,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41319,24 +45215,36 @@
+@@ -41321,24 +45217,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44641,7 +44644,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41345,12 +45253,14 @@
+@@ -41347,12 +45255,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44660,7 +44663,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -41364,8 +45274,8 @@
+@@ -41366,8 +45276,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -44671,7 +44674,7 @@
if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41378,40 +45288,52 @@
+@@ -41380,40 +45290,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44736,7 +44739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41420,14 +45342,15 @@
+@@ -41422,14 +45344,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44756,7 +44759,7 @@
if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
LIB_XCURSOR=-lXcursor
-@@ -41473,8 +45396,7 @@
+@@ -41475,8 +45398,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44766,7 +44769,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41484,17 +45406,17 @@
+@@ -41486,17 +45408,17 @@
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -44790,7 +44793,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41505,24 +45427,36 @@
+@@ -41507,24 +45429,36 @@
#include <X11/extensions/Xrender.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44835,7 +44838,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41531,15 +45465,16 @@
+@@ -41533,15 +45467,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44858,7 +44861,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41548,8 +45483,13 @@
+@@ -41550,8 +45485,13 @@
/* end confdefs.h. */
#include <X11/extensions/Xrender.h>
_ACEOF
@@ -44874,7 +44877,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -41573,9 +45513,10 @@
+@@ -41575,9 +45515,10 @@
ac_header_preproc=no
fi
@@ -44887,7 +44890,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41599,25 +45540,18 @@
+@@ -41601,25 +45542,18 @@
echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
@@ -44918,7 +44921,7 @@
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -41645,8 +45579,8 @@
+@@ -41647,8 +45581,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -44929,7 +44932,7 @@
if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41659,40 +45593,52 @@
+@@ -41661,40 +45595,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44994,7 +44997,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41701,14 +45647,15 @@
+@@ -41703,14 +45649,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45014,7 +45017,7 @@
if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
LIB_XRENDER=-lXrender
-@@ -41733,8 +45680,8 @@
+@@ -41735,8 +45682,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -45025,16 +45028,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -41746,7 +45693,7 @@
+@@ -41748,7 +45695,7 @@
do
for j in qsql.html;
do
-- echo "configure: 41749: $i/$j" >&5
-+ echo "configure: 45696: $i/$j" >&5
+- echo "configure: 41751: $i/$j" >&5
++ echo "configure: 45698: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41755,20 +45702,20 @@
+@@ -41757,20 +45704,20 @@
done
done
@@ -45060,7 +45063,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41811,12 +45758,12 @@
+@@ -41813,12 +45760,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45077,7 +45080,7 @@
DOT=$kde_cv_path
fi
-@@ -41828,14 +45775,14 @@
+@@ -41830,14 +45777,14 @@
fi
@@ -45095,7 +45098,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41878,12 +45825,12 @@
+@@ -41880,12 +45827,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45112,7 +45115,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -41949,14 +45896,14 @@
+@@ -41951,14 +45898,14 @@
@@ -45130,7 +45133,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41999,15 +45946,15 @@
+@@ -42001,15 +45948,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45150,7 +45153,7 @@
LIBART_CONFIG=$kde_cv_path
fi
-@@ -42046,11 +45993,11 @@
+@@ -42048,11 +45995,11 @@
@@ -45165,7 +45168,7 @@
if test -z "$RUN_KAPPFINDER"; then
-@@ -42063,8 +46010,7 @@
+@@ -42065,8 +46012,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -45175,7 +45178,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42073,8 +46019,8 @@
+@@ -42075,8 +46021,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -45186,7 +45189,7 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42091,24 +46037,36 @@
+@@ -42093,24 +46039,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -45231,7 +45234,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42117,12 +46075,13 @@
+@@ -42119,12 +46077,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45249,7 +45252,7 @@
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
ACCESS_SUBDIR=access
fi
-@@ -42153,8 +46112,7 @@
+@@ -42155,8 +46114,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -45259,7 +45262,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42164,17 +46122,17 @@
+@@ -42166,17 +46124,17 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
@@ -45283,7 +45286,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42185,24 +46143,36 @@
+@@ -42187,24 +46145,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -45328,7 +45331,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42211,15 +46181,16 @@
+@@ -42213,15 +46183,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45351,7 +45354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42228,8 +46199,13 @@
+@@ -42230,8 +46201,13 @@
/* end confdefs.h. */
#include <X11/extensions/XKBstr.h>
_ACEOF
@@ -45367,7 +45370,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -42253,9 +46229,10 @@
+@@ -42255,9 +46231,10 @@
ac_header_preproc=no
fi
@@ -45380,7 +45383,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42279,25 +46256,18 @@
+@@ -42281,25 +46258,18 @@
echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
@@ -45411,7 +45414,7 @@
fi
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-@@ -42332,26 +46302,26 @@
+@@ -42334,26 +46304,26 @@
ssl_libraries=""
ssl_includes=""
@@ -45448,16 +45451,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -42366,7 +46336,7 @@
+@@ -42368,7 +46338,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42369: $i/$j" >&5
-+ echo "configure: 46339: $i/$j" >&5
+- echo "configure: 42371: $i/$j" >&5
++ echo "configure: 46341: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42413,24 +46383,36 @@
+@@ -42415,24 +46385,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45502,7 +45505,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42440,10 +46422,11 @@
+@@ -42442,10 +46424,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45516,7 +45519,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_ldflags_safe"
-@@ -42461,26 +46444,26 @@
+@@ -42463,26 +46446,26 @@
eval "$ac_cv_have_ssl"
@@ -45556,7 +45559,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42553,8 +46536,8 @@
+@@ -42555,8 +46538,8 @@
eval "$ac_cv_ssl_version"
@@ -45567,7 +45570,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -42613,25 +46596,25 @@
+@@ -42615,25 +46598,25 @@
DPMS_LIB=
@@ -45601,7 +45604,7 @@
ac_cv_have_dpms="no"
else
ac_save_ldflags="$LDFLAGS"
-@@ -42663,24 +46646,36 @@
+@@ -42665,24 +46648,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45646,7 +45649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42713,24 +46708,36 @@
+@@ -42715,24 +46710,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45691,7 +45694,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42741,13 +46748,15 @@
+@@ -42743,13 +46750,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45710,7 +45713,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_save_ldflags"
CFLAGS="$ac_save_cflags"
-@@ -42757,8 +46766,8 @@
+@@ -42759,8 +46768,8 @@
fi
if test "$ac_cv_have_dpms" = no; then
@@ -45721,7 +45724,7 @@
DPMS_LDFLAGS=""
DPMSINC=""
-@@ -42781,8 +46790,8 @@
+@@ -42783,8 +46792,8 @@
else
DPMSINC="-I$DPMS_INCLUDE"
fi
@@ -45732,7 +45735,7 @@
fi
fi
-@@ -42791,8 +46800,8 @@
+@@ -42793,8 +46802,8 @@
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
@@ -45743,7 +45746,7 @@
if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42810,6 +46819,7 @@
+@@ -42812,6 +46821,7 @@
{
#ifndef DPMSCapable
char *p = (char *) DPMSCapable;
@@ -45751,7 +45754,7 @@
#endif
;
-@@ -42817,24 +46827,36 @@
+@@ -42819,24 +46829,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45796,7 +45799,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42843,12 +46865,13 @@
+@@ -42845,12 +46867,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45814,7 +45817,7 @@
if test $ac_cv_have_decl_DPMSCapable = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSCAPABLE_PROTO 1
-@@ -42858,8 +46881,8 @@
+@@ -42860,8 +46883,8 @@
@@ -45825,7 +45828,7 @@
if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42877,6 +46900,7 @@
+@@ -42879,6 +46902,7 @@
{
#ifndef DPMSInfo
char *p = (char *) DPMSInfo;
@@ -45833,7 +45836,7 @@
#endif
;
-@@ -42884,24 +46908,36 @@
+@@ -42886,24 +46910,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45878,7 +45881,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42910,12 +46946,13 @@
+@@ -42912,12 +46948,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45896,7 +45899,7 @@
if test $ac_cv_have_decl_DPMSInfo = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSINFO_PROTO 1
-@@ -42929,14 +46966,14 @@
+@@ -42931,14 +46968,14 @@
@@ -45914,7 +45917,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42979,18 +47016,18 @@
+@@ -42981,18 +47018,18 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45938,7 +45941,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43033,23 +47070,23 @@
+@@ -43035,23 +47072,23 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45968,7 +45971,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -43113,8 +47150,8 @@
+@@ -43115,8 +47152,8 @@
case "$host" in
*-*-osf*)
@@ -45979,7 +45982,7 @@
if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43127,40 +47164,52 @@
+@@ -43129,40 +47166,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46044,7 +46047,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43169,14 +47218,15 @@
+@@ -43171,14 +47220,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46064,7 +46067,7 @@
if test $ac_cv_lib_mach_vm_statistics = yes; then
LIB_TRU64_MACH="-lmach"
fi
-@@ -43187,18 +47237,19 @@
+@@ -43189,18 +47239,19 @@
for ac_header in linux/raw.h sys/raw.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46092,7 +46095,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43209,24 +47260,36 @@
+@@ -43211,24 +47262,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -46137,7 +46140,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43235,15 +47298,16 @@
+@@ -43237,15 +47300,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46160,7 +46163,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43252,8 +47316,13 @@
+@@ -43254,8 +47318,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -46176,7 +46179,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -43277,9 +47346,10 @@
+@@ -43279,9 +47348,10 @@
ac_header_preproc=no
fi
@@ -46189,7 +46192,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43303,25 +47373,19 @@
+@@ -43305,25 +47375,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;}
@@ -46222,7 +46225,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43338,18 +47402,19 @@
+@@ -43340,18 +47404,19 @@
for ac_header in devinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46250,7 +46253,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43360,24 +47425,36 @@
+@@ -43362,24 +47427,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -46295,7 +46298,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43386,15 +47463,16 @@
+@@ -43388,15 +47465,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46318,7 +46321,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43403,8 +47481,13 @@
+@@ -43405,8 +47483,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -46334,7 +46337,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -43428,9 +47511,10 @@
+@@ -43430,9 +47513,10 @@
ac_header_preproc=no
fi
@@ -46347,7 +46350,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43454,25 +47538,19 @@
+@@ -43456,25 +47540,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;}
@@ -46380,7 +46383,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43484,8 +47562,8 @@
+@@ -43486,8 +47564,8 @@
done
@@ -46391,7 +46394,7 @@
if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43498,40 +47576,52 @@
+@@ -43500,40 +47578,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46456,7 +46459,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43540,14 +47630,15 @@
+@@ -43542,14 +47632,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46476,7 +46479,7 @@
if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
LIBDEVINFO="-ldevinfo"
fi
-@@ -43562,28 +47653,27 @@
+@@ -43564,28 +47655,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -46512,7 +46515,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43619,24 +47709,36 @@
+@@ -43621,24 +47711,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46557,7 +46560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43645,9 +47747,10 @@
+@@ -43647,9 +47749,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46570,7 +46573,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -43662,8 +47765,8 @@
+@@ -43664,8 +47767,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -46581,7 +46584,7 @@
GL_LDFLAGS=""
GLINC=""
have_gl=no
-@@ -43683,8 +47786,8 @@
+@@ -43685,8 +47788,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -46592,7 +46595,7 @@
have_gl=yes
fi
fi
-@@ -43703,15 +47806,14 @@
+@@ -43705,15 +47808,14 @@
@@ -46611,7 +46614,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43739,24 +47841,36 @@
+@@ -43741,24 +47843,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46656,7 +46659,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43765,9 +47879,10 @@
+@@ -43767,9 +47881,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46669,7 +46672,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -43778,8 +47893,8 @@
+@@ -43780,8 +47895,8 @@
fi
@@ -46680,7 +46683,7 @@
if test "$kde_cv_c_long_long" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -43790,13 +47905,13 @@
+@@ -43792,13 +47907,13 @@
@@ -46698,7 +46701,7 @@
USB_LIBS=
USB_CFLAGS=
-@@ -43804,8 +47919,8 @@
+@@ -43806,8 +47921,8 @@
if test "x$with_libusb" != xno; then
# Extract the first word of "libusb-config", so it can be a program name with args.
set dummy libusb-config; ac_word=$2
@@ -46709,7 +46712,7 @@
if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43820,34 +47935,35 @@
+@@ -43822,34 +47937,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -46753,7 +46756,7 @@
if test "${ac_cv_lib_usb_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43865,30 +47981,42 @@
+@@ -43867,30 +47983,42 @@
int
main ()
{
@@ -46805,7 +46808,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43897,14 +48025,15 @@
+@@ -43899,14 +48027,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46825,7 +46828,7 @@
if test $ac_cv_lib_usb_main = yes; then
have_libusb=yes
-@@ -43948,14 +48077,14 @@
+@@ -43950,14 +48079,14 @@
KFI_FOUND_FREETYPE=0
@@ -46843,7 +46846,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43998,15 +48127,15 @@
+@@ -44000,15 +48129,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46863,7 +46866,7 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -44042,14 +48171,14 @@
+@@ -44044,14 +48173,14 @@
KFI_FOUND_FONTCONFIG=0
# check for fontconfig...
@@ -46881,7 +46884,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44092,18 +48221,18 @@
+@@ -44094,18 +48223,18 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46905,7 +46908,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44146,23 +48275,23 @@
+@@ -44148,23 +48277,23 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46935,7 +46938,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -44210,8 +48339,8 @@
+@@ -44212,8 +48341,8 @@
# Check OS...
@@ -46946,7 +46949,7 @@
case "$host" in
*-*-linux*) UNAME='Linux' ;;
*-*-freebsd*) UNAME='FreeBSD' ;;
-@@ -44224,8 +48353,8 @@
+@@ -44226,8 +48355,8 @@
*-*-darwin*) UNAME='Darwin' ;;
*) UNAME='Unknown' ;;
esac
@@ -46957,7 +46960,7 @@
# Check for fontenc...
-@@ -44234,8 +48363,7 @@
+@@ -44236,8 +48365,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -46967,7 +46970,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -44245,17 +48373,17 @@
+@@ -44247,17 +48375,17 @@
if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
@@ -46991,7 +46994,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44266,24 +48394,36 @@
+@@ -44268,24 +48396,36 @@
#include <X11/fonts/fontenc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -47036,7 +47039,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44292,15 +48432,16 @@
+@@ -44294,15 +48434,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47059,7 +47062,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44309,8 +48450,13 @@
+@@ -44311,8 +48452,13 @@
/* end confdefs.h. */
#include <X11/fonts/fontenc.h>
_ACEOF
@@ -47075,7 +47078,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -44334,9 +48480,10 @@
+@@ -44336,9 +48482,10 @@
ac_header_preproc=no
fi
@@ -47088,7 +47091,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -44360,25 +48507,18 @@
+@@ -44362,25 +48509,18 @@
echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
@@ -47119,7 +47122,7 @@
fi
if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
-@@ -44401,16 +48541,15 @@
+@@ -44403,16 +48543,15 @@
ac_LDFLAGS_save="$LDFLAGS"
ld_shared_flag=
@@ -47140,7 +47143,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -44437,24 +48576,36 @@
+@@ -44439,24 +48578,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47185,7 +47188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44463,8 +48614,10 @@
+@@ -44465,8 +48616,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47197,7 +47200,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -44477,13 +48630,13 @@
+@@ -44479,13 +48632,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -47215,7 +47218,7 @@
:
fi
-@@ -44498,8 +48651,8 @@
+@@ -44500,8 +48653,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -47226,7 +47229,7 @@
if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44512,40 +48665,52 @@
+@@ -44514,40 +48667,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -47291,7 +47294,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44554,14 +48719,15 @@
+@@ -44556,14 +48721,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47311,7 +47314,7 @@
if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
ac_font_enc_lib=1
else
-@@ -44594,17 +48760,17 @@
+@@ -44596,17 +48762,17 @@
CPPFLAGS="$CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@@ -47335,7 +47338,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44615,24 +48781,36 @@
+@@ -44617,24 +48783,36 @@
#include <X11/Xft/Xft.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -47380,7 +47383,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44641,15 +48819,16 @@
+@@ -44643,15 +48821,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47403,7 +47406,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44658,8 +48837,13 @@
+@@ -44660,8 +48839,13 @@
/* end confdefs.h. */
#include <X11/Xft/Xft.h>
_ACEOF
@@ -47419,7 +47422,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -44683,9 +48867,10 @@
+@@ -44685,9 +48869,10 @@
ac_header_preproc=no
fi
@@ -47432,7 +47435,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -44709,25 +48894,18 @@
+@@ -44711,25 +48896,18 @@
echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
@@ -47463,7 +47466,7 @@
fi
if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-@@ -44789,9 +48967,9 @@
+@@ -44791,9 +48969,9 @@
for ac_func in getifaddrs getnameinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -47476,7 +47479,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44817,53 +48995,59 @@
+@@ -44819,53 +48997,59 @@
#undef $ac_func
@@ -47555,7 +47558,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44872,13 +49056,15 @@
+@@ -44874,13 +49058,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47575,7 +47578,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -44887,8 +49073,8 @@
+@@ -44889,8 +49075,8 @@
fi
done
@@ -47586,7 +47589,7 @@
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44913,24 +49099,36 @@
+@@ -44915,24 +49101,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -47631,7 +47634,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44939,7 +49137,7 @@
+@@ -44941,7 +49139,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47640,7 +47643,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -44960,24 +49158,36 @@
+@@ -44962,24 +49160,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -47685,7 +47688,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44986,14 +49196,16 @@
+@@ -44988,14 +49198,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47707,7 +47710,7 @@
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -45009,10 +49221,9 @@
+@@ -45011,10 +49223,9 @@
@@ -47719,7 +47722,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45025,9 +49236,9 @@
+@@ -45027,9 +49238,9 @@
for ac_header in X11/extensions/Xrandr.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -47732,7 +47735,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -45041,24 +49252,36 @@
+@@ -45043,24 +49254,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -47777,7 +47780,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45067,12 +49290,14 @@
+@@ -45069,12 +49292,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47796,7 +47799,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -45102,8 +49327,8 @@
+@@ -45104,8 +49329,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -47807,7 +47810,7 @@
if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45116,40 +49341,52 @@
+@@ -45118,40 +49343,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -47872,7 +47875,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45158,14 +49395,15 @@
+@@ -45160,14 +49397,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47892,7 +47895,7 @@
if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
LIB_XRANDR=-lXrandr
-@@ -45204,28 +49442,27 @@
+@@ -45206,28 +49444,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -47928,7 +47931,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45261,24 +49498,36 @@
+@@ -45263,24 +49500,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47973,7 +47976,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45287,9 +49536,10 @@
+@@ -45289,9 +49538,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47986,7 +47989,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -45304,8 +49554,8 @@
+@@ -45306,8 +49556,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -47997,7 +48000,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -45326,11 +49576,11 @@
+@@ -45328,11 +49578,11 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -48013,7 +48016,7 @@
if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45343,40 +49593,52 @@
+@@ -45345,40 +49595,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48078,7 +48081,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45385,14 +49647,15 @@
+@@ -45387,14 +49649,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48098,7 +48101,7 @@
if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-@@ -45415,8 +49678,7 @@
+@@ -45417,8 +49680,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -48108,7 +48111,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45426,17 +49688,17 @@
+@@ -45428,17 +49690,17 @@
if test "${ac_cv_header_kcarddb_h+set}" = set; then
@@ -48132,7 +48135,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45447,24 +49709,36 @@
+@@ -45449,24 +49711,36 @@
#include <kcarddb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -48177,7 +48180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45473,15 +49747,16 @@
+@@ -45475,15 +49749,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48200,7 +48203,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45490,8 +49765,13 @@
+@@ -45492,8 +49767,13 @@
/* end confdefs.h. */
#include <kcarddb.h>
_ACEOF
@@ -48216,7 +48219,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -45515,9 +49795,10 @@
+@@ -45517,9 +49797,10 @@
ac_header_preproc=no
fi
@@ -48229,7 +48232,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45541,25 +49822,18 @@
+@@ -45543,25 +49824,18 @@
echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
@@ -48260,7 +48263,7 @@
fi
if test $ac_cv_header_kcarddb_h = yes; then
-@@ -45606,11 +49880,11 @@
+@@ -45608,11 +49882,11 @@
@@ -48275,7 +48278,7 @@
if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-@@ -45633,13 +49907,13 @@
+@@ -45635,13 +49909,13 @@
@@ -48293,7 +48296,7 @@
VIEW1394_SUBDIR=
if test "x$with_libraw1394" != xno; then
-@@ -45647,8 +49921,7 @@
+@@ -45649,8 +49923,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -48303,7 +48306,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45658,17 +49931,17 @@
+@@ -45660,17 +49933,17 @@
if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
@@ -48327,7 +48330,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45679,24 +49952,36 @@
+@@ -45681,24 +49954,36 @@
#include <libraw1394/raw1394.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -48372,7 +48375,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45705,15 +49990,16 @@
+@@ -45707,15 +49992,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48395,7 +48398,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45722,8 +50008,13 @@
+@@ -45724,8 +50010,13 @@
/* end confdefs.h. */
#include <libraw1394/raw1394.h>
_ACEOF
@@ -48411,7 +48414,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -45747,9 +50038,10 @@
+@@ -45749,9 +50040,10 @@
ac_header_preproc=no
fi
@@ -48424,7 +48427,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45773,25 +50065,18 @@
+@@ -45775,25 +50067,18 @@
echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
@@ -48455,7 +48458,7 @@
fi
if test $ac_cv_header_libraw1394_raw1394_h = yes; then
-@@ -45832,9 +50117,9 @@
+@@ -45834,9 +50119,9 @@
for ac_func in sigset sigaction
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -48468,7 +48471,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -45860,53 +50145,59 @@
+@@ -45862,53 +50147,59 @@
#undef $ac_func
@@ -48547,7 +48550,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45915,13 +50206,15 @@
+@@ -45917,13 +50208,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48567,7 +48570,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -45937,19 +50230,18 @@
+@@ -45939,19 +50232,18 @@
LIB_XSS=
@@ -48591,7 +48594,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45958,8 +50250,8 @@
+@@ -45960,8 +50252,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -48602,7 +48605,7 @@
if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45976,24 +50268,36 @@
+@@ -45978,24 +50270,36 @@
#include <X11/extensions/scrnsaver.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -48647,7 +48650,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46002,16 +50306,17 @@
+@@ -46004,16 +50308,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48671,7 +48674,7 @@
if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46024,40 +50329,52 @@
+@@ -46026,40 +50331,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48736,7 +48739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46066,14 +50383,15 @@
+@@ -46068,14 +50385,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48756,7 +48759,7 @@
if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
-@@ -46089,16 +50407,15 @@
+@@ -46091,16 +50409,15 @@
xss_save_cxxflags="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
@@ -48777,7 +48780,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46125,24 +50442,36 @@
+@@ -46127,24 +50444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48822,7 +48825,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46151,11 +50480,13 @@
+@@ -46153,11 +50482,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48838,7 +48841,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46165,19 +50496,19 @@
+@@ -46167,19 +50498,19 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -48864,7 +48867,7 @@
if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46190,40 +50521,52 @@
+@@ -46192,40 +50523,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48929,7 +48932,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46232,14 +50575,15 @@
+@@ -46234,14 +50577,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48949,7 +48952,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-@@ -46281,8 +50625,7 @@
+@@ -46283,8 +50627,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -48959,7 +48962,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46291,8 +50634,8 @@
+@@ -46293,8 +50636,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -48970,7 +48973,7 @@
if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46309,24 +50652,36 @@
+@@ -46311,24 +50654,36 @@
#include <X11/extensions/xf86misc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -49015,7 +49018,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46335,16 +50690,17 @@
+@@ -46337,16 +50692,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49039,7 +49042,7 @@
if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46357,40 +50713,52 @@
+@@ -46359,40 +50715,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -49104,7 +49107,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46399,14 +50767,15 @@
+@@ -46401,14 +50769,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49124,7 +49127,7 @@
if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
-@@ -46433,8 +50802,8 @@
+@@ -46435,8 +50804,8 @@
if test -n "$LIB_XF86MISC"; then
@@ -49135,7 +49138,7 @@
if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46447,40 +50816,52 @@
+@@ -46449,40 +50818,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -49200,7 +49203,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46489,14 +50870,15 @@
+@@ -46491,14 +50872,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49220,7 +49223,7 @@
if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
-@@ -46517,28 +50899,27 @@
+@@ -46519,28 +50901,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -49256,7 +49259,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46574,24 +50955,36 @@
+@@ -46576,24 +50957,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49301,7 +49304,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46600,9 +50993,10 @@
+@@ -46602,9 +50995,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49314,7 +49317,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -46617,8 +51011,8 @@
+@@ -46619,8 +51013,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -49325,7 +49328,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -46639,11 +51033,11 @@
+@@ -46641,11 +51035,11 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -49341,7 +49344,7 @@
if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46656,40 +51050,52 @@
+@@ -46658,40 +51052,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -49406,7 +49409,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46698,14 +51104,15 @@
+@@ -46700,14 +51106,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49426,7 +49429,7 @@
if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-@@ -46723,8 +51130,8 @@
+@@ -46725,8 +51132,8 @@
@@ -49437,7 +49440,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46746,15 +51153,15 @@
+@@ -46748,15 +51155,15 @@
#define HAVE_STRUCT_UCRED 1
_ACEOF
@@ -49459,7 +49462,7 @@
if test "$cross_compiling" = yes; then
nogroup=65534
else
-@@ -46777,13 +51184,22 @@
+@@ -46779,13 +51186,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -49486,7 +49489,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46816,13 +51232,22 @@
+@@ -46818,13 +51234,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -49513,7 +49516,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46835,21 +51260,25 @@
+@@ -46837,21 +51262,25 @@
( exit $ac_status )
nogroup=65534
fi
@@ -49546,7 +49549,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -46875,53 +51304,59 @@
+@@ -46877,53 +51306,59 @@
#undef $ac_func
@@ -49625,7 +49628,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46930,13 +51365,15 @@
+@@ -46932,13 +51367,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49645,10 +49648,33 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -46947,14 +51384,14 @@
+@@ -46949,10 +51386,9 @@
+-# Check whether --with-sudo-kdesu-backend or --without-sudo-kdesu-backend was given.
++# Check whether --with-sudo-kdesu-backend was given.
+ if test "${with_sudo_kdesu_backend+set}" = set; then
+- withval="$with_sudo_kdesu_backend"
+-
++ withval=$with_sudo_kdesu_backend;
+ if test x$withval = xyes; then
+ use_kdesu_backend="sudo"
+ else
+@@ -46962,7 +51398,8 @@
+ else
+ use_kdesu_backend="su"
+
+-fi;
++fi
++
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -46971,14 +51408,14 @@
+
+
+
- echo "$as_me:$LINENO: checking for xmkmf" >&5
-echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for xmkmf" >&5
@@ -49663,7 +49689,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46997,21 +51434,21 @@
+@@ -47021,21 +51458,21 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -49691,7 +49717,7 @@
imkv=8
test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
if test "${kde_cv_defines_imake+set}" = set; then
-@@ -47031,8 +51468,8 @@
+@@ -47055,8 +51492,8 @@
kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
kde_cv_defines_imake_version=$imkv
else
@@ -49702,7 +49728,7 @@
{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
Make sure you have all necessary X development packages installed.
On some systems a missing /lib/cpp symlink is at fault." >&5
-@@ -47044,8 +51481,8 @@
+@@ -47068,8 +51505,8 @@
cd ..
rm -fr conftestdir
else
@@ -49713,7 +49739,7 @@
{ { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
echo "$as_me: error: cannot create temporary directory" >&2;}
{ (exit 1); exit 1; }; }
-@@ -47053,8 +51490,8 @@
+@@ -47077,8 +51514,8 @@
fi
@@ -49724,7 +49750,7 @@
eval "$kde_cv_defines_imake"
cat >>confdefs.h <<_ACEOF
-@@ -47079,9 +51516,9 @@
+@@ -47103,9 +51540,9 @@
for ac_func in getttyent
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -49737,7 +49763,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47107,53 +51544,59 @@
+@@ -47131,53 +51568,59 @@
#undef $ac_func
@@ -49816,7 +49842,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47162,13 +51605,15 @@
+@@ -47186,13 +51629,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49836,7 +49862,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47181,8 +51626,8 @@
+@@ -47205,8 +51650,8 @@
linux*) ac_cv_func_getutxent=no;;
darwin*) ac_cv_func_getutxent=no;;
kfreebsd*-gnu) ac_cv_func_getutxent=no;;
@@ -49847,7 +49873,7 @@
if test "${ac_cv_func_getutxent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47209,53 +51654,59 @@
+@@ -47233,53 +51678,59 @@
#undef getutxent
@@ -49926,7 +49952,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47264,13 +51715,14 @@
+@@ -47288,13 +51739,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49945,7 +49971,7 @@
;;
esac
if test $ac_cv_func_getutxent = yes; then
-@@ -47280,8 +51732,8 @@
+@@ -47304,8 +51756,8 @@
_ACEOF
else
@@ -49956,7 +49982,7 @@
if test "${ac_cv_func_getutent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47308,53 +51760,59 @@
+@@ -47332,53 +51784,59 @@
#undef getutent
@@ -50035,7 +50061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47363,13 +51821,14 @@
+@@ -47387,13 +51845,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50054,7 +50080,7 @@
if test $ac_cv_func_getutent = yes; then
:
else
-@@ -47382,8 +51841,8 @@
+@@ -47406,8 +51865,8 @@
fi
@@ -50065,7 +50091,7 @@
if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47406,24 +51865,36 @@
+@@ -47430,24 +51889,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50110,7 +50136,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47432,7 +51903,7 @@
+@@ -47456,7 +51927,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50119,7 +50145,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47451,24 +51922,36 @@
+@@ -47475,24 +51946,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50164,7 +50190,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47477,14 +51960,16 @@
+@@ -47501,14 +51984,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50186,7 +50212,7 @@
if test $ac_cv_member_struct_utmp_ut_user = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47494,8 +51979,8 @@
+@@ -47518,8 +52003,8 @@
fi
@@ -50197,7 +50223,7 @@
if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47518,24 +52003,36 @@
+@@ -47542,24 +52027,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50242,7 +50268,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47544,7 +52041,7 @@
+@@ -47568,7 +52065,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50251,7 +50277,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47563,24 +52060,36 @@
+@@ -47587,24 +52084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50296,7 +50322,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47589,14 +52098,16 @@
+@@ -47613,14 +52122,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50318,7 +50344,7 @@
if test $ac_cv_member_struct_passwd_pw_expire = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47606,8 +52117,8 @@
+@@ -47630,8 +52141,8 @@
fi
@@ -50329,7 +50355,7 @@
if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47633,24 +52144,36 @@
+@@ -47657,24 +52168,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50374,7 +50400,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47659,7 +52182,7 @@
+@@ -47683,7 +52206,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50383,7 +50409,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47681,24 +52204,36 @@
+@@ -47705,24 +52228,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -50428,7 +50454,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47707,14 +52242,16 @@
+@@ -47731,14 +52266,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50450,7 +50476,7 @@
if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47735,9 +52272,9 @@
+@@ -47759,9 +52296,9 @@
for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -50463,7 +50489,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47763,53 +52300,59 @@
+@@ -47787,53 +52324,59 @@
#undef $ac_func
@@ -50542,7 +50568,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47818,13 +52361,15 @@
+@@ -47842,13 +52385,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50562,7 +50588,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47843,9 +52388,9 @@
+@@ -47867,9 +52412,9 @@
for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -50575,7 +50601,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47871,53 +52416,59 @@
+@@ -47895,53 +52440,59 @@
#undef $ac_func
@@ -50654,7 +50680,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47926,13 +52477,15 @@
+@@ -47950,13 +52501,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50674,7 +50700,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47946,9 +52499,9 @@
+@@ -47970,9 +52523,9 @@
for ac_func in arc4random
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -50687,7 +50713,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47974,53 +52527,59 @@
+@@ -47998,53 +52551,59 @@
#undef $ac_func
@@ -50766,7 +50792,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48029,13 +52588,15 @@
+@@ -48053,13 +52612,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50786,7 +50812,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -48058,8 +52619,8 @@
+@@ -48082,8 +52643,8 @@
done
@@ -50797,7 +50823,7 @@
if test "${ac_cv_func_vsyslog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48086,53 +52647,59 @@
+@@ -48110,53 +52671,59 @@
#undef vsyslog
@@ -50876,7 +50902,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48141,13 +52708,14 @@
+@@ -48165,13 +52732,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50895,7 +50921,7 @@
if test $ac_cv_func_vsyslog = yes; then
-@@ -48161,8 +52729,8 @@
+@@ -48185,8 +52753,8 @@
kdm_no_Xau=false
kdm_no_Xdmcp=false
@@ -50906,7 +50932,7 @@
if test "${ac_cv_lib_Xau_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48179,30 +52747,42 @@
+@@ -48203,30 +52771,42 @@
int
main ()
{
@@ -50958,7 +50984,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48211,14 +52791,15 @@
+@@ -48235,14 +52815,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50978,7 +51004,7 @@
if test $ac_cv_lib_Xau_main = yes; then
:
else
-@@ -48230,16 +52811,16 @@
+@@ -48254,16 +52835,16 @@
@@ -51001,7 +51027,7 @@
if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48256,30 +52837,42 @@
+@@ -48280,30 +52861,42 @@
int
main ()
{
@@ -51053,7 +51079,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48288,14 +52881,15 @@
+@@ -48312,14 +52905,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51073,7 +51099,7 @@
if test $ac_cv_lib_Xdmcp_main = yes; then
LIBXDMCP="-lXdmcp"
fi
-@@ -48303,8 +52897,8 @@
+@@ -48327,8 +52921,8 @@
if test -n "$LIBXDMCP"; then
cppflags_safe=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
@@ -51084,7 +51110,7 @@
if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48319,24 +52913,36 @@
+@@ -48343,24 +52937,36 @@
#include <X11/Xdmcp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51129,7 +51155,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48345,12 +52951,13 @@
+@@ -48369,12 +52975,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51147,7 +51173,7 @@
if test $ac_cv_header_X11_Xdmcp_h = yes; then
HAVE_X11_XDMCP_H=1
fi
-@@ -48369,8 +52976,8 @@
+@@ -48393,8 +53000,8 @@
ac_save_libs=$LIBS
LIBS="$LIBS $LIBXDMCP"
@@ -51158,7 +51184,7 @@
if test "${ac_cv_func_XdmcpWrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48397,53 +53004,59 @@
+@@ -48421,53 +53028,59 @@
#undef XdmcpWrap
@@ -51237,7 +51263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48452,13 +53065,14 @@
+@@ -48476,13 +53089,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51256,7 +51282,7 @@
if test $ac_cv_func_XdmcpWrap = yes; then
-@@ -48477,25 +53091,25 @@
+@@ -48501,25 +53115,25 @@
KRB4_LIBS=
KRB4_RPATH=
@@ -51292,7 +51318,7 @@
cat >>confdefs.h <<_ACEOF
#define KRB4 1
-@@ -48506,8 +53120,8 @@
+@@ -48530,8 +53144,8 @@
if test "$USE_RPATH" = "yes" ; then
KRB4_RPATH="-R $with_krb4/lib"
fi
@@ -51303,7 +51329,7 @@
if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48520,40 +53134,52 @@
+@@ -48544,40 +53158,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -51368,7 +51394,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48562,14 +53188,15 @@
+@@ -48586,14 +53212,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51388,7 +51414,7 @@
if test $ac_cv_lib_resolv_dn_expand = yes; then
KRB4_LIBS="$KRB4_LIBS -lresolv"
fi
-@@ -48577,29 +53204,29 @@
+@@ -48601,29 +53228,29 @@
;;
esac
@@ -51430,7 +51456,7 @@
cat >>confdefs.h <<_ACEOF
#define AFS 1
-@@ -48616,8 +53243,8 @@
+@@ -48640,8 +53267,8 @@
@@ -51441,7 +51467,7 @@
if test "${ac_cv_lib_s_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48634,30 +53261,42 @@
+@@ -48658,30 +53285,42 @@
int
main ()
{
@@ -51493,7 +51519,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48666,21 +53305,22 @@
+@@ -48690,21 +53329,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51522,7 +51548,7 @@
if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48693,40 +53333,52 @@
+@@ -48717,40 +53357,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -51587,7 +51613,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48735,14 +53387,15 @@
+@@ -48759,14 +53411,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51607,7 +51633,7 @@
if test $ac_cv_lib_posix4_sched_yield = yes; then
LIBPOSIX4=-lposix4
fi
-@@ -48753,22 +53406,22 @@
+@@ -48777,22 +53430,22 @@
KRB5_LIBS=
KRB5_RPATH=
@@ -51640,7 +51666,7 @@
if test "x$with_krb5auth" != xyes; then
KRB5_INCS="-I$with_krb5auth/include"
KRB5_LIBS="-L$with_krb5auth/lib"
-@@ -48779,17 +53432,17 @@
+@@ -48803,17 +53456,17 @@
KRB5_LIBS="$KRB5_LIBS -lkrb5" keepcflags=$CFLAGS
CFLAGS="$KRB5_INCS $CFLAGS"
if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
@@ -51664,7 +51690,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48800,24 +53453,36 @@
+@@ -48824,24 +53477,36 @@
#include <krb5/krb5.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51709,7 +51735,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48826,15 +53491,16 @@
+@@ -48850,15 +53515,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51732,7 +51758,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48843,8 +53509,13 @@
+@@ -48867,8 +53533,13 @@
/* end confdefs.h. */
#include <krb5/krb5.h>
_ACEOF
@@ -51748,7 +51774,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -48868,9 +53539,10 @@
+@@ -48892,9 +53563,10 @@
ac_header_preproc=no
fi
@@ -51761,7 +51787,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -48894,25 +53566,18 @@
+@@ -48918,25 +53590,18 @@
echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
@@ -51792,7 +51818,7 @@
fi
if test $ac_cv_header_krb5_krb5_h = yes; then
-@@ -48939,34 +53604,34 @@
+@@ -48963,34 +53628,34 @@
@@ -51843,7 +51869,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48977,24 +53642,36 @@
+@@ -49001,24 +53666,36 @@
#include <rpc/rpc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51888,7 +51914,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49003,15 +53680,16 @@
+@@ -49027,15 +53704,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51911,7 +51937,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49020,8 +53698,13 @@
+@@ -49044,8 +53722,13 @@
/* end confdefs.h. */
#include <rpc/rpc.h>
_ACEOF
@@ -51927,7 +51953,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -49045,9 +53728,10 @@
+@@ -49069,9 +53752,10 @@
ac_header_preproc=no
fi
@@ -51940,7 +51966,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49071,25 +53755,18 @@
+@@ -49095,25 +53779,18 @@
echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
@@ -51971,7 +51997,7 @@
fi
if test $ac_cv_header_rpc_rpc_h = yes; then
-@@ -49136,13 +53813,13 @@
+@@ -49160,13 +53837,13 @@
fi
@@ -51989,7 +52015,7 @@
if test "x$with_kdm_xconsole" = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -49154,16 +53831,15 @@
+@@ -49178,16 +53855,15 @@
@@ -52009,7 +52035,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49204,13 +53880,22 @@
+@@ -49228,13 +53904,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -52036,7 +52062,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49221,8 +53906,10 @@
+@@ -49245,8 +53930,10 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -52048,7 +52074,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -49234,16 +53921,16 @@
+@@ -49258,16 +53945,16 @@
if test "$kde_cv_covariant_return" = "no"; then
@@ -52069,7 +52095,7 @@
fi
-@@ -49252,8 +53939,8 @@
+@@ -49276,8 +53963,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -52080,7 +52106,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49268,29 +53955,30 @@
+@@ -49292,29 +53979,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -52117,7 +52143,7 @@
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -49321,18 +54009,19 @@
+@@ -49345,18 +54033,19 @@
for ac_header in sys/loadavg.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52145,7 +52171,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49343,24 +54032,36 @@
+@@ -49367,24 +54056,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -52190,7 +52216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49369,15 +54070,16 @@
+@@ -49393,15 +54094,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52213,7 +52239,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49386,8 +54088,13 @@
+@@ -49410,8 +54112,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -52229,7 +52255,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -49411,9 +54118,10 @@
+@@ -49435,9 +54142,10 @@
ac_header_preproc=no
fi
@@ -52242,7 +52268,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49437,25 +54145,19 @@
+@@ -49461,25 +54169,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;}
@@ -52275,7 +52301,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -49473,8 +54175,7 @@
+@@ -49497,8 +54199,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -52285,7 +52311,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49483,8 +54184,8 @@
+@@ -49507,8 +54208,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -52296,7 +52322,7 @@
if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49499,24 +54200,36 @@
+@@ -49523,24 +54224,36 @@
#include <X11/extensions/Xcomposite.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -52341,7 +52367,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49525,12 +54238,13 @@
+@@ -49549,12 +54262,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52359,7 +52385,7 @@
if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
xcomposite_h=yes
else
-@@ -49556,8 +54270,8 @@
+@@ -49580,8 +54294,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -52370,7 +52396,7 @@
if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49570,40 +54284,52 @@
+@@ -49594,40 +54308,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -52435,7 +52461,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49612,14 +54338,15 @@
+@@ -49636,14 +54362,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52455,7 +52481,7 @@
if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
LIB_XCOMPOSITE=-lXcomposite
-@@ -49643,8 +54370,7 @@
+@@ -49667,8 +54394,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -52465,7 +52491,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49653,8 +54379,8 @@
+@@ -49677,8 +54403,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -52476,7 +52502,7 @@
if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49669,24 +54395,36 @@
+@@ -49693,24 +54419,36 @@
#include <X11/extensions/Xfixes.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -52521,7 +52547,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49695,12 +54433,13 @@
+@@ -49719,12 +54457,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52539,7 +52565,7 @@
if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
xfixes_h=yes
else
-@@ -49726,8 +54465,8 @@
+@@ -49750,8 +54489,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -52550,7 +52576,7 @@
if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49740,40 +54479,52 @@
+@@ -49764,40 +54503,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -52615,7 +52641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49782,14 +54533,15 @@
+@@ -49806,14 +54557,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52635,7 +52661,7 @@
if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
LIB_XFIXES=-lXfixes
-@@ -49816,26 +54568,26 @@
+@@ -49840,26 +54592,26 @@
ssl_libraries=""
ssl_includes=""
@@ -52672,16 +52698,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -49850,7 +54602,7 @@
+@@ -49874,7 +54626,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 49853: $i/$j" >&5
-+ echo "configure: 54605: $i/$j" >&5
+- echo "configure: 49877: $i/$j" >&5
++ echo "configure: 54629: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49897,24 +54649,36 @@
+@@ -49921,24 +54673,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52726,7 +52752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49924,10 +54688,11 @@
+@@ -49948,10 +54712,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52740,7 +52766,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_ldflags_safe"
-@@ -49945,26 +54710,26 @@
+@@ -49969,26 +54734,26 @@
eval "$ac_cv_have_ssl"
@@ -52780,7 +52806,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50037,8 +54802,8 @@
+@@ -50061,8 +54826,8 @@
eval "$ac_cv_ssl_version"
@@ -52791,7 +52817,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -50097,10 +54862,9 @@
+@@ -50121,10 +54886,9 @@
@@ -52803,7 +52829,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50113,18 +54877,19 @@
+@@ -50137,18 +54901,19 @@
for ac_header in sasl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52831,7 +52857,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50135,24 +54900,36 @@
+@@ -50159,24 +54924,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -52876,7 +52902,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50161,15 +54938,16 @@
+@@ -50185,15 +54962,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52899,7 +52925,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50178,8 +54956,13 @@
+@@ -50202,8 +54980,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -52915,7 +52941,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -50203,9 +54986,10 @@
+@@ -50227,9 +55010,10 @@
ac_header_preproc=no
fi
@@ -52928,7 +52954,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50229,25 +55013,19 @@
+@@ -50253,25 +55037,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;}
@@ -52961,7 +52987,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50270,10 +55048,9 @@
+@@ -50294,10 +55072,9 @@
@@ -52973,7 +52999,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50286,18 +55063,19 @@
+@@ -50310,18 +55087,19 @@
for ac_header in sasl/sasl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -53001,7 +53027,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50308,24 +55086,36 @@
+@@ -50332,24 +55110,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -53046,7 +53072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50334,15 +55124,16 @@
+@@ -50358,15 +55148,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53069,7 +53095,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50351,8 +55142,13 @@
+@@ -50375,8 +55166,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -53085,7 +53111,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -50376,9 +55172,10 @@
+@@ -50400,9 +55196,10 @@
ac_header_preproc=no
fi
@@ -53098,7 +53124,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50402,25 +55199,19 @@
+@@ -50426,25 +55223,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;}
@@ -53131,7 +53157,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50450,8 +55241,8 @@
+@@ -50474,8 +55265,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -53142,7 +53168,7 @@
if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50464,40 +55255,52 @@
+@@ -50488,40 +55279,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -53207,7 +53233,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50506,14 +55309,15 @@
+@@ -50530,14 +55333,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53227,7 +53253,7 @@
if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
SASL2_LIBS="-lsasl2"
fi
-@@ -50533,15 +55337,14 @@
+@@ -50557,15 +55361,14 @@
@@ -53246,7 +53272,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50573,24 +55376,36 @@
+@@ -50597,24 +55400,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53291,7 +53317,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50599,9 +55414,10 @@
+@@ -50623,9 +55438,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53304,7 +53330,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -50613,8 +55429,8 @@
+@@ -50637,8 +55453,8 @@
fi
@@ -53315,7 +53341,7 @@
if test ! "$ac_cv_lib_bzip2" = no; then
BZIP2DIR=bzip2
-@@ -50627,16 +55443,15 @@
+@@ -50651,16 +55467,15 @@
cxx_shared_flag=
ld_shared_flag=
@@ -53336,7 +53362,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50663,24 +55478,36 @@
+@@ -50687,24 +55502,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53381,7 +53407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50689,8 +55516,10 @@
+@@ -50713,8 +55540,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53393,7 +53419,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -50703,30 +55532,29 @@
+@@ -50727,30 +55556,29 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -53432,7 +53458,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50753,24 +55581,36 @@
+@@ -50777,24 +55605,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53477,7 +53503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50779,8 +55619,10 @@
+@@ -50803,8 +55643,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53489,7 +53515,7 @@
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -50793,29 +55635,28 @@
+@@ -50817,29 +55659,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -53526,7 +53552,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50848,24 +55689,36 @@
+@@ -50872,24 +55713,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53571,7 +53597,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50874,9 +55727,10 @@
+@@ -50898,9 +55751,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53584,7 +53610,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -50889,8 +55743,8 @@
+@@ -50913,8 +55767,8 @@
fi
@@ -53595,7 +53621,7 @@
if test ! "$ac_cv_lib_bzip2_prefix" = no; then
BZIP2DIR=bzip2
-@@ -50931,18 +55785,19 @@
+@@ -50955,18 +55809,19 @@
for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -53623,7 +53649,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50953,24 +55808,36 @@
+@@ -50977,24 +55832,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -53668,7 +53694,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50979,15 +55846,16 @@
+@@ -51003,15 +55870,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53691,7 +53717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50996,8 +55864,13 @@
+@@ -51020,8 +55888,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -53707,7 +53733,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -51021,9 +55894,10 @@
+@@ -51045,9 +55918,10 @@
ac_header_preproc=no
fi
@@ -53720,7 +53746,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51047,25 +55921,19 @@
+@@ -51071,25 +55945,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;}
@@ -53753,7 +53779,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -51086,9 +55954,9 @@
+@@ -51110,9 +55978,9 @@
for ac_func in getpt openpty isastream
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53766,7 +53792,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51114,53 +55982,59 @@
+@@ -51138,53 +56006,59 @@
#undef $ac_func
@@ -53845,7 +53871,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51169,13 +56043,15 @@
+@@ -51193,13 +56067,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53865,7 +53891,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -51186,13 +56062,12 @@
+@@ -51210,13 +56086,12 @@
LIBS="$kde_save_LIBS"
@@ -53883,7 +53909,7 @@
yes)
with_ldap=CHECK
;;
-@@ -51200,7 +56075,8 @@
+@@ -51224,7 +56099,8 @@
else
with_ldap=CHECK
@@ -53893,25 +53919,25 @@
if test "x$with_ldap" = "xCHECK" ; then
with_ldap=NOTFOUND
search_incs="$kde_includes /usr/include /usr/local/include"
-@@ -51210,7 +56086,7 @@
+@@ -51234,7 +56110,7 @@
do
for j in ldap.h;
do
-- echo "configure: 51213: $i/$j" >&5
-+ echo "configure: 56089: $i/$j" >&5
+- echo "configure: 51237: $i/$j" >&5
++ echo "configure: 56113: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -51232,7 +56108,7 @@
+@@ -51256,7 +56132,7 @@
do
for j in libldap.$ext;
do
-- echo "configure: 51235: $i/$j" >&5
-+ echo "configure: 56111: $i/$j" >&5
+- echo "configure: 51259: $i/$j" >&5
++ echo "configure: 56135: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -51255,8 +56131,8 @@
+@@ -51279,8 +56155,8 @@
fi
case "$with_ldap" in
@@ -53922,7 +53948,7 @@
framework)
LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
-@@ -51265,18 +56141,18 @@
+@@ -51289,18 +56165,18 @@
_ACEOF
LDAP_SUBDIR="ldap"
@@ -53949,7 +53975,7 @@
;;
esac
-@@ -51290,8 +56166,8 @@
+@@ -51314,8 +56190,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -53960,7 +53986,7 @@
if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51304,40 +56180,52 @@
+@@ -51328,40 +56204,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54025,7 +54051,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51346,14 +56234,15 @@
+@@ -51370,14 +56258,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54045,7 +54071,7 @@
if test $ac_cv_lib_lber_ber_alloc = yes; then
LIB_LBER=-llber
fi
-@@ -51363,8 +56252,8 @@
+@@ -51387,8 +56276,8 @@
@@ -54056,7 +54082,7 @@
if test "x$with_ldap" != "xFOUND" ; then
LDAP_ROOT="$with_ldap"
-@@ -51384,7 +56273,6 @@
+@@ -51408,7 +56297,6 @@
LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
@@ -54064,7 +54090,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -51414,24 +56302,36 @@
+@@ -51438,24 +56326,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -54109,7 +54135,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51440,10 +56340,11 @@
+@@ -51464,10 +56364,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54123,7 +54149,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -51458,8 +56359,8 @@
+@@ -51482,8 +56383,8 @@
LDAP_LIBS=
LDAP_RPATH=
LDAP_SUBDIR=
@@ -54134,7 +54160,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -51467,8 +56368,8 @@
+@@ -51491,8 +56392,8 @@
_ACEOF
LDAP_SUBDIR="ldap"
@@ -54145,7 +54171,7 @@
fi
-@@ -51489,17 +56390,17 @@
+@@ -51513,17 +56414,17 @@
########### Check for linux/cdrom.h
if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
@@ -54169,7 +54195,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51510,24 +56411,36 @@
+@@ -51534,24 +56435,36 @@
#include <linux/cdrom.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -54214,7 +54240,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51536,15 +56449,16 @@
+@@ -51560,15 +56473,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54237,7 +54263,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51553,8 +56467,13 @@
+@@ -51577,8 +56491,13 @@
/* end confdefs.h. */
#include <linux/cdrom.h>
_ACEOF
@@ -54253,7 +54279,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -51578,9 +56497,10 @@
+@@ -51602,9 +56521,10 @@
ac_header_preproc=no
fi
@@ -54266,7 +54292,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51604,25 +56524,18 @@
+@@ -51628,25 +56548,18 @@
echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
@@ -54297,7 +54323,7 @@
fi
if test $ac_cv_header_linux_cdrom_h = yes; then
-@@ -51641,19 +56554,19 @@
+@@ -51665,19 +56578,19 @@
@@ -54323,25 +54349,25 @@
hal_inc=NOTFOUND
hal_lib=NOTFOUND
-@@ -51666,7 +56579,7 @@
+@@ -51690,7 +56603,7 @@
do
for j in libhal.h libhal-storage.h;
do
-- echo "configure: 51669: $i/$j" >&5
-+ echo "configure: 56582: $i/$j" >&5
+- echo "configure: 51693: $i/$j" >&5
++ echo "configure: 56606: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -51688,7 +56601,7 @@
+@@ -51712,7 +56625,7 @@
do
for j in libhal.so libhal-storage.so;
do
-- echo "configure: 51691: $i/$j" >&5
-+ echo "configure: 56604: $i/$j" >&5
+- echo "configure: 51715: $i/$j" >&5
++ echo "configure: 56628: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -51717,8 +56630,8 @@
+@@ -51741,8 +56654,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -54352,7 +54378,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51733,28 +56646,29 @@
+@@ -51757,28 +56670,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54388,7 +54414,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -51765,25 +56679,25 @@
+@@ -51789,25 +56703,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -54426,7 +54452,7 @@
else
HAL_CFLAGS=""
HAL_LIBS=""
-@@ -51804,20 +56718,20 @@
+@@ -51828,20 +56742,20 @@
if test $succeeded = yes; then
HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
else
@@ -54453,7 +54479,7 @@
fi
-@@ -51827,8 +56741,8 @@
+@@ -51851,8 +56765,8 @@
########### Check for DBus
@@ -54464,34 +54490,34 @@
dbus_inc=NOTFOUND
dbus_lib=NOTFOUND
-@@ -51841,7 +56755,7 @@
+@@ -51865,7 +56779,7 @@
do
for j in dbus/dbus.h;
do
-- echo "configure: 51844: $i/$j" >&5
-+ echo "configure: 56758: $i/$j" >&5
+- echo "configure: 51868: $i/$j" >&5
++ echo "configure: 56782: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -51858,7 +56772,7 @@
+@@ -51882,7 +56796,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
-- echo "configure: 51861: $i/$j" >&5
-+ echo "configure: 56775: $i/$j" >&5
+- echo "configure: 51885: $i/$j" >&5
++ echo "configure: 56799: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -51880,7 +56794,7 @@
+@@ -51904,7 +56818,7 @@
do
for j in libdbus-1.so;
do
-- echo "configure: 51883: $i/$j" >&5
-+ echo "configure: 56797: $i/$j" >&5
+- echo "configure: 51907: $i/$j" >&5
++ echo "configure: 56821: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -51909,8 +56823,8 @@
+@@ -51933,8 +56847,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -54502,7 +54528,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51925,28 +56839,29 @@
+@@ -51949,28 +56863,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -54538,7 +54564,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -51957,25 +56872,25 @@
+@@ -51981,25 +56896,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -54576,7 +54602,7 @@
else
DBUS_CFLAGS=""
DBUS_LIBS=""
-@@ -51996,8 +56911,8 @@
+@@ -52020,8 +56935,8 @@
if test $succeeded = yes; then
DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
else
@@ -54587,7 +54613,7 @@
fi
-@@ -52014,12 +56929,12 @@
+@@ -52038,12 +56953,12 @@
if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
@@ -54604,7 +54630,7 @@
fi
-@@ -52027,8 +56942,8 @@
+@@ -52051,8 +56966,8 @@
########### Check for DBus-Qt3 bindings
@@ -54615,43 +54641,43 @@
dbusqt_inc=NOTFOUND
dbusqt_lib=NOTFOUND
-@@ -52041,7 +56956,7 @@
+@@ -52065,7 +56980,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 52044: $i/$j" >&5
-+ echo "configure: 56959: $i/$j" >&5
+- echo "configure: 52068: $i/$j" >&5
++ echo "configure: 56983: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -52068,7 +56983,7 @@
+@@ -52092,7 +57007,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 52071: $i/$j" >&5
-+ echo "configure: 56986: $i/$j" >&5
+- echo "configure: 52095: $i/$j" >&5
++ echo "configure: 57010: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -52092,7 +57007,7 @@
+@@ -52116,7 +57031,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 52095: $i/$j" >&5
-+ echo "configure: 57010: $i/$j" >&5
+- echo "configure: 52119: $i/$j" >&5
++ echo "configure: 57034: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -52118,7 +57033,7 @@
+@@ -52142,7 +57057,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 52121: $i/$j" >&5
-+ echo "configure: 57036: $i/$j" >&5
+- echo "configure: 52145: $i/$j" >&5
++ echo "configure: 57060: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -52137,12 +57052,12 @@
+@@ -52161,12 +57076,12 @@
if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
@@ -54668,7 +54694,7 @@
fi
-@@ -52151,8 +57066,8 @@
+@@ -52175,8 +57090,8 @@
########### Check if media HAL backend sould be compiled
@@ -54679,7 +54705,7 @@
HALBACKEND=no
if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-@@ -52163,11 +57078,11 @@
+@@ -52187,11 +57102,11 @@
HALBACKEND=yes
@@ -54695,7 +54721,7 @@
fi
-@@ -52194,15 +57109,15 @@
+@@ -52218,15 +57133,15 @@
@@ -54716,7 +54742,7 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52210,8 +57125,8 @@
+@@ -52234,8 +57149,8 @@
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@@ -54727,7 +54753,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52235,25 +57150,37 @@
+@@ -52259,25 +57174,37 @@
return 0;
}
_ACEOF
@@ -54774,7 +54800,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52262,28 +57189,42 @@
+@@ -52286,28 +57213,42 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54828,7 +54854,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52292,22 +57233,24 @@
+@@ -52316,22 +57257,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54858,7 +54884,7 @@
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52337,24 +57280,36 @@
+@@ -52361,24 +57304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54903,7 +54929,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52363,8 +57318,10 @@
+@@ -52387,8 +57342,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54915,7 +54941,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52390,24 +57347,36 @@
+@@ -52414,24 +57371,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54960,7 +54986,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52416,13 +57385,15 @@
+@@ -52440,13 +57409,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54979,7 +55005,7 @@
if test "$ac_cv_sys_file_offset_bits" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -52431,8 +57402,8 @@
+@@ -52455,8 +57426,8 @@
fi
rm -f conftest*
@@ -54990,7 +55016,7 @@
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52462,24 +57433,36 @@
+@@ -52486,24 +57457,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -55035,7 +55061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52488,8 +57471,10 @@
+@@ -52512,8 +57495,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55047,7 +55073,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52515,24 +57500,36 @@
+@@ -52539,24 +57524,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -55092,7 +55118,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52541,13 +57538,15 @@
+@@ -52565,13 +57562,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55111,7 +55137,7 @@
if test "$ac_cv_sys_large_files" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -52571,13 +57570,13 @@
+@@ -52595,13 +57594,13 @@
@@ -55129,7 +55155,7 @@
have_libsmbclient=no
if test "x$with_samba" != xno; then
-@@ -52586,8 +57585,7 @@
+@@ -52610,8 +57609,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -55139,7 +55165,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -52597,17 +57595,17 @@
+@@ -52621,17 +57619,17 @@
if test "${ac_cv_header_libsmbclient_h+set}" = set; then
@@ -55163,7 +55189,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52618,24 +57616,36 @@
+@@ -52642,24 +57640,36 @@
#include <libsmbclient.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -55208,7 +55234,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52644,15 +57654,16 @@
+@@ -52668,15 +57678,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55231,7 +55257,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52661,8 +57672,13 @@
+@@ -52685,8 +57696,13 @@
/* end confdefs.h. */
#include <libsmbclient.h>
_ACEOF
@@ -55247,7 +55273,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -52686,9 +57702,10 @@
+@@ -52710,9 +57726,10 @@
ac_header_preproc=no
fi
@@ -55260,7 +55286,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -52712,25 +57729,18 @@
+@@ -52736,25 +57753,18 @@
echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
@@ -55291,7 +55317,7 @@
fi
if test $ac_cv_header_libsmbclient_h = yes; then
-@@ -52758,8 +57768,8 @@
+@@ -52782,8 +57792,8 @@
;;
esac
@@ -55302,7 +55328,7 @@
if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52772,40 +57782,52 @@
+@@ -52796,40 +57806,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55367,7 +55393,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52814,14 +57836,15 @@
+@@ -52838,14 +57860,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55387,7 +55413,7 @@
if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSMBCLIENT 1
-@@ -52838,8 +57861,8 @@
+@@ -52862,8 +57885,8 @@
SMBCLIENT_EXTRA_LIBS=""
@@ -55398,7 +55424,7 @@
if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52866,53 +57889,59 @@
+@@ -52890,53 +57913,59 @@
#undef yp_get_default_domain
@@ -55477,7 +55503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52921,13 +57950,14 @@
+@@ -52945,13 +57974,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55496,7 +55522,7 @@
if test $ac_cv_func_yp_get_default_domain = yes; then
:
else
-@@ -52941,8 +57971,8 @@
+@@ -52965,8 +57995,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -55507,7 +55533,7 @@
if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52955,40 +57985,52 @@
+@@ -52979,40 +58009,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55572,7 +55598,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52997,14 +58039,15 @@
+@@ -53021,14 +58063,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55592,7 +55618,7 @@
if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
SMBCLIENT_EXTRA_LIBS="-lnsl"
fi
-@@ -53039,13 +58082,13 @@
+@@ -53063,13 +58106,13 @@
@@ -55610,7 +55636,7 @@
if test "x$with_openexr" != xno; then
-@@ -53058,8 +58101,8 @@
+@@ -53082,8 +58125,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -55621,7 +55647,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53074,56 +58117,56 @@
+@@ -53098,56 +58141,56 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -55694,7 +55720,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53158,24 +58201,36 @@
+@@ -53182,24 +58225,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55739,7 +55765,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53184,10 +58239,11 @@
+@@ -53208,10 +58263,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55753,7 +55779,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -53206,11 +58262,11 @@
+@@ -53230,11 +58286,11 @@
_ACEOF
LIB_EXR="$ac_cv_libexr"
@@ -55769,7 +55795,7 @@
LIB_EXR=""
fi
fi
-@@ -53242,8 +58298,7 @@
+@@ -53266,8 +58322,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -55779,7 +55805,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53252,8 +58307,8 @@
+@@ -53276,8 +58331,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -55790,7 +55816,7 @@
if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53268,24 +58323,36 @@
+@@ -53292,24 +58347,36 @@
#include <X11/extensions/Xfixes.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -55835,7 +55861,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53294,12 +58361,13 @@
+@@ -53318,12 +58385,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55853,7 +55879,7 @@
if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
xfixes_h=yes
else
-@@ -53325,8 +58393,8 @@
+@@ -53349,8 +58417,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -55864,7 +55890,7 @@
if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53339,40 +58407,52 @@
+@@ -53363,40 +58431,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55929,7 +55955,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53381,14 +58461,15 @@
+@@ -53405,14 +58485,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55949,7 +55975,7 @@
if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
LIB_XFIXES=-lXfixes
-@@ -53416,15 +58497,14 @@
+@@ -53440,15 +58521,14 @@
kde_mallinfo_type=
@@ -55968,7 +55994,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53457,24 +58537,36 @@
+@@ -53481,24 +58561,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -56013,7 +56039,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53483,9 +58575,10 @@
+@@ -53507,9 +58599,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56026,7 +56052,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53498,20 +58591,19 @@
+@@ -53522,20 +58615,19 @@
if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
kde_mallinfo_type=stdlib
fi
@@ -56052,7 +56078,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53544,24 +58636,36 @@
+@@ -53568,24 +58660,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -56097,7 +56123,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53570,9 +58674,10 @@
+@@ -53594,9 +58698,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56110,7 +56136,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53585,8 +58690,8 @@
+@@ -53609,8 +58714,8 @@
if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
kde_mallinfo_type=malloc
fi
@@ -56121,7 +56147,7 @@
fi
-@@ -53597,40 +58702,52 @@
+@@ -53621,40 +58726,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -56186,7 +56212,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53639,8 +58756,8 @@
+@@ -53663,8 +58780,8 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56197,7 +56223,7 @@
if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53653,40 +58770,52 @@
+@@ -53677,40 +58794,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -56262,7 +56288,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53695,14 +58824,15 @@
+@@ -53719,14 +58848,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56282,7 +56308,7 @@
if test $ac_cv_lib_malloc_mallinfo = yes; then
LIBMALLOC="-lmalloc"
-@@ -53712,20 +58842,20 @@
+@@ -53736,20 +58866,20 @@
fi
@@ -56308,7 +56334,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53809,13 +58939,22 @@
+@@ -53833,13 +58963,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -56335,7 +56361,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53828,8 +58967,10 @@
+@@ -53852,8 +58991,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_hblkhd=no
fi
@@ -56347,7 +56373,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53839,8 +58980,8 @@
+@@ -53863,8 +59004,8 @@
fi
@@ -56358,7 +56384,7 @@
kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
if test "$kde_mallinfo_hblkhd" = "yes"; then
-@@ -53851,15 +58992,14 @@
+@@ -53875,15 +59016,14 @@
fi
@@ -56377,7 +56403,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53943,13 +59083,22 @@
+@@ -53967,13 +59107,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -56404,7 +56430,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53962,8 +59111,10 @@
+@@ -53986,8 +59135,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_uordblks=no
fi
@@ -56416,7 +56442,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53973,8 +59124,8 @@
+@@ -53997,8 +59148,8 @@
fi
@@ -56427,7 +56453,7 @@
kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
if test "$kde_mallinfo_uordblks" = "yes"; then
-@@ -53985,15 +59136,14 @@
+@@ -54009,15 +59160,14 @@
fi
@@ -56446,7 +56472,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54077,13 +59227,22 @@
+@@ -54101,13 +59251,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -56473,7 +56499,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54096,8 +59255,10 @@
+@@ -54120,8 +59279,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_usmblks=no
fi
@@ -56485,7 +56511,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -54107,8 +59268,8 @@
+@@ -54131,8 +59292,8 @@
fi
@@ -56496,7 +56522,7 @@
kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
if test "$kde_mallinfo_usmblks" = "yes"; then
-@@ -54140,14 +59301,14 @@
+@@ -54164,14 +59325,14 @@
fi
@@ -56517,7 +56543,7 @@
if test "$ac_use_openpty" = "yes"; then
kde_safe_LIBS=$LIBS
LIBS="$LIBS $LIBUTIL"
-@@ -54178,13 +59339,22 @@
+@@ -54202,13 +59363,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -56544,7 +56570,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54197,8 +59367,10 @@
+@@ -54221,8 +59391,10 @@
( exit $ac_status )
ac_use_openpty="no"
fi
@@ -56556,7 +56582,7 @@
LIBS=$kde_safe_LIBS
fi
if test "$ac_use_openpty" = "yes"; then
-@@ -54207,21 +59379,21 @@
+@@ -54231,21 +59403,21 @@
#define HAVE_OPENPTY 1
_ACEOF
@@ -56586,7 +56612,7 @@
case "$cwd_method" in
proc)
-@@ -54237,9 +59409,9 @@
+@@ -54261,9 +59433,9 @@
for ac_func in _IceTransNoListen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56599,7 +56625,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -54265,53 +59437,59 @@
+@@ -54289,53 +59461,59 @@
#undef $ac_func
@@ -56678,7 +56704,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54320,13 +59498,15 @@
+@@ -54344,13 +59522,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56698,7 +56724,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -54340,11 +59520,11 @@
+@@ -54364,11 +59544,11 @@
LIB_XINERAMA=
@@ -56713,7 +56739,7 @@
if test "x$with_xinerama" != "xno"; then
xinerama_save_ldflags="$LDFLAGS"
-@@ -54354,8 +59534,7 @@
+@@ -54378,8 +59558,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -56723,7 +56749,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54364,8 +59543,8 @@
+@@ -54388,8 +59567,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -56734,7 +56760,7 @@
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54382,24 +59561,36 @@
+@@ -54406,24 +59585,36 @@
#include <X11/extensions/Xinerama.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -56779,7 +56805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54408,16 +59599,17 @@
+@@ -54432,16 +59623,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56803,7 +56829,7 @@
if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54430,40 +59622,52 @@
+@@ -54454,40 +59646,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -56868,7 +56894,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54472,14 +59676,15 @@
+@@ -54496,14 +59700,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56888,7 +56914,7 @@
if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
-@@ -54509,8 +59714,8 @@
+@@ -54533,8 +59738,8 @@
fi
@@ -56899,7 +56925,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-@@ -54522,8 +59727,8 @@
+@@ -54546,8 +59751,8 @@
*) ksysguardd_compile=no; UNAME='' ;;
esac
@@ -56910,7 +56936,7 @@
-@@ -54608,23 +59813,22 @@
+@@ -54632,23 +59837,22 @@
@@ -56939,7 +56965,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54637,18 +59841,19 @@
+@@ -54661,18 +59865,19 @@
for ac_header in sensors/sensors.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -56967,7 +56993,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54659,24 +59864,36 @@
+@@ -54683,24 +59888,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -57012,7 +57038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54685,15 +59902,16 @@
+@@ -54709,15 +59926,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57035,7 +57061,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54702,8 +59920,13 @@
+@@ -54726,8 +59944,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -57051,7 +57077,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -54727,9 +59950,10 @@
+@@ -54751,9 +59974,10 @@
ac_header_preproc=no
fi
@@ -57064,7 +57090,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -54753,25 +59977,19 @@
+@@ -54777,25 +60001,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;}
@@ -57097,7 +57123,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -54800,8 +60018,8 @@
+@@ -54824,8 +60042,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -57108,7 +57134,7 @@
if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54814,40 +60032,52 @@
+@@ -54838,40 +60056,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -57173,7 +57199,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54856,14 +60086,15 @@
+@@ -54880,14 +60110,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57193,7 +57219,7 @@
if test $ac_cv_lib_sensors_sensors_init = yes; then
LIBSENSORS="-lsensors"
fi
-@@ -54900,16 +60131,16 @@
+@@ -54924,16 +60155,16 @@
#MIN_CONFIG
@@ -57216,7 +57242,7 @@
save_dnssdtest_LIBS="$LIBS"
save_dnssdtest_LDFLAGS="$LDFLAGS"
save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-@@ -54941,24 +60172,36 @@
+@@ -54965,24 +60196,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -57261,7 +57287,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54973,20 +60216,21 @@
+@@ -54997,20 +60240,21 @@
*) LIB_DNSSD="-ldns_sd" ;;
esac
have_libdns_sd="yes"
@@ -57288,7 +57314,7 @@
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS=$save_dnssdtest_CPPFLAGS
LDFLAGS=$save_dnssdtest_LDFLAGS
-@@ -55009,10 +60253,9 @@
+@@ -55033,10 +60277,9 @@
@@ -57300,7 +57326,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55025,9 +60268,9 @@
+@@ -55049,9 +60292,9 @@
for ac_header in X11/extensions/Xdamage.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -57313,7 +57339,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55041,24 +60284,36 @@
+@@ -55065,24 +60308,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -57358,7 +57384,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55067,12 +60322,14 @@
+@@ -55091,12 +60346,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57377,7 +57403,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55096,10 +60353,9 @@
+@@ -55120,10 +60377,9 @@
@@ -57389,7 +57415,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55112,9 +60368,9 @@
+@@ -55136,9 +60392,9 @@
for ac_header in X11/extensions/Xcomposite.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -57402,7 +57428,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55128,24 +60384,36 @@
+@@ -55152,24 +60408,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -57447,7 +57473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55154,12 +60422,14 @@
+@@ -55178,12 +60446,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57466,7 +57492,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55183,10 +60453,9 @@
+@@ -55207,10 +60477,9 @@
@@ -57478,7 +57504,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55199,9 +60468,9 @@
+@@ -55223,9 +60492,9 @@
for ac_header in X11/extensions/Xrender.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -57491,7 +57517,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55215,24 +60484,36 @@
+@@ -55239,24 +60508,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -57536,7 +57562,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55241,12 +60522,14 @@
+@@ -55265,12 +60546,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57555,7 +57581,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55285,8 +60568,7 @@
+@@ -55309,8 +60592,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -57565,7 +57591,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55296,17 +60578,17 @@
+@@ -55320,17 +60602,17 @@
if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -57589,7 +57615,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55317,24 +60599,36 @@
+@@ -55341,24 +60623,36 @@
#include <X11/Xlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -57634,7 +57660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55343,15 +60637,16 @@
+@@ -55367,15 +60661,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57657,7 +57683,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55360,8 +60655,13 @@
+@@ -55384,8 +60679,13 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
_ACEOF
@@ -57673,7 +57699,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -55385,9 +60685,10 @@
+@@ -55409,9 +60709,10 @@
ac_header_preproc=no
fi
@@ -57686,7 +57712,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -55411,25 +60712,18 @@
+@@ -55435,25 +60736,18 @@
echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
@@ -57717,7 +57743,7 @@
fi
-@@ -55446,8 +60740,7 @@
+@@ -55470,8 +60764,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -57727,7 +57753,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55456,8 +60749,8 @@
+@@ -55480,8 +60773,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -57738,7 +57764,7 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -55474,24 +60767,36 @@
+@@ -55498,24 +60791,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -57783,7 +57809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55500,12 +60805,13 @@
+@@ -55524,12 +60829,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57801,7 +57827,7 @@
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
:
else
-@@ -55525,8 +60831,7 @@
+@@ -55549,8 +60855,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -57811,7 +57837,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55535,8 +60840,8 @@
+@@ -55559,8 +60864,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -57822,7 +57848,7 @@
if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -55555,24 +60860,36 @@
+@@ -55579,24 +60884,36 @@
#include <X11/extensions/XKBrules.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -57867,7 +57893,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55581,12 +60898,13 @@
+@@ -55605,12 +60922,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57885,7 +57911,7 @@
if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
:
else
-@@ -55623,8 +60941,8 @@
+@@ -55647,8 +60965,8 @@
fi
for i in $ac_topsubdirs; do
@@ -57896,7 +57922,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -55635,8 +60953,8 @@
+@@ -55659,8 +60977,8 @@
else
install_it="no"
fi
@@ -57907,7 +57933,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -57092,39 +62410,58 @@
+@@ -57116,39 +62434,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -57982,7 +58008,7 @@
fi
fi
rm -f confcache
-@@ -57133,38 +62470,31 @@
+@@ -57157,38 +62494,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -58034,7 +58060,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -57749,11 +63079,35 @@
+@@ -57773,11 +63103,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -58072,7 +58098,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -57762,8 +63116,43 @@
+@@ -57786,8 +63140,43 @@
fi
@@ -58117,7 +58143,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -57777,18 +63166,19 @@
+@@ -57801,18 +63190,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -58140,7 +58166,7 @@
as_basename=basename
else
as_basename=false
-@@ -57796,159 +63186,120 @@
+@@ -57820,159 +63210,120 @@
# Name of the executable.
@@ -58371,7 +58397,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -57957,7 +63308,19 @@
+@@ -57981,7 +63332,19 @@
as_mkdir_p=false
fi
@@ -58392,7 +58418,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -57966,31 +63329,14 @@
+@@ -57990,31 +63353,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -58428,7 +58454,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -57998,30 +63344,20 @@
+@@ -58022,30 +63368,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -58467,7 +58493,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -58029,7 +63365,7 @@
+@@ -58053,7 +63389,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -58476,7 +58502,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -58048,19 +63384,21 @@
+@@ -58072,19 +63408,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -58504,7 +58530,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -58071,39 +63409,24 @@
+@@ -58095,39 +63433,24 @@
do
case $1 in
--*=*)
@@ -58550,7 +58576,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -58113,18 +63436,24 @@
+@@ -58137,18 +63460,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -58580,7 +58606,7 @@
esac
shift
-@@ -58140,529 +63469,541 @@
+@@ -58164,529 +63493,541 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -59625,7 +59651,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -58674,739 +64015,1013 @@
+@@ -58698,739 +64039,1013 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -61317,7 +61343,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -59414,248 +65029,130 @@
+@@ -59438,248 +65053,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -61667,7 +61693,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -59666,135 +65163,39 @@
+@@ -59690,135 +65187,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -61829,7 +61855,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -59804,18 +65205,29 @@
+@@ -59828,18 +65229,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -61867,7 +61893,7 @@
else
continue
fi
-@@ -59837,53 +65249,79 @@
+@@ -59861,53 +65273,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -61978,15 +62004,17 @@
_ACEOF
--- configure.in
+++ configure.in
-@@ -42,6 +42,8 @@
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.5.5") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdebase, "3.5.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdebasea, "3.5.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
-+AM_MAINTAINER_MODE
-+
KDE_SET_PREFIX
- dnl generate the config header
--- doc/faq/Makefile.in
+++ doc/faq/Makefile.in
@@ -107,6 +107,7 @@
More information about the pkg-kde-commits
mailing list