rev 3831 - trunk/packages/kdelibs/debian/patches
Pierre Habouzit
madcoder at costa.debian.org
Sun May 28 15:35:04 UTC 2006
Author: madcoder
Date: 2006-05-28 15:34:54 +0000 (Sun, 28 May 2006)
New Revision: 3831
Modified:
trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
okay, it's indeed better to have build-dep from kdelibs installed when
running the buildprep script (crap)
Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-05-28 15:23:30 UTC (rev 3830)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-05-28 15:34:54 UTC (rev 3831)
@@ -5257,7 +5257,7 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,448 @@
+@@ -455,17 +745,449 @@
#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
@@ -5706,12 +5706,13 @@
+CXXCPP
+F77
+FFLAGS
-+XMKMF'
++XMKMF
++PKG_CONFIG'
+
# Initialize some variables set by options.
ac_init_help=
-@@ -492,34 +1213,48 @@
+@@ -492,34 +1214,48 @@
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -5767,7 +5768,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -541,12 +1276,18 @@
+@@ -541,12 +1277,18 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -5789,7 +5790,7 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
-@@ -554,7 +1295,17 @@
+@@ -554,7 +1296,17 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5808,7 +5809,7 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1314,7 @@
+@@ -563,11 +1315,7 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5821,7 +5822,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1341,12 @@
+@@ -594,6 +1342,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -5834,7 +5835,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -618,13 +1371,16 @@
+@@ -618,13 +1372,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -5855,7 +5856,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1445,16 @@
+@@ -689,6 +1446,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -5872,7 +5873,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -745,11 +1511,7 @@
+@@ -745,11 +1512,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -5885,7 +5886,7 @@
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1520,7 @@
+@@ -758,7 +1521,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -5894,7 +5895,7 @@
--x)
# Obsolete; use --with-x.
-@@ -789,8 +1551,7 @@
+@@ -789,8 +1552,7 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -5904,7 +5905,7 @@
export $ac_envvar ;;
*)
-@@ -810,27 +1571,19 @@
+@@ -810,27 +1572,19 @@
{ (exit 1); exit 1; }; }
fi
@@ -5942,7 +5943,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1610,76 @@
+@@ -857,94 +1611,76 @@
test "$silent" = yes && exec 6>/dev/null
@@ -6094,7 +6095,7 @@
#
# Report the --help message.
-@@ -973,9 +1708,6 @@
+@@ -973,9 +1709,6 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -6104,7 +6105,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -993,15 +1725,22 @@
+@@ -993,15 +1726,22 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -6130,7 +6131,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1026,6 +1765,8 @@
+@@ -1026,6 +1766,8 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-fast-perl disable fast Makefile generation (needs perl)
@@ -6139,7 +6140,7 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1042,10 +1783,8 @@
+@@ -1042,10 +1784,8 @@
of memory)
--enable-closure delay template instantiation
--enable-nmcheck enable automatic namespace cleanness check
@@ -6152,7 +6153,7 @@
--enable-libsuffix /lib directory suffix (64,32,none,auto=default)
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
-@@ -1062,7 +1801,6 @@
+@@ -1062,7 +1802,6 @@
toolchain hidden visibility default=no
--enable-sendfile enable the use of sendfile() (Linux only)
--enable-mitshm use MIT-SHM for pixmap loading/saving
@@ -6160,7 +6161,7 @@
--disable-openpty disable openpty (UNIX98 terminals) support default=enabled
--enable-fast-malloc Use own malloc implementation : yes,no,full,debug
--disable-cups disable CUPS support default=auto
-@@ -1078,8 +1816,7 @@
+@@ -1078,8 +1817,7 @@
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -6170,7 +6171,7 @@
--with-acl enable support for POSIX ACLs [default=check]
--with-extra-includes=DIR
adds non standard include paths
-@@ -1091,8 +1828,7 @@
+@@ -1091,8 +1829,7 @@
--with-rgbfile=path Define custom path for rgb.txt. (default:
\$(x11libdir)/X11/rgb.txt)
--with-distribution indicate the distribution in bug reports
@@ -6180,7 +6181,7 @@
--with-lua-dir=DIR where the root of Lua 5.x is installed
--with-lua-includes=DIR where the Lua includes are
--with-lua-libraries=DIR
-@@ -1116,131 +1852,100 @@
+@@ -1116,131 +1853,101 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -6195,6 +6196,7 @@
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
+ XMKMF Path to xmkmf, Makefile generator for X Window System
++ PKG_CONFIG path to pkg-config utility
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -6363,7 +6365,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1259,7 +1964,7 @@
+@@ -1259,7 +1966,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`
@@ -6372,7 +6374,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`
-@@ -1273,6 +1978,7 @@
+@@ -1273,6 +1980,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -6380,7 +6382,7 @@
} >&5
-@@ -1305,7 +2011,7 @@
+@@ -1305,7 +2013,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -6389,7 +6391,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1340,8 +2046,8 @@
+@@ -1340,8 +2048,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.
@@ -6400,7 +6402,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1354,20 +2060,34 @@
+@@ -1354,20 +2062,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -6445,7 +6447,7 @@
echo
cat <<\_ASBOX
-@@ -1378,22 +2098,22 @@
+@@ -1378,22 +2100,22 @@
echo
for ac_var in $ac_subst_vars
do
@@ -6475,7 +6477,7 @@
done | sort
echo
fi
-@@ -1405,26 +2125,24 @@
+@@ -1405,26 +2127,24 @@
## ----------- ##
_ASBOX
echo
@@ -6507,7 +6509,7 @@
# Predefined preprocessor variables.
-@@ -1455,14 +2173,17 @@
+@@ -1455,14 +2175,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -6532,7 +6534,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;}
-@@ -1478,8 +2199,8 @@
+@@ -1478,8 +2201,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -6543,7 +6545,7 @@
esac
fi
else
-@@ -1491,12 +2212,11 @@
+@@ -1491,12 +2214,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -6559,7 +6561,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
-@@ -1521,8 +2241,7 @@
+@@ -1521,8 +2243,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -6569,7 +6571,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1539,12 +2258,6 @@
+@@ -1539,12 +2260,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -6582,7 +6584,7 @@
-@@ -1561,32 +2274,43 @@
+@@ -1561,32 +2276,43 @@
@@ -6635,7 +6637,7 @@
-@@ -1606,13 +2330,13 @@
+@@ -1606,13 +2332,13 @@
@@ -6653,7 +6655,7 @@
val=
-@@ -1631,79 +2355,123 @@
+@@ -1631,79 +2357,123 @@
# Make sure we can run config.sub.
@@ -6820,7 +6822,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1713,17 +2481,17 @@
+@@ -1713,17 +2483,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6841,7 +6843,7 @@
am__api_version="1.9"
-@@ -1745,8 +2513,8 @@
+@@ -1745,8 +2515,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.
@@ -6852,7 +6854,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1768,7 +2536,7 @@
+@@ -1768,7 +2538,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6861,7 +6863,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.
-@@ -1787,21 +2555,22 @@
+@@ -1787,21 +2557,22 @@
;;
esac
done
@@ -6889,7 +6891,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1815,8 +2584,8 @@
+@@ -1815,8 +2586,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
@@ -6900,7 +6902,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1828,8 +2597,8 @@
+@@ -1828,8 +2599,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6911,7 +6913,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1839,8 +2608,8 @@
+@@ -1839,8 +2610,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6922,7 +6924,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1882,8 +2651,8 @@
+@@ -1882,8 +2653,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6933,7 +6935,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1934,8 +2703,8 @@
+@@ -1934,8 +2705,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
@@ -6944,7 +6946,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1948,41 +2717,44 @@
+@@ -1948,41 +2719,44 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6999,7 +7001,7 @@
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
-@@ -1990,12 +2762,12 @@
+@@ -1990,12 +2764,12 @@
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
@@ -7016,7 +7018,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2066,8 +2838,8 @@
+@@ -2066,8 +2840,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
@@ -7027,7 +7029,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2080,32 +2852,34 @@
+@@ -2080,32 +2854,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7069,7 +7071,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2118,27 +2892,41 @@
+@@ -2118,27 +2894,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7118,7 +7120,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2158,6 +2946,31 @@
+@@ -2158,6 +2948,31 @@
@@ -7150,7 +7152,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -2171,8 +2984,8 @@
+@@ -2171,8 +2986,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.
@@ -7161,7 +7163,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2194,7 +3007,7 @@
+@@ -2194,7 +3009,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7170,7 +7172,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.
-@@ -2213,21 +3026,22 @@
+@@ -2213,21 +3028,22 @@
;;
esac
done
@@ -7198,7 +7200,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2238,11 +3052,11 @@
+@@ -2238,11 +3054,11 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -7212,7 +7214,7 @@
am_make=${MAKE-make}
-@@ -2252,8 +3066,8 @@
+@@ -2252,8 +3068,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7223,7 +7225,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2280,15 +3094,15 @@
+@@ -2280,15 +3096,15 @@
fi
@@ -7244,7 +7246,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2308,10 +3122,9 @@
+@@ -2308,10 +3124,9 @@
@@ -7257,7 +7259,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2331,18 +3144,18 @@
+@@ -2331,18 +3146,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -7283,7 +7285,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2351,12 +3164,12 @@
+@@ -2351,12 +3166,12 @@
else
kde_use_strict_options="no"
@@ -7300,7 +7302,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2365,20 +3178,21 @@
+@@ -2365,20 +3180,21 @@
else
kde_use_warnings="yes"
@@ -7327,7 +7329,7 @@
CFLAGS=" $CFLAGS"
-@@ -2390,8 +3204,8 @@
+@@ -2390,8 +3206,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
@@ -7338,7 +7340,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2404,32 +3218,34 @@
+@@ -2404,32 +3220,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7380,7 +7382,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2442,36 +3258,51 @@
+@@ -2442,36 +3260,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7442,7 +7444,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2484,74 +3315,34 @@
+@@ -2484,74 +3317,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7526,7 +7528,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2565,7 +3356,7 @@
+@@ -2565,7 +3358,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7535,7 +7537,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2576,6 +3367,7 @@
+@@ -2576,6 +3369,7 @@
fi
done
done
@@ -7543,7 +7545,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2593,22 +3385,23 @@
+@@ -2593,22 +3387,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7574,7 +7576,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2621,36 +3414,38 @@
+@@ -2621,36 +3416,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7621,7 +7623,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2663,29 +3458,45 @@
+@@ -2663,29 +3460,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7673,7 +7675,7 @@
fi
fi
-@@ -2698,25 +3509,38 @@
+@@ -2698,25 +3511,38 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7720,7 +7722,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -2732,51 +3556,40 @@
+@@ -2732,51 +3558,40 @@
return 0;
}
_ACEOF
@@ -7791,7 +7793,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2788,14 +3601,12 @@
+@@ -2788,14 +3603,12 @@
{ (exit 77); exit 77; }; }
fi
@@ -7811,7 +7813,7 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -2820,83 +3631,84 @@
+@@ -2820,83 +3633,84 @@
fi
fi
fi
@@ -7947,7 +7949,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2912,14 +3724,16 @@
+@@ -2912,14 +3726,16 @@
{ (exit 1); exit 1; }; }
fi
@@ -7969,7 +7971,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2968,24 +3782,28 @@
+@@ -2968,24 +3784,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8005,7 +8007,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3027,97 +3845,23 @@
+@@ -3027,97 +3847,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8109,7 +8111,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -3139,81 +3883,24 @@
+@@ -3139,81 +3885,24 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8197,7 +8199,7 @@
;
return 0;
}
-@@ -3240,30 +3927,104 @@
+@@ -3240,30 +3929,104 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8308,7 +8310,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
-@@ -3285,27 +4046,36 @@
+@@ -3285,27 +4048,36 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8357,7 +8359,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3314,8 +4084,8 @@
+@@ -3314,8 +4086,8 @@
depcc="$CC" am_compiler_list=
@@ -8368,7 +8370,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3404,8 +4174,8 @@
+@@ -3404,8 +4176,8 @@
fi
fi
@@ -8379,7 +8381,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3427,8 +4197,8 @@
+@@ -3427,8 +4199,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
@@ -8390,7 +8392,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3488,9 +4258,10 @@
+@@ -3488,9 +4260,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8402,7 +8404,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3528,6 +4299,7 @@
+@@ -3528,6 +4301,7 @@
ac_preproc_ok=:
break
fi
@@ -8410,7 +8412,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3545,8 +4317,8 @@
+@@ -3545,8 +4319,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8421,7 +8423,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3595,9 +4367,10 @@
+@@ -3595,9 +4369,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8433,7 +8435,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3635,6 +4408,7 @@
+@@ -3635,6 +4410,7 @@
ac_preproc_ok=:
break
fi
@@ -8441,7 +8443,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3685,18 +4459,22 @@
+@@ -3685,18 +4461,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8469,7 +8471,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3709,36 +4487,38 @@
+@@ -3709,36 +4489,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8516,7 +8518,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3751,55 +4531,70 @@
+@@ -3751,55 +4533,70 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8605,7 +8607,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3848,24 +4643,28 @@
+@@ -3848,24 +4645,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8641,7 +8643,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3907,47 +4706,18 @@
+@@ -3907,47 +4708,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8693,7 +8695,7 @@
;
return 0;
}
-@@ -3979,20 +4749,19 @@
+@@ -3979,20 +4751,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8719,7 +8721,7 @@
;
return 0;
}
-@@ -4019,21 +4788,40 @@
+@@ -4019,21 +4790,40 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8767,7 +8769,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4042,8 +4830,8 @@
+@@ -4042,8 +4832,8 @@
depcc="$CXX" am_compiler_list=
@@ -8778,7 +8780,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4132,8 +4920,8 @@
+@@ -4132,8 +4922,8 @@
fi
fi
@@ -8789,7 +8791,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4151,8 +4939,8 @@
+@@ -4151,8 +4941,8 @@
@@ -8800,7 +8802,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4203,13 +4991,14 @@
+@@ -4203,13 +4993,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8818,7 +8820,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4251,17 +5040,16 @@
+@@ -4251,17 +5042,16 @@
fi
fi
@@ -8840,7 +8842,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'
-@@ -4315,7 +5103,9 @@
+@@ -4315,7 +5105,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8850,7 +8852,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4329,29 +5119,28 @@
+@@ -4329,29 +5121,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8888,7 +8890,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'
-@@ -4404,7 +5193,9 @@
+@@ -4404,7 +5195,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8898,7 +8900,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4418,13 +5209,13 @@
+@@ -4418,13 +5211,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8916,7 +8918,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4445,16 +5236,15 @@
+@@ -4445,16 +5238,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8937,7 +8939,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'
-@@ -4507,7 +5297,9 @@
+@@ -4507,7 +5299,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8947,7 +8949,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4521,16 +5313,16 @@
+@@ -4521,16 +5315,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8968,7 +8970,7 @@
:
fi
-@@ -4545,16 +5337,15 @@
+@@ -4545,16 +5339,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"
@@ -8989,7 +8991,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'
-@@ -4607,7 +5398,9 @@
+@@ -4607,7 +5400,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8999,7 +9001,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4621,27 +5414,26 @@
+@@ -4621,27 +5416,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9034,7 +9036,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4692,7 +5484,9 @@
+@@ -4692,7 +5486,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9044,7 +9046,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4706,13 +5500,13 @@
+@@ -4706,13 +5502,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9062,7 +9064,7 @@
:
fi
-@@ -4720,16 +5514,15 @@
+@@ -4720,16 +5516,15 @@
;;
esac
@@ -9083,7 +9085,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'
-@@ -4782,7 +5575,9 @@
+@@ -4782,7 +5577,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9093,7 +9095,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4796,28 +5591,27 @@
+@@ -4796,28 +5593,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9130,7 +9132,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'
-@@ -4870,7 +5664,9 @@
+@@ -4870,7 +5666,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9140,7 +9142,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4884,28 +5680,27 @@
+@@ -4884,28 +5682,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9177,7 +9179,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'
-@@ -4958,7 +5753,9 @@
+@@ -4958,7 +5755,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9187,7 +9189,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4972,13 +5769,13 @@
+@@ -4972,13 +5771,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9205,7 +9207,7 @@
:
fi
-@@ -4990,13 +5787,13 @@
+@@ -4990,13 +5789,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9223,7 +9225,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5004,16 +5801,15 @@
+@@ -5004,16 +5803,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9244,7 +9246,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'
-@@ -5066,7 +5862,9 @@
+@@ -5066,7 +5864,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9254,7 +9256,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5080,13 +5878,13 @@
+@@ -5080,13 +5880,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9272,7 +9274,7 @@
:
fi
-@@ -5098,16 +5896,15 @@
+@@ -5098,16 +5898,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9293,7 +9295,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'
-@@ -5160,7 +5957,9 @@
+@@ -5160,7 +5959,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9303,7 +9305,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5174,28 +5973,27 @@
+@@ -5174,28 +5975,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9340,7 +9342,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'
-@@ -5248,7 +6046,9 @@
+@@ -5248,7 +6048,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9350,7 +9352,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5262,28 +6062,27 @@
+@@ -5262,28 +6064,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9387,7 +9389,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'
-@@ -5336,7 +6135,9 @@
+@@ -5336,7 +6137,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9397,7 +9399,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5350,28 +6151,27 @@
+@@ -5350,28 +6153,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9434,7 +9436,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'
-@@ -5424,7 +6224,9 @@
+@@ -5424,7 +6226,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9444,7 +9446,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5438,13 +6240,13 @@
+@@ -5438,13 +6242,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9462,7 +9464,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5452,37 +6254,37 @@
+@@ -5452,37 +6256,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -9514,7 +9516,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5540,9 +6342,10 @@
+@@ -5540,9 +6344,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9526,7 +9528,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5550,8 +6353,8 @@
+@@ -5550,8 +6355,8 @@
fi
fi
@@ -9537,7 +9539,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5571,16 +6374,15 @@
+@@ -5571,16 +6376,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -9558,7 +9560,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'
-@@ -5633,7 +6435,9 @@
+@@ -5633,7 +6437,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9568,7 +9570,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5647,29 +6451,28 @@
+@@ -5647,29 +6453,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9606,7 +9608,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'
-@@ -5722,7 +6525,9 @@
+@@ -5722,7 +6527,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9616,7 +9618,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5736,28 +6541,27 @@
+@@ -5736,28 +6543,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9653,7 +9655,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'
-@@ -5810,7 +6614,9 @@
+@@ -5810,7 +6616,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9663,7 +9665,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5824,28 +6630,27 @@
+@@ -5824,28 +6632,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9700,7 +9702,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'
-@@ -5898,7 +6703,9 @@
+@@ -5898,7 +6705,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9710,7 +9712,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5912,28 +6719,27 @@
+@@ -5912,28 +6721,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9747,7 +9749,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'
-@@ -5986,7 +6792,9 @@
+@@ -5986,7 +6794,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9757,7 +9759,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6000,28 +6808,27 @@
+@@ -6000,28 +6810,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9794,7 +9796,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'
-@@ -6074,7 +6881,9 @@
+@@ -6074,7 +6883,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9804,7 +9806,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6088,13 +6897,13 @@
+@@ -6088,13 +6899,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9822,7 +9824,7 @@
:
fi
-@@ -6201,13 +7010,13 @@
+@@ -6201,13 +7012,13 @@
fi
@@ -9839,7 +9841,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6263,9 +7072,10 @@
+@@ -6263,9 +7074,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9851,7 +9853,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6303,6 +7113,7 @@
+@@ -6303,6 +7115,7 @@
ac_preproc_ok=:
break
fi
@@ -9859,7 +9861,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6320,8 +7131,8 @@
+@@ -6320,8 +7133,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -9870,7 +9872,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6370,9 +7181,10 @@
+@@ -6370,9 +7183,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9882,7 +9884,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6410,6 +7222,7 @@
+@@ -6410,6 +7224,7 @@
ac_preproc_ok=:
break
fi
@@ -9890,7 +9892,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6436,16 +7249,15 @@
+@@ -6436,16 +7251,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -9911,7 +9913,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'
-@@ -6498,7 +7310,9 @@
+@@ -6498,7 +7312,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9921,7 +9923,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6512,22 +7326,21 @@
+@@ -6512,22 +7328,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9950,7 +9952,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6543,36 +7356,36 @@
+@@ -6543,36 +7358,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -9997,7 +9999,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'
-@@ -6625,7 +7438,9 @@
+@@ -6625,7 +7440,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10007,7 +10009,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6639,29 +7454,28 @@
+@@ -6639,29 +7456,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10045,7 +10047,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'
-@@ -6714,7 +7528,9 @@
+@@ -6714,7 +7530,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10055,7 +10057,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6728,13 +7544,13 @@
+@@ -6728,13 +7546,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10073,7 +10075,7 @@
:
fi
-@@ -6744,13 +7560,13 @@
+@@ -6744,13 +7562,13 @@
@@ -10091,7 +10093,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6763,13 +7579,13 @@
+@@ -6763,13 +7581,13 @@
@@ -10109,7 +10111,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6780,198 +7596,19 @@
+@@ -6780,198 +7598,19 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -10312,7 +10314,7 @@
if test "$kde_use_nmcheck" = "yes"; then
KDE_USE_NMCHECK_TRUE=""
-@@ -6999,10 +7636,9 @@
+@@ -6999,10 +7638,9 @@
INCLTDL="$LTDLINCL"
@@ -10325,7 +10327,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7021,12 +7657,12 @@
+@@ -7021,12 +7659,12 @@
esac
else
enable_shared=yes
@@ -10342,7 +10344,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7045,7 +7681,8 @@
+@@ -7045,7 +7683,8 @@
esac
else
enable_static=no
@@ -10352,7 +10354,7 @@
-@@ -7054,11 +7691,11 @@
+@@ -7054,11 +7693,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -10368,7 +10370,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7079,8 +7716,8 @@
+@@ -7079,8 +7718,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -10379,7 +10381,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7096,14 +7733,13 @@
+@@ -7096,14 +7735,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -10398,7 +10400,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7122,10 +7758,11 @@
+@@ -7122,10 +7760,11 @@
esac
else
enable_fast_install=yes
@@ -10413,7 +10415,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7149,7 +7786,7 @@
+@@ -7149,7 +7788,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
@@ -10422,7 +10424,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7178,51 +7815,198 @@
+@@ -7178,51 +7817,198 @@
fi
SED=$lt_cv_path_SED
@@ -10657,7 +10659,7 @@
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
-@@ -7237,11 +8021,11 @@
+@@ -7237,11 +8023,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -10673,7 +10675,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7254,7 +8038,7 @@
+@@ -7254,7 +8040,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,
@@ -10682,7 +10684,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'*)
-@@ -7274,21 +8058,21 @@
+@@ -7274,21 +8060,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -10711,7 +10713,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7298,29 +8082,38 @@
+@@ -7298,29 +8084,38 @@
;;
esac
fi
@@ -10758,7 +10760,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7328,56 +8121,63 @@
+@@ -7328,56 +8123,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -10856,7 +10858,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7404,44 +8204,36 @@
+@@ -7404,44 +8206,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -10911,7 +10913,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7457,7 +8249,7 @@
+@@ -7457,7 +8251,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -10920,7 +10922,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
-@@ -7473,43 +8265,27 @@
+@@ -7473,43 +8267,27 @@
esac
;;
@@ -10977,7 +10979,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
-@@ -7528,32 +8304,22 @@
+@@ -7528,32 +8306,22 @@
;;
openbsd*)
@@ -11013,7 +11015,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]'
-@@ -7574,17 +8340,20 @@
+@@ -7574,17 +8342,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11037,7 +11039,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
-@@ -7593,14 +8362,17 @@
+@@ -7593,14 +8364,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11058,16 +11060,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7627,7 +8399,7 @@
+@@ -7627,7 +8401,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7630 "configure"' > conftest.$ac_ext
-+ echo '#line 8402 "configure"' > conftest.$ac_ext
++ echo '#line 8404 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7670,14 +8442,13 @@
+@@ -7670,14 +8444,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -11084,7 +11086,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7689,7 +8460,6 @@
+@@ -7689,7 +8462,6 @@
esac
;;
*64-bit*)
@@ -11092,7 +11094,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7714,8 +8484,8 @@
+@@ -7714,8 +8486,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -11103,7 +11105,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7767,8 +8537,9 @@
+@@ -7767,8 +8539,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11114,7 +11116,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7778,13 +8549,33 @@
+@@ -7778,13 +8551,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -11150,7 +11152,7 @@
esac
-@@ -7792,8 +8583,8 @@
+@@ -7792,8 +8585,8 @@
@@ -11161,7 +11163,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7843,8 +8634,9 @@
+@@ -7843,8 +8636,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11172,7 +11174,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7901,6 +8693,7 @@
+@@ -7901,6 +8695,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -11180,7 +11182,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7920,8 +8713,8 @@
+@@ -7920,8 +8715,8 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -11191,7 +11193,7 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -7944,12 +8737,14 @@
+@@ -7944,12 +8739,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -11209,7 +11211,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7972,9 +8767,9 @@
+@@ -7972,9 +8769,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11222,7 +11224,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8014,12 +8809,14 @@
+@@ -8014,12 +8811,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11240,7 +11242,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8034,18 +8831,19 @@
+@@ -8034,18 +8833,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11268,7 +11270,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8082,15 +8880,16 @@
+@@ -8082,15 +8882,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11290,7 +11292,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8124,9 +8923,10 @@
+@@ -8124,9 +8925,10 @@
ac_header_preproc=no
fi
@@ -11303,7 +11305,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8150,25 +8950,19 @@
+@@ -8150,25 +8952,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;}
@@ -11336,7 +11338,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8180,17 +8974,258 @@
+@@ -8180,17 +8976,258 @@
done
@@ -11598,7 +11600,7 @@
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8203,36 +9238,38 @@
+@@ -8203,36 +9240,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11645,7 +11647,7 @@
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8245,48 +9282,63 @@
+@@ -8245,48 +9284,63 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11723,7 +11725,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -8296,8 +9348,8 @@
+@@ -8296,8 +9350,8 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -11734,7 +11736,7 @@
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8336,20 +9388,21 @@
+@@ -8336,20 +9390,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11761,7 +11763,7 @@
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8386,13 +9439,14 @@
+@@ -8386,13 +9441,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11779,7 +11781,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -8421,13 +9475,13 @@
+@@ -8421,13 +9477,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -11796,7 +11798,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8456,20 +9510,70 @@
+@@ -8456,20 +9512,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -11873,7 +11875,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.
-@@ -8480,19 +9584,19 @@
+@@ -8480,19 +9586,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -11899,7 +11901,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8506,9 +9610,6 @@
+@@ -8506,9 +9612,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -11909,7 +11911,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'"
-@@ -8530,14 +9631,30 @@
+@@ -8530,14 +9633,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'"
;;
@@ -11942,7 +11944,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8555,14 +9672,17 @@
+@@ -8555,14 +9674,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -11962,7 +11964,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8680,15 +9800,15 @@
+@@ -8680,15 +9802,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
@@ -11984,7 +11986,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8702,8 +9822,8 @@
+@@ -8702,8 +9824,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -11995,7 +11997,7 @@
objdir=$lt_cv_objdir
-@@ -8724,7 +9844,7 @@
+@@ -8724,7 +9846,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -12004,7 +12006,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8744,7 +9864,7 @@
+@@ -8744,7 +9866,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -12013,7 +12015,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8754,8 +9874,8 @@
+@@ -8754,8 +9876,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
@@ -12024,7 +12026,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8768,32 +9888,34 @@
+@@ -8768,32 +9890,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12066,7 +12068,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8806,27 +9928,41 @@
+@@ -8806,27 +9930,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12115,7 +12117,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8834,8 +9970,8 @@
+@@ -8834,8 +9972,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
@@ -12126,7 +12128,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8848,32 +9984,34 @@
+@@ -8848,32 +9986,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12168,7 +12170,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8886,27 +10024,41 @@
+@@ -8886,27 +10026,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12217,7 +12219,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8914,8 +10066,8 @@
+@@ -8914,8 +10068,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
@@ -12228,7 +12230,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8928,32 +10080,34 @@
+@@ -8928,32 +10082,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12270,7 +12272,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8966,27 +10120,41 @@
+@@ -8966,27 +10122,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12319,7 +12321,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9001,6 +10169,7 @@
+@@ -9001,6 +10171,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -12327,7 +12329,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9020,21 +10189,32 @@
+@@ -9020,21 +10191,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -12364,7 +12366,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9054,7 +10234,7 @@
+@@ -9054,7 +10236,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -12373,7 +12375,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
-@@ -9086,17 +10266,17 @@
+@@ -9086,17 +10268,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -12397,7 +12399,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9116,7 +10296,7 @@
+@@ -9116,7 +10298,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -12406,7 +12408,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
-@@ -9148,11 +10328,11 @@
+@@ -9148,11 +10330,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -12422,7 +12424,7 @@
fi
else
-@@ -9167,21 +10347,21 @@
+@@ -9167,21 +10349,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -12451,7 +12453,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9211,68 +10391,25 @@
+@@ -9211,68 +10393,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12535,7 +12537,7 @@
## CAVEAT EMPTOR:
-@@ -9286,8 +10423,8 @@
+@@ -9286,8 +10425,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -12546,7 +12548,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9301,26 +10438,28 @@
+@@ -9301,26 +10440,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 \
@@ -12555,12 +12557,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10444: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10446: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9311: \$? = $ac_status" >&5
-+ echo "$as_me:10448: \$? = $ac_status" >&5
++ echo "$as_me:10450: \$? = $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
@@ -12582,7 +12584,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"
-@@ -9334,8 +10473,8 @@
+@@ -9334,8 +10475,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -12593,7 +12595,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9373,6 +10512,11 @@
+@@ -9373,6 +10514,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -12605,7 +12607,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9389,7 +10533,7 @@
+@@ -9389,7 +10535,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -12614,7 +12616,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9415,6 +10559,16 @@
+@@ -9415,6 +10561,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -12631,7 +12633,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9426,7 +10580,7 @@
+@@ -9426,7 +10582,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.
@@ -12640,7 +12642,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9449,13 +10603,20 @@
+@@ -9449,13 +10605,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -12663,7 +12665,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9470,15 +10631,15 @@
+@@ -9470,15 +10633,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -12685,7 +12687,7 @@
;;
sunos4*)
-@@ -9487,7 +10648,7 @@
+@@ -9487,7 +10650,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -12694,7 +12696,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9500,6 +10661,17 @@
+@@ -9500,6 +10663,17 @@
fi
;;
@@ -12712,7 +12714,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9511,16 +10683,16 @@
+@@ -9511,16 +10685,16 @@
esac
fi
@@ -12733,7 +12735,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9534,26 +10706,28 @@
+@@ -9534,26 +10708,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 \
@@ -12742,12 +12744,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9540: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10712: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10714: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9544: \$? = $ac_status" >&5
-+ echo "$as_me:10716: \$? = $ac_status" >&5
++ echo "$as_me:10718: \$? = $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
@@ -12769,7 +12771,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9566,7 +10740,7 @@
+@@ -9566,7 +10742,7 @@
fi
fi
@@ -12778,7 +12780,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9576,72 +10750,112 @@
+@@ -9576,72 +10752,112 @@
;;
esac
@@ -12871,12 +12873,12 @@
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9607: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10816: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10818: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9611: \$? = $ac_status" >&5
-+ echo "$as_me:10820: \$? = $ac_status" >&5
++ echo "$as_me:10822: \$? = $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
@@ -12928,7 +12930,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;}
-@@ -9651,8 +10865,8 @@
+@@ -9651,8 +10867,8 @@
need_locks=no
fi
@@ -12939,7 +12941,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9690,6 +10904,16 @@
+@@ -9690,6 +10906,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -12956,7 +12958,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9700,6 +10924,10 @@
+@@ -9700,6 +10926,10 @@
with_gnu_ld=no
fi
;;
@@ -12967,7 +12969,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9710,6 +10938,27 @@
+@@ -9710,6 +10940,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -12995,7 +12997,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9747,7 +10996,7 @@
+@@ -9747,7 +10998,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -13004,7 +13006,7 @@
else
ld_shlibs=no
fi
-@@ -9757,13 +11006,13 @@
+@@ -9757,13 +11008,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'
@@ -13021,7 +13023,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
-@@ -9772,23 +11021,70 @@
+@@ -9772,23 +11023,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -13097,7 +13099,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9802,13 +11098,40 @@
+@@ -9802,13 +11100,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13140,7 +13142,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9818,24 +11141,19 @@
+@@ -9818,24 +11143,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13172,7 +13174,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9847,7 +11165,7 @@
+@@ -9847,7 +11167,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -13181,7 +13183,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9869,9 +11187,21 @@
+@@ -9869,9 +11189,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
@@ -13205,7 +13207,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9888,7 +11218,7 @@
+@@ -9888,7 +11220,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -13214,7 +13216,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`
-@@ -9907,8 +11237,12 @@
+@@ -9907,8 +11239,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -13227,7 +13229,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9916,22 +11250,23 @@
+@@ -9916,22 +11252,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -13258,7 +13260,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9978,19 +11313,20 @@
+@@ -9978,19 +11315,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13283,7 +13285,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10040,7 +11376,9 @@
+@@ -10040,7 +11378,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13293,7 +13295,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10050,13 +11388,11 @@
+@@ -10050,13 +11390,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -13310,7 +13312,7 @@
fi
fi
;;
-@@ -10069,7 +11405,7 @@
+@@ -10069,7 +11407,7 @@
ld_shlibs=no
;;
@@ -13319,7 +13321,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10079,13 +11415,13 @@
+@@ -10079,13 +11417,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -13336,7 +13338,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.
-@@ -10095,52 +11431,52 @@
+@@ -10095,52 +11433,52 @@
;;
darwin* | rhapsody*)
@@ -13429,7 +13431,7 @@
fi
;;
-@@ -10174,8 +11510,8 @@
+@@ -10174,8 +11512,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -13440,7 +13442,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10183,7 +11519,7 @@
+@@ -10183,7 +11521,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -13449,7 +13451,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
-@@ -10197,47 +11533,62 @@
+@@ -10197,47 +11535,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -13536,7 +13538,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10251,7 +11602,7 @@
+@@ -10251,7 +11604,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -13545,7 +13547,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'
-@@ -10261,7 +11612,7 @@
+@@ -10261,7 +11614,7 @@
link_all_deplibs=yes
;;
@@ -13554,7 +13556,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10284,7 +11635,8 @@
+@@ -10284,7 +11637,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
@@ -13564,7 +13566,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10294,7 +11646,7 @@
+@@ -10294,7 +11648,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -13573,7 +13575,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10305,14 +11657,14 @@
+@@ -10305,14 +11659,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -13590,7 +13592,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'
-@@ -10324,13 +11676,13 @@
+@@ -10324,13 +11678,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -13606,7 +13608,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10338,21 +11690,15 @@
+@@ -10338,21 +11692,15 @@
hardcode_libdir_separator=:
;;
@@ -13632,7 +13634,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'
-@@ -10361,8 +11707,18 @@
+@@ -10361,8 +11709,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13653,7 +13655,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10371,7 +11727,7 @@
+@@ -10371,7 +11729,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.
@@ -13662,7 +13664,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10419,36 +11775,45 @@
+@@ -10419,36 +11777,45 @@
fi
;;
@@ -13729,7 +13731,7 @@
;;
uts4*)
-@@ -10463,15 +11828,10 @@
+@@ -10463,15 +11830,10 @@
esac
fi
@@ -13747,7 +13749,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10489,8 +11849,8 @@
+@@ -10489,8 +11851,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.
@@ -13758,7 +13760,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10504,6 +11864,7 @@
+@@ -10504,6 +11866,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -13766,7 +13768,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10526,20 +11887,20 @@
+@@ -10526,20 +11889,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -13792,7 +13794,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10549,7 +11910,20 @@
+@@ -10549,7 +11912,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13814,7 +13816,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10614,7 +11988,7 @@
+@@ -10614,7 +11990,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13823,7 +13825,7 @@
;;
beos*)
-@@ -10623,7 +11997,7 @@
+@@ -10623,7 +11999,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -13832,7 +13834,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10639,7 +12013,7 @@
+@@ -10639,7 +12015,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -13841,7 +13843,7 @@
need_version=no
need_lib_prefix=no
-@@ -10651,7 +12025,8 @@
+@@ -10651,7 +12027,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -13851,7 +13853,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10681,7 +12056,7 @@
+@@ -10681,7 +12058,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13860,7 +13862,7 @@
;;
esac
;;
-@@ -10704,7 +12079,7 @@
+@@ -10704,7 +12081,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -13869,7 +13871,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"`
-@@ -10727,20 +12102,17 @@
+@@ -10727,20 +12104,17 @@
dynamic_linker=no
;;
@@ -13901,7 +13903,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10758,14 +12130,19 @@
+@@ -10758,14 +12132,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -13923,7 +13925,7 @@
esac
;;
-@@ -10785,9 +12162,9 @@
+@@ -10785,9 +12164,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -13935,7 +13937,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10802,7 +12179,7 @@
+@@ -10802,7 +12181,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -13944,7 +13946,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10813,7 +12190,7 @@
+@@ -10813,7 +12192,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -13953,7 +13955,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10825,6 +12202,18 @@
+@@ -10825,6 +12204,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -13972,7 +13974,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10868,29 +12257,26 @@
+@@ -10868,29 +12259,26 @@
;;
# This must be Linux ELF.
@@ -14009,7 +14011,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,
-@@ -10900,6 +12286,18 @@
+@@ -10900,6 +12288,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -14028,7 +14030,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10909,7 +12307,7 @@
+@@ -10909,7 +12309,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -14037,7 +14039,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10937,8 +12335,13 @@
+@@ -10937,8 +12337,13 @@
openbsd*)
version_type=sunos
@@ -14052,7 +14054,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
-@@ -10958,7 +12361,7 @@
+@@ -10958,7 +12363,7 @@
os2*)
libname_spec='$name'
@@ -14061,7 +14063,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10976,13 +12379,6 @@
+@@ -10976,13 +12381,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -14075,7 +14077,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11008,7 +12404,7 @@
+@@ -11008,7 +12406,7 @@
need_version=yes
;;
@@ -14084,7 +14086,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'
-@@ -11041,6 +12437,29 @@
+@@ -11041,6 +12439,29 @@
fi
;;
@@ -14114,7 +14116,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11052,16 +12471,21 @@
+@@ -11052,16 +12473,21 @@
dynamic_linker=no
;;
esac
@@ -14142,7 +14144,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11081,8 +12505,8 @@
+@@ -11081,8 +12507,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -14153,7 +14155,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11095,29 +12519,29 @@
+@@ -11095,29 +12521,29 @@
striplib=
old_striplib=
@@ -14193,7 +14195,7 @@
;;
esac
fi
-@@ -11149,8 +12573,8 @@
+@@ -11149,8 +12575,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -14204,7 +14206,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11163,17 +12587,17 @@
+@@ -11163,17 +12589,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14226,7 +14228,7 @@
;
return 0;
}
-@@ -11205,14 +12629,15 @@
+@@ -11205,14 +12631,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14245,7 +14247,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11226,8 +12651,8 @@
+@@ -11226,8 +12653,8 @@
;;
*)
@@ -14256,7 +14258,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11254,30 +12679,24 @@
+@@ -11254,30 +12681,24 @@
#undef shl_load
@@ -14292,7 +14294,7 @@
;
return 0;
}
-@@ -11309,18 +12728,19 @@
+@@ -11309,18 +12730,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14317,7 +14319,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11333,17 +12753,17 @@
+@@ -11333,17 +12755,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14339,7 +14341,7 @@
;
return 0;
}
-@@ -11375,19 +12795,20 @@
+@@ -11375,19 +12797,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14365,7 +14367,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11414,30 +12835,24 @@
+@@ -11414,30 +12837,24 @@
#undef dlopen
@@ -14401,7 +14403,7 @@
;
return 0;
}
-@@ -11469,18 +12884,19 @@
+@@ -11469,18 +12886,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14426,7 +14428,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11493,17 +12909,17 @@
+@@ -11493,17 +12911,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14448,7 +14450,7 @@
;
return 0;
}
-@@ -11535,19 +12951,20 @@
+@@ -11535,19 +12953,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14474,7 +14476,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11560,17 +12977,17 @@
+@@ -11560,17 +12979,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14496,7 +14498,7 @@
;
return 0;
}
-@@ -11602,19 +13019,20 @@
+@@ -11602,19 +13021,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14522,7 +14524,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11627,17 +13045,17 @@
+@@ -11627,17 +13047,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14544,7 +14546,7 @@
;
return 0;
}
-@@ -11669,14 +13087,15 @@
+@@ -11669,14 +13089,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14563,7 +14565,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11711,13 +13130,13 @@
+@@ -11711,13 +13132,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -14580,16 +14582,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11727,7 +13146,7 @@
+@@ -11727,7 +13148,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11730 "configure"
-+#line 13149 "configure"
++#line 13151 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11784,6 +13203,8 @@
+@@ -11784,6 +13205,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -14598,7 +14600,7 @@
exit (status);
}
-@@ -11793,12 +13214,12 @@
+@@ -11793,12 +13216,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -14613,7 +14615,7 @@
esac
else :
# compilation failed
-@@ -11809,13 +13230,13 @@
+@@ -11809,13 +13232,13 @@
fi
@@ -14632,16 +14634,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11825,7 +13246,7 @@
+@@ -11825,7 +13248,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11828 "configure"
-+#line 13249 "configure"
++#line 13251 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11882,6 +13303,8 @@
+@@ -11882,6 +13305,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -14650,7 +14652,7 @@
exit (status);
}
-@@ -11891,12 +13314,12 @@
+@@ -11891,12 +13316,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -14665,7 +14667,7 @@
esac
else :
# compilation failed
-@@ -11907,8 +13330,8 @@
+@@ -11907,8 +13332,8 @@
fi
@@ -14676,7 +14678,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11929,19 +13352,19 @@
+@@ -11929,19 +13354,19 @@
fi
@@ -14704,7 +14706,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11950,58 +13373,21 @@
+@@ -11950,58 +13375,21 @@
fi
;;
@@ -14770,7 +14772,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12016,7 +13402,8 @@
+@@ -12016,7 +13404,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.
@@ -14780,7 +14782,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 \
-@@ -12130,11 +13517,11 @@
+@@ -12130,11 +13519,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -14794,7 +14796,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12164,6 +13551,12 @@
+@@ -12164,6 +13553,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -14807,7 +14809,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12175,6 +13568,9 @@
+@@ -12175,6 +13570,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -14817,7 +14819,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12194,7 +13590,7 @@
+@@ -12194,7 +13592,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -14826,7 +14828,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12225,7 +13621,7 @@
+@@ -12225,7 +13623,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -14835,7 +14837,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12240,7 +13636,7 @@
+@@ -12240,7 +13638,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -14844,7 +14846,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12467,7 +13863,10 @@
+@@ -12467,7 +13865,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.
@@ -14856,7 +14858,7 @@
fi
-@@ -12480,11 +13879,11 @@
+@@ -12480,11 +13881,11 @@
CC="$lt_save_CC"
@@ -14872,7 +14874,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12502,6 +13901,9 @@
+@@ -12502,6 +13903,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -14882,7 +14884,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12532,8 +13934,10 @@
+@@ -12532,8 +13936,10 @@
case $tagname in
CXX)
@@ -14895,7 +14897,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'
-@@ -12552,6 +13956,7 @@
+@@ -12552,6 +13958,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -14903,7 +14905,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12569,7 +13974,7 @@
+@@ -12569,7 +13976,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -14912,7 +14914,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12579,17 +13984,34 @@
+@@ -12579,17 +13986,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -14948,7 +14950,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12600,18 +14022,27 @@
+@@ -12600,18 +14024,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -14979,7 +14981,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12625,18 +14056,18 @@
+@@ -12625,18 +14058,18 @@
# Set up default GNU C++ configuration
@@ -15004,7 +15006,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12665,11 +14096,11 @@
+@@ -12665,11 +14098,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -15020,7 +15022,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12682,7 +14113,7 @@
+@@ -12682,7 +14115,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,
@@ -15029,7 +15031,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'*)
-@@ -12702,21 +14133,21 @@
+@@ -12702,21 +14135,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -15058,7 +15060,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12726,8 +14157,8 @@
+@@ -12726,8 +14159,8 @@
;;
esac
fi
@@ -15069,7 +15071,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12735,8 +14166,8 @@
+@@ -12735,8 +14168,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
@@ -15080,7 +15082,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12762,7 +14193,7 @@
+@@ -12762,7 +14195,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.
@@ -15089,7 +15091,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12777,8 +14208,8 @@
+@@ -12777,8 +14210,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -15100,7 +15102,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12793,8 +14224,23 @@
+@@ -12793,8 +14226,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -15126,7 +15128,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12811,7 +14257,7 @@
+@@ -12811,7 +14259,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -15135,7 +15137,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`
-@@ -12830,8 +14276,12 @@
+@@ -12830,8 +14278,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -15148,7 +15150,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12840,15 +14290,16 @@
+@@ -12840,15 +14292,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -15169,7 +15171,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.
-@@ -12901,20 +14352,21 @@
+@@ -12901,20 +14354,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15194,7 +15196,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12964,7 +14416,9 @@
+@@ -12964,7 +14418,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15204,7 +15206,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12974,16 +14428,26 @@
+@@ -12974,16 +14430,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -15236,7 +15238,7 @@
chorus*)
case $cc_basename in
*)
-@@ -12997,12 +14461,12 @@
+@@ -12997,12 +14463,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'
@@ -15251,7 +15253,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
-@@ -13011,70 +14475,81 @@
+@@ -13011,70 +14477,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -15385,7 +15387,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13085,14 +14560,14 @@
+@@ -13085,14 +14562,14 @@
;;
esac
;;
@@ -15402,7 +15404,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13109,12 +14584,12 @@
+@@ -13109,12 +14586,12 @@
# location of the library.
case $cc_basename in
@@ -15418,7 +15420,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13123,11 +14598,11 @@
+@@ -13123,11 +14600,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.
@@ -15432,7 +15434,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13137,33 +14612,22 @@
+@@ -13137,33 +14614,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -15473,7 +15475,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13174,17 +14638,20 @@
+@@ -13174,17 +14640,20 @@
esac
case $cc_basename in
@@ -15500,7 +15502,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13200,12 +14667,15 @@
+@@ -13200,12 +14669,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -15520,7 +15522,7 @@
;;
esac
fi
-@@ -13216,11 +14686,25 @@
+@@ -13216,11 +14688,25 @@
;;
esac
;;
@@ -15548,7 +15550,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13231,9 +14715,9 @@
+@@ -13231,9 +14717,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -15560,7 +15562,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13242,16 +14726,16 @@
+@@ -13242,16 +14728,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -15581,7 +15583,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13269,20 +14753,44 @@
+@@ -13269,20 +14755,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -15632,7 +15634,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13310,7 +14818,7 @@
+@@ -13310,7 +14820,7 @@
;;
mvs*)
case $cc_basename in
@@ -15641,7 +15643,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13320,7 +14828,7 @@
+@@ -13320,7 +14830,7 @@
;;
esac
;;
@@ -15650,7 +15652,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=
-@@ -13331,15 +14839,31 @@
+@@ -13331,15 +14841,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::"'
;;
@@ -15684,7 +15686,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13349,14 +14873,14 @@
+@@ -13349,14 +14875,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -15702,7 +15704,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13374,7 +14898,7 @@
+@@ -13374,7 +14900,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15711,7 +15713,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13393,13 +14917,13 @@
+@@ -13393,13 +14919,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -15727,7 +15729,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13408,17 +14932,17 @@
+@@ -13408,17 +14934,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -15749,7 +15751,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13437,7 +14961,7 @@
+@@ -13437,7 +14963,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15758,7 +15760,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,27 +14982,14 @@
+@@ -13458,27 +14984,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -15788,7 +15790,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13491,36 +15002,33 @@
+@@ -13491,36 +15004,33 @@
;;
solaris*)
case $cc_basename in
@@ -15837,7 +15839,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13528,9 +15036,9 @@
+@@ -13528,9 +15038,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -15849,7 +15851,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13540,9 +15048,9 @@
+@@ -13540,9 +15050,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
@@ -15861,7 +15863,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13551,9 +15059,9 @@
+@@ -13551,9 +15061,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -15873,7 +15875,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13566,12 +15074,63 @@
+@@ -13566,12 +15076,63 @@
;;
esac
;;
@@ -15939,7 +15941,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13591,8 +15150,8 @@
+@@ -13591,8 +15152,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -15950,7 +15952,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13628,7 +15187,7 @@
+@@ -13628,7 +15189,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.
@@ -15959,7 +15961,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13668,7 +15227,7 @@
+@@ -13668,7 +15229,7 @@
fi
;;
@@ -15968,7 +15970,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13704,6 +15263,29 @@
+@@ -13704,6 +15265,29 @@
$rm -f confest.$objext
@@ -15998,7 +16000,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13712,8 +15294,8 @@
+@@ -13712,8 +15296,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -16009,7 +16011,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13751,6 +15333,10 @@
+@@ -13751,6 +15335,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -16020,7 +16022,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13759,7 +15345,7 @@
+@@ -13759,7 +15347,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -16029,7 +16031,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13784,18 +15370,28 @@
+@@ -13784,18 +15372,28 @@
;;
chorus*)
case $cc_basename in
@@ -16061,7 +16063,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13803,22 +15399,22 @@
+@@ -13803,22 +15401,22 @@
;;
esac
;;
@@ -16090,7 +16092,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13831,9 +15427,13 @@
+@@ -13831,9 +15429,13 @@
;;
esac
;;
@@ -16105,7 +16107,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13842,20 +15442,26 @@
+@@ -13842,20 +15444,26 @@
;;
esac
;;
@@ -16136,7 +16138,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13872,25 +15478,25 @@
+@@ -13872,25 +15480,25 @@
;;
mvs*)
case $cc_basename in
@@ -16167,7 +16169,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13904,24 +15510,15 @@
+@@ -13904,24 +15512,15 @@
;;
psos*)
;;
@@ -16194,7 +16196,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13931,12 +15528,12 @@
+@@ -13931,12 +15530,12 @@
;;
sunos4*)
case $cc_basename in
@@ -16209,7 +16211,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13946,7 +15543,7 @@
+@@ -13946,7 +15545,7 @@
;;
tandem*)
case $cc_basename in
@@ -16218,7 +16220,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13954,7 +15551,14 @@
+@@ -13954,7 +15553,14 @@
;;
esac
;;
@@ -16234,7 +16236,7 @@
;;
vxworks*)
;;
-@@ -13964,16 +15568,16 @@
+@@ -13964,16 +15570,16 @@
esac
fi
@@ -16255,7 +16257,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13987,26 +15591,28 @@
+@@ -13987,26 +15593,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 \
@@ -16264,12 +16266,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13993: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15597: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13997: \$? = $ac_status" >&5
-+ echo "$as_me:15601: \$? = $ac_status" >&5
++ echo "$as_me:15603: \$? = $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
@@ -16291,7 +16293,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14019,7 +15625,7 @@
+@@ -14019,7 +15627,7 @@
fi
fi
@@ -16300,7 +16302,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14029,8 +15635,50 @@
+@@ -14029,8 +15637,50 @@
;;
esac
@@ -16353,7 +16355,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14041,60 +15689,58 @@
+@@ -14041,60 +15691,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -16375,12 +16377,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14060: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15701: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15703: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14064: \$? = $ac_status" >&5
-+ echo "$as_me:15705: \$? = $ac_status" >&5
++ echo "$as_me:15707: \$? = $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
@@ -16432,7 +16434,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;}
-@@ -14104,8 +15750,8 @@
+@@ -14104,8 +15752,8 @@
need_locks=no
fi
@@ -16443,7 +16445,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14122,22 +15768,20 @@
+@@ -14122,22 +15770,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -16472,7 +16474,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14155,8 +15799,8 @@
+@@ -14155,8 +15801,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.
@@ -16483,7 +16485,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14170,6 +15814,7 @@
+@@ -14170,6 +15816,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -16491,7 +16493,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14192,20 +15837,20 @@
+@@ -14192,20 +15839,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -16517,7 +16519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14215,7 +15860,20 @@
+@@ -14215,7 +15862,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16539,7 +16541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14280,7 +15938,7 @@
+@@ -14280,7 +15940,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16548,7 +16550,7 @@
;;
beos*)
-@@ -14289,7 +15947,7 @@
+@@ -14289,7 +15949,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -16557,7 +16559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14305,7 +15963,7 @@
+@@ -14305,7 +15965,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -16566,7 +16568,7 @@
need_version=no
need_lib_prefix=no
-@@ -14317,7 +15975,8 @@
+@@ -14317,7 +15977,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -16576,7 +16578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14347,7 +16006,7 @@
+@@ -14347,7 +16008,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16585,7 +16587,7 @@
;;
esac
;;
-@@ -14370,7 +16029,7 @@
+@@ -14370,7 +16031,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -16594,7 +16596,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"`
-@@ -14393,20 +16052,17 @@
+@@ -14393,20 +16054,17 @@
dynamic_linker=no
;;
@@ -16626,7 +16628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14424,14 +16080,19 @@
+@@ -14424,14 +16082,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -16648,7 +16650,7 @@
esac
;;
-@@ -14451,9 +16112,9 @@
+@@ -14451,9 +16114,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -16660,7 +16662,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14468,7 +16129,7 @@
+@@ -14468,7 +16131,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -16669,7 +16671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14479,7 +16140,7 @@
+@@ -14479,7 +16142,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -16678,7 +16680,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14491,6 +16152,18 @@
+@@ -14491,6 +16154,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16697,7 +16699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14534,29 +16207,26 @@
+@@ -14534,29 +16209,26 @@
;;
# This must be Linux ELF.
@@ -16734,7 +16736,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,
-@@ -14566,6 +16236,18 @@
+@@ -14566,6 +16238,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16753,7 +16755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14575,7 +16257,7 @@
+@@ -14575,7 +16259,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16762,7 +16764,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14603,8 +16285,13 @@
+@@ -14603,8 +16287,13 @@
openbsd*)
version_type=sunos
@@ -16777,7 +16779,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
-@@ -14624,7 +16311,7 @@
+@@ -14624,7 +16313,7 @@
os2*)
libname_spec='$name'
@@ -16786,7 +16788,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14642,13 +16329,6 @@
+@@ -14642,13 +16331,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16800,7 +16802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14674,7 +16354,7 @@
+@@ -14674,7 +16356,7 @@
need_version=yes
;;
@@ -16809,7 +16811,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'
-@@ -14707,6 +16387,29 @@
+@@ -14707,6 +16389,29 @@
fi
;;
@@ -16839,7 +16841,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14718,16 +16421,21 @@
+@@ -14718,16 +16423,21 @@
dynamic_linker=no
;;
esac
@@ -16867,7 +16869,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14747,8 +16455,8 @@
+@@ -14747,8 +16457,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -16878,7 +16880,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14759,1152 +16467,327 @@
+@@ -14759,1152 +16469,327 @@
enable_fast_install=needless
fi
@@ -18278,7 +18280,7 @@
# This is the shared library path variable.
shlibpath_var=$shlibpath_var
-@@ -15986,7 +16869,10 @@
+@@ -15986,7 +16871,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.
@@ -18290,7 +18292,7 @@
fi
-@@ -16058,29 +16944,55 @@
+@@ -16058,29 +16946,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -18354,7 +18356,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16088,21 +17000,21 @@
+@@ -16088,21 +17002,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -18386,7 +18388,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16111,8 +17023,8 @@
+@@ -16111,8 +17025,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -18397,7 +18399,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16150,6 +17062,11 @@
+@@ -16150,6 +17064,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -18409,7 +18411,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16166,7 +17083,7 @@
+@@ -16166,7 +17085,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18418,7 +18420,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16192,6 +17109,16 @@
+@@ -16192,6 +17111,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -18435,7 +18437,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16203,7 +17130,7 @@
+@@ -16203,7 +17132,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.
@@ -18444,7 +18446,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16226,13 +17153,20 @@
+@@ -16226,13 +17155,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -18467,7 +18469,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16247,15 +17181,15 @@
+@@ -16247,15 +17183,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -18489,7 +18491,7 @@
;;
sunos4*)
-@@ -16264,7 +17198,7 @@
+@@ -16264,7 +17200,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -18498,7 +18500,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16277,6 +17211,17 @@
+@@ -16277,6 +17213,17 @@
fi
;;
@@ -18516,7 +18518,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16288,16 +17233,16 @@
+@@ -16288,16 +17235,16 @@
esac
fi
@@ -18537,7 +18539,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16311,26 +17256,28 @@
+@@ -16311,26 +17258,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 \
@@ -18546,12 +18548,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16317: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17262: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17264: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16321: \$? = $ac_status" >&5
-+ echo "$as_me:17266: \$? = $ac_status" >&5
++ echo "$as_me:17268: \$? = $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
@@ -18573,7 +18575,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16343,7 +17290,7 @@
+@@ -16343,7 +17292,7 @@
fi
fi
@@ -18582,7 +18584,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16353,8 +17300,50 @@
+@@ -16353,8 +17302,50 @@
;;
esac
@@ -18635,7 +18637,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16365,60 +17354,58 @@
+@@ -16365,60 +17356,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18657,12 +18659,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16384: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17366: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17368: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16388: \$? = $ac_status" >&5
-+ echo "$as_me:17370: \$? = $ac_status" >&5
++ echo "$as_me:17372: \$? = $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
@@ -18714,7 +18716,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;}
-@@ -16428,8 +17415,8 @@
+@@ -16428,8 +17417,8 @@
need_locks=no
fi
@@ -18725,7 +18727,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16467,6 +17454,16 @@
+@@ -16467,6 +17456,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -18742,7 +18744,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16477,6 +17474,10 @@
+@@ -16477,6 +17476,10 @@
with_gnu_ld=no
fi
;;
@@ -18753,7 +18755,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16487,6 +17488,27 @@
+@@ -16487,6 +17490,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -18781,7 +18783,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16524,7 +17546,7 @@
+@@ -16524,7 +17548,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -18790,7 +18792,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16534,13 +17556,13 @@
+@@ -16534,13 +17558,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'
@@ -18807,7 +18809,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
-@@ -16549,23 +17571,70 @@
+@@ -16549,23 +17573,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18884,7 +18886,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16579,13 +17648,40 @@
+@@ -16579,13 +17650,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18927,7 +18929,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16595,24 +17691,19 @@
+@@ -16595,24 +17693,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18959,7 +18961,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16624,7 +17715,7 @@
+@@ -16624,7 +17717,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -18968,7 +18970,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16646,9 +17737,21 @@
+@@ -16646,9 +17739,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
@@ -18992,7 +18994,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16665,7 +17768,7 @@
+@@ -16665,7 +17770,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -19001,7 +19003,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`
-@@ -16684,8 +17787,12 @@
+@@ -16684,8 +17789,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -19014,7 +19016,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16693,22 +17800,23 @@
+@@ -16693,22 +17802,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -19045,7 +19047,7 @@
program main
end
-@@ -16745,19 +17853,20 @@
+@@ -16745,19 +17855,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19070,7 +19072,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16797,7 +17906,9 @@
+@@ -16797,7 +17908,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19080,7 +19082,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16807,13 +17918,11 @@
+@@ -16807,13 +17920,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -19097,7 +19099,7 @@
fi
fi
;;
-@@ -16826,7 +17935,7 @@
+@@ -16826,7 +17937,7 @@
ld_shlibs_F77=no
;;
@@ -19106,7 +19108,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16836,68 +17945,68 @@
+@@ -16836,68 +17947,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -19219,7 +19221,7 @@
fi
;;
-@@ -16931,8 +18040,8 @@
+@@ -16931,8 +18042,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -19230,7 +19232,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16940,7 +18049,7 @@
+@@ -16940,7 +18051,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -19239,7 +19241,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
-@@ -16954,47 +18063,62 @@
+@@ -16954,47 +18065,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -19326,7 +19328,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17008,7 +18132,7 @@
+@@ -17008,7 +18134,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -19335,7 +19337,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'
-@@ -17018,7 +18142,7 @@
+@@ -17018,7 +18144,7 @@
link_all_deplibs_F77=yes
;;
@@ -19344,7 +19346,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
-@@ -17041,7 +18165,8 @@
+@@ -17041,7 +18167,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
@@ -19354,7 +19356,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17051,7 +18176,7 @@
+@@ -17051,7 +18178,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -19363,7 +19365,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17062,14 +18187,14 @@
+@@ -17062,14 +18189,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -19380,7 +19382,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'
-@@ -17081,13 +18206,13 @@
+@@ -17081,13 +18208,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -19396,7 +19398,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17095,21 +18220,15 @@
+@@ -17095,21 +18222,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -19422,7 +19424,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'
-@@ -17118,8 +18237,18 @@
+@@ -17118,8 +18239,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -19443,7 +19445,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17128,7 +18257,7 @@
+@@ -17128,7 +18259,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.
@@ -19452,7 +19454,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17176,36 +18305,45 @@
+@@ -17176,36 +18307,45 @@
fi
;;
@@ -19519,7 +19521,7 @@
;;
uts4*)
-@@ -17220,15 +18358,10 @@
+@@ -17220,15 +18360,10 @@
esac
fi
@@ -19537,7 +19539,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17246,8 +18379,8 @@
+@@ -17246,8 +18381,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.
@@ -19548,7 +19550,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17261,6 +18394,7 @@
+@@ -17261,6 +18396,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -19556,7 +19558,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17283,20 +18417,20 @@
+@@ -17283,20 +18419,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -19582,7 +19584,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17306,7 +18440,20 @@
+@@ -17306,7 +18442,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19604,7 +19606,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17371,7 +18518,7 @@
+@@ -17371,7 +18520,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19613,7 +19615,7 @@
;;
beos*)
-@@ -17380,7 +18527,7 @@
+@@ -17380,7 +18529,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -19622,7 +19624,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17396,7 +18543,7 @@
+@@ -17396,7 +18545,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -19631,7 +19633,7 @@
need_version=no
need_lib_prefix=no
-@@ -17408,7 +18555,8 @@
+@@ -17408,7 +18557,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -19641,7 +19643,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17438,7 +18586,7 @@
+@@ -17438,7 +18588,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19650,7 +19652,7 @@
;;
esac
;;
-@@ -17461,7 +18609,7 @@
+@@ -17461,7 +18611,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -19659,7 +19661,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"`
-@@ -17484,20 +18632,17 @@
+@@ -17484,20 +18634,17 @@
dynamic_linker=no
;;
@@ -19691,7 +19693,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17515,14 +18660,19 @@
+@@ -17515,14 +18662,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19713,7 +19715,7 @@
esac
;;
-@@ -17542,9 +18692,9 @@
+@@ -17542,9 +18694,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19725,7 +19727,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17559,7 +18709,7 @@
+@@ -17559,7 +18711,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19734,7 +19736,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17570,7 +18720,7 @@
+@@ -17570,7 +18722,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19743,7 +19745,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17582,15 +18732,27 @@
+@@ -17582,15 +18734,27 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19780,7 +19782,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -17625,29 +18787,26 @@
+@@ -17625,29 +18789,26 @@
;;
# This must be Linux ELF.
@@ -19817,7 +19819,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,
-@@ -17657,6 +18816,18 @@
+@@ -17657,6 +18818,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19836,7 +19838,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17666,7 +18837,7 @@
+@@ -17666,7 +18839,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19845,7 +19847,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17694,8 +18865,13 @@
+@@ -17694,8 +18867,13 @@
openbsd*)
version_type=sunos
@@ -19860,7 +19862,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
-@@ -17715,7 +18891,7 @@
+@@ -17715,7 +18893,7 @@
os2*)
libname_spec='$name'
@@ -19869,7 +19871,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17733,13 +18909,6 @@
+@@ -17733,13 +18911,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19883,7 +19885,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17765,7 +18934,7 @@
+@@ -17765,7 +18936,7 @@
need_version=yes
;;
@@ -19892,7 +19894,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'
-@@ -17798,6 +18967,29 @@
+@@ -17798,6 +18969,29 @@
fi
;;
@@ -19922,7 +19924,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17809,16 +19001,21 @@
+@@ -17809,16 +19003,21 @@
dynamic_linker=no
;;
esac
@@ -19950,7 +19952,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17838,8 +19035,8 @@
+@@ -17838,8 +19037,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -19961,7 +19963,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17850,36 +19047,6 @@
+@@ -17850,36 +19049,6 @@
enable_fast_install=needless
fi
@@ -19998,7 +20000,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17894,7 +19061,8 @@
+@@ -17894,7 +19063,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.
@@ -20008,7 +20010,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 \
-@@ -17994,6 +19162,12 @@
+@@ -17994,6 +19164,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -20021,7 +20023,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18005,6 +19179,9 @@
+@@ -18005,6 +19181,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -20031,7 +20033,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18024,7 +19201,7 @@
+@@ -18024,7 +19203,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -20040,7 +20042,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18055,7 +19232,7 @@
+@@ -18055,7 +19234,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20049,7 +20051,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18070,7 +19247,7 @@
+@@ -18070,7 +19249,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -20058,7 +20060,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18272,7 +19449,10 @@
+@@ -18272,7 +19451,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.
@@ -20070,7 +20072,7 @@
fi
-@@ -18293,7 +19473,6 @@
+@@ -18293,7 +19475,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -20078,7 +20080,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18305,26 +19484,55 @@
+@@ -18305,26 +19486,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -20135,7 +20137,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
-@@ -18336,8 +19544,8 @@
+@@ -18336,8 +19546,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -20146,7 +20148,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18351,26 +19559,28 @@
+@@ -18351,26 +19561,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 \
@@ -20155,12 +20157,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18357: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19565: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19567: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18361: \$? = $ac_status" >&5
-+ echo "$as_me:19569: \$? = $ac_status" >&5
++ echo "$as_me:19571: \$? = $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
@@ -20182,7 +20184,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"
-@@ -18384,8 +19594,8 @@
+@@ -18384,8 +19596,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -20193,7 +20195,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18423,6 +19633,11 @@
+@@ -18423,6 +19635,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -20205,7 +20207,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18439,7 +19654,7 @@
+@@ -18439,7 +19656,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20214,7 +20216,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18465,6 +19680,16 @@
+@@ -18465,6 +19682,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20231,7 +20233,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18476,7 +19701,7 @@
+@@ -18476,7 +19703,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.
@@ -20240,7 +20242,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18499,13 +19724,20 @@
+@@ -18499,13 +19726,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -20263,7 +20265,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18520,15 +19752,15 @@
+@@ -18520,15 +19754,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -20285,7 +20287,7 @@
;;
sunos4*)
-@@ -18537,7 +19769,7 @@
+@@ -18537,7 +19771,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -20294,7 +20296,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18550,6 +19782,17 @@
+@@ -18550,6 +19784,17 @@
fi
;;
@@ -20312,7 +20314,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18561,16 +19804,16 @@
+@@ -18561,16 +19806,16 @@
esac
fi
@@ -20333,7 +20335,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18584,26 +19827,28 @@
+@@ -18584,26 +19829,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 \
@@ -20342,12 +20344,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19833: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19835: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18594: \$? = $ac_status" >&5
-+ echo "$as_me:19837: \$? = $ac_status" >&5
++ echo "$as_me:19839: \$? = $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
@@ -20369,7 +20371,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18616,7 +19861,7 @@
+@@ -18616,7 +19863,7 @@
fi
fi
@@ -20378,7 +20380,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18626,8 +19871,50 @@
+@@ -18626,8 +19873,50 @@
;;
esac
@@ -20431,7 +20433,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18638,60 +19925,58 @@
+@@ -18638,60 +19927,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20453,12 +20455,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18657: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19937: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19939: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18661: \$? = $ac_status" >&5
-+ echo "$as_me:19941: \$? = $ac_status" >&5
++ echo "$as_me:19943: \$? = $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
@@ -20510,7 +20512,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;}
-@@ -18701,8 +19986,8 @@
+@@ -18701,8 +19988,8 @@
need_locks=no
fi
@@ -20521,7 +20523,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18740,6 +20025,16 @@
+@@ -18740,6 +20027,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20538,7 +20540,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18750,6 +20045,10 @@
+@@ -18750,6 +20047,10 @@
with_gnu_ld=no
fi
;;
@@ -20549,7 +20551,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18760,6 +20059,27 @@
+@@ -18760,6 +20061,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20577,7 +20579,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18797,7 +20117,7 @@
+@@ -18797,7 +20119,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20586,7 +20588,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18807,13 +20127,13 @@
+@@ -18807,13 +20129,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'
@@ -20603,7 +20605,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
-@@ -18822,23 +20142,70 @@
+@@ -18822,23 +20144,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20680,7 +20682,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18852,13 +20219,40 @@
+@@ -18852,13 +20221,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20723,7 +20725,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18868,24 +20262,19 @@
+@@ -18868,24 +20264,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20755,7 +20757,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18897,7 +20286,7 @@
+@@ -18897,7 +20288,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -20764,7 +20766,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18919,9 +20308,21 @@
+@@ -18919,9 +20310,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
@@ -20788,7 +20790,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18938,7 +20339,7 @@
+@@ -18938,7 +20341,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -20797,7 +20799,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`
-@@ -18957,8 +20358,12 @@
+@@ -18957,8 +20360,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -20810,7 +20812,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18966,22 +20371,23 @@
+@@ -18966,22 +20373,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20841,7 +20843,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19028,19 +20434,20 @@
+@@ -19028,19 +20436,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20866,7 +20868,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19090,7 +20497,9 @@
+@@ -19090,7 +20499,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20876,7 +20878,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19100,13 +20509,11 @@
+@@ -19100,13 +20511,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -20893,7 +20895,7 @@
fi
fi
;;
-@@ -19119,7 +20526,7 @@
+@@ -19119,7 +20528,7 @@
ld_shlibs_GCJ=no
;;
@@ -20902,7 +20904,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19129,68 +20536,68 @@
+@@ -19129,68 +20538,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -21015,7 +21017,7 @@
fi
;;
-@@ -19224,8 +20631,8 @@
+@@ -19224,8 +20633,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21026,7 +21028,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19233,7 +20640,7 @@
+@@ -19233,7 +20642,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21035,7 +21037,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
-@@ -19247,47 +20654,62 @@
+@@ -19247,47 +20656,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -21122,7 +21124,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19301,7 +20723,7 @@
+@@ -19301,7 +20725,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21131,7 +21133,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'
-@@ -19311,7 +20733,7 @@
+@@ -19311,7 +20735,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -21140,7 +21142,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
-@@ -19334,7 +20756,8 @@
+@@ -19334,7 +20758,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
@@ -21150,7 +21152,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19344,7 +20767,7 @@
+@@ -19344,7 +20769,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -21159,7 +21161,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19355,14 +20778,14 @@
+@@ -19355,14 +20780,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -21176,7 +21178,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'
-@@ -19374,13 +20797,13 @@
+@@ -19374,13 +20799,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -21192,7 +21194,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19388,21 +20811,15 @@
+@@ -19388,21 +20813,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -21218,7 +21220,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'
-@@ -19411,8 +20828,18 @@
+@@ -19411,8 +20830,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21239,7 +21241,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19421,7 +20848,7 @@
+@@ -19421,7 +20850,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.
@@ -21248,7 +21250,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19469,36 +20896,45 @@
+@@ -19469,36 +20898,45 @@
fi
;;
@@ -21315,7 +21317,7 @@
;;
uts4*)
-@@ -19513,15 +20949,10 @@
+@@ -19513,15 +20951,10 @@
esac
fi
@@ -21333,7 +21335,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19539,8 +20970,8 @@
+@@ -19539,8 +20972,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.
@@ -21344,7 +21346,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19554,6 +20985,7 @@
+@@ -19554,6 +20987,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -21352,7 +21354,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19576,20 +21008,20 @@
+@@ -19576,20 +21010,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21378,7 +21380,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19599,7 +21031,20 @@
+@@ -19599,7 +21033,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21400,7 +21402,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19664,7 +21109,7 @@
+@@ -19664,7 +21111,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21409,7 +21411,7 @@
;;
beos*)
-@@ -19673,7 +21118,7 @@
+@@ -19673,7 +21120,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21418,7 +21420,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19689,7 +21134,7 @@
+@@ -19689,7 +21136,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21427,7 +21429,7 @@
need_version=no
need_lib_prefix=no
-@@ -19701,7 +21146,8 @@
+@@ -19701,7 +21148,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21437,7 +21439,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19731,7 +21177,7 @@
+@@ -19731,7 +21179,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21446,7 +21448,7 @@
;;
esac
;;
-@@ -19754,7 +21200,7 @@
+@@ -19754,7 +21202,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21455,7 +21457,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"`
-@@ -19777,20 +21223,17 @@
+@@ -19777,20 +21225,17 @@
dynamic_linker=no
;;
@@ -21487,7 +21489,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19808,14 +21251,19 @@
+@@ -19808,14 +21253,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21509,7 +21511,7 @@
esac
;;
-@@ -19835,9 +21283,9 @@
+@@ -19835,9 +21285,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21521,7 +21523,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19852,7 +21300,7 @@
+@@ -19852,7 +21302,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21530,7 +21532,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19863,7 +21311,7 @@
+@@ -19863,7 +21313,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21539,7 +21541,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19875,6 +21323,18 @@
+@@ -19875,6 +21325,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21558,27 +21560,18 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19908,1074 +21368,274 @@
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-- hardcode_into_libs=yes
-- ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
--
--# This must be Linux ELF.
+@@ -19918,29 +21380,26 @@
+ ;;
+
+ # This must be Linux ELF.
-linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -21586,49 +21579,59 @@
- libsuff=64
- fi
- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
--
-- # We used to test for /lib/ld.so.1 and disable shared libraries on
-- # powerpc, because MkLinux only supported shared libraries with the
-- # GNU dynamic linker. Since this was broken with cross compilers,
-- # most powerpc-linux boxes support dynamic linking these days and
-- # people can always --disable-shared, the test was removed, and we
-- # assume the GNU/Linux dynamic linker is in use.
-- dynamic_linker='GNU/Linux ld.so'
-- ;;
--
--netbsd*)
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -19950,6 +21409,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -19959,7 +21430,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- dynamic_linker='NetBSD ld.elf_so'
-- fi
-- shlibpath_var=LD_LIBRARY_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -19972,1010 +21443,201 @@
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
- ;;
-
--newsos6)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- ;;
--
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
@@ -22439,10 +22442,7 @@
-#endif
-
-#include <stdio.h>
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -22452,11 +22452,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -22478,62 +22474,24 @@
-# endif
-# endif
-#endif
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-
+-
- exit (status);
-}
-EOF
@@ -22552,34 +22510,14 @@
- else :
- # compilation failed
- lt_cv_dlopen_self=no
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
- fi
+- fi
-fi
-rm -fr conftest*
-
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
@@ -22876,7 +22814,7 @@
fi
-@@ -20992,7 +21652,8 @@
+@@ -20992,7 +21654,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.
@@ -22886,7 +22824,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 \
-@@ -21092,6 +21753,12 @@
+@@ -21092,6 +21755,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22899,7 +22837,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21103,6 +21770,9 @@
+@@ -21103,6 +21772,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22909,7 +22847,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21122,7 +21792,7 @@
+@@ -21122,7 +21794,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22918,7 +22856,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21153,7 +21823,7 @@
+@@ -21153,7 +21825,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22927,7 +22865,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21168,7 +21838,7 @@
+@@ -21168,7 +21840,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -22936,7 +22874,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21370,7 +22040,10 @@
+@@ -21370,7 +22042,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.
@@ -22948,7 +22886,7 @@
fi
-@@ -21390,7 +22063,6 @@
+@@ -21390,7 +22065,6 @@
RC)
@@ -22956,7 +22894,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21409,15 +22081,42 @@
+@@ -21409,15 +22083,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22999,7 +22937,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21433,7 +22132,8 @@
+@@ -21433,7 +22134,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.
@@ -23009,7 +22947,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 \
-@@ -21533,6 +22233,12 @@
+@@ -21533,6 +22235,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -23022,7 +22960,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21544,6 +22250,9 @@
+@@ -21544,6 +22252,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -23032,7 +22970,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21563,7 +22272,7 @@
+@@ -21563,7 +22274,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -23041,7 +22979,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21594,7 +22303,7 @@
+@@ -21594,7 +22305,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -23050,7 +22988,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21609,7 +22318,7 @@
+@@ -21609,7 +22320,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -23059,7 +22997,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21811,7 +22520,10 @@
+@@ -21811,7 +22522,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.
@@ -23071,7 +23009,7 @@
fi
-@@ -21858,7 +22570,7 @@
+@@ -21858,7 +22572,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -23080,7 +23018,7 @@
# Prevent multiple expansion
-@@ -21910,18 +22622,17 @@
+@@ -21910,18 +22624,17 @@
@@ -23102,7 +23040,7 @@
-@@ -21950,8 +22661,8 @@
+@@ -21950,8 +22663,8 @@
. ./conftest
rm -f conftest
@@ -23113,7 +23051,7 @@
if test "${libltdl_cv_shlibext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21975,8 +22686,8 @@
+@@ -21975,8 +22688,8 @@
rm -f conftest
fi
@@ -23124,7 +23062,7 @@
if test -n "$libltdl_cv_shlibext"; then
cat >>confdefs.h <<_ACEOF
-@@ -21985,15 +22696,15 @@
+@@ -21985,15 +22698,15 @@
fi
@@ -23144,7 +23082,7 @@
if test -n "$libltdl_cv_shlibpath_var"; then
cat >>confdefs.h <<_ACEOF
-@@ -22002,15 +22713,15 @@
+@@ -22002,15 +22715,15 @@
fi
@@ -23164,7 +23102,7 @@
if test -n "$libltdl_cv_sys_search_path"; then
case "$host" in
*-*-mingw*) pathsep=";" ;;
-@@ -22031,8 +22742,8 @@
+@@ -22031,8 +22744,8 @@
fi
@@ -23175,7 +23113,7 @@
if test "${libltdl_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22051,8 +22762,8 @@
+@@ -22051,8 +22764,8 @@
rmdir .libs 2>/dev/null
fi
fi
@@ -23186,7 +23124,7 @@
cat >>confdefs.h <<_ACEOF
#define LTDL_OBJDIR "$libltdl_cv_objdir/"
-@@ -22060,8 +22771,8 @@
+@@ -22060,8 +22773,8 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -23197,7 +23135,7 @@
if test "${ac_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22235,11 +22946,11 @@
+@@ -22235,11 +22948,11 @@
if test -z "$ac_cv_sys_global_symbol_pipe"; then
ac_result=no
fi
@@ -23213,7 +23151,7 @@
if test "${libltdl_cv_preloaded_symbols+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22250,8 +22961,8 @@
+@@ -22250,8 +22963,8 @@
fi
fi
@@ -23224,7 +23162,7 @@
if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -22261,8 +22972,8 @@
+@@ -22261,8 +22974,8 @@
fi
LIBADD_DL=
@@ -23235,7 +23173,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22275,17 +22986,17 @@
+@@ -22275,17 +22988,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23257,7 +23195,7 @@
;
return 0;
}
-@@ -22317,14 +23028,15 @@
+@@ -22317,14 +23030,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23276,7 +23214,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22332,8 +23044,8 @@
+@@ -22332,8 +23046,8 @@
_ACEOF
LIBADD_DL="-ldl"
else
@@ -23287,7 +23225,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22360,30 +23072,24 @@
+@@ -22360,30 +23074,24 @@
#undef dlopen
@@ -23323,7 +23261,7 @@
;
return 0;
}
-@@ -22415,13 +23121,14 @@
+@@ -22415,13 +23123,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23341,7 +23279,7 @@
if test $ac_cv_func_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22429,8 +23136,8 @@
+@@ -22429,8 +23138,8 @@
_ACEOF
else
@@ -23352,7 +23290,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22443,17 +23150,17 @@
+@@ -22443,17 +23152,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23374,7 +23312,7 @@
;
return 0;
}
-@@ -22485,14 +23192,15 @@
+@@ -22485,14 +23194,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23393,7 +23331,7 @@
if test $ac_cv_lib_svld_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22506,8 +23214,8 @@
+@@ -22506,8 +23216,8 @@
fi
@@ -23404,7 +23342,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22534,30 +23242,24 @@
+@@ -22534,30 +23244,24 @@
#undef shl_load
@@ -23440,7 +23378,7 @@
;
return 0;
}
-@@ -22589,13 +23291,14 @@
+@@ -22589,13 +23293,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23458,7 +23396,7 @@
if test $ac_cv_func_shl_load = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22603,8 +23306,8 @@
+@@ -22603,8 +23308,8 @@
_ACEOF
else
@@ -23469,7 +23407,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22617,17 +23320,17 @@
+@@ -22617,17 +23322,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23491,7 +23429,7 @@
;
return 0;
}
-@@ -22659,14 +23362,15 @@
+@@ -22659,14 +23364,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23510,7 +23448,7 @@
if test $ac_cv_lib_dld_shl_load = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22679,8 +23383,8 @@
+@@ -22679,8 +23385,8 @@
fi
@@ -23521,7 +23459,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22693,17 +23397,17 @@
+@@ -22693,17 +23399,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23543,7 +23481,7 @@
;
return 0;
}
-@@ -22735,14 +23439,15 @@
+@@ -22735,14 +23441,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23562,7 +23500,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22760,9 +23465,9 @@
+@@ -22760,9 +23467,9 @@
for ac_func in dlerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -23575,7 +23513,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -22788,30 +23493,24 @@
+@@ -22788,30 +23495,24 @@
#undef $ac_func
@@ -23611,7 +23549,7 @@
;
return 0;
}
-@@ -22843,13 +23542,15 @@
+@@ -22843,13 +23544,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23630,7 +23568,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -22861,8 +23562,8 @@
+@@ -22861,8 +23564,8 @@
LIBS="$LIBS_SAVE"
fi
@@ -23641,7 +23579,7 @@
if test "${ac_cv_sys_symbol_underscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22904,14 +23605,14 @@
+@@ -22904,14 +23607,14 @@
fi
@@ -23660,7 +23598,7 @@
if test "${libltdl_cv_need_uscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22991,11 +23692,13 @@
+@@ -22991,11 +23694,13 @@
( exit $ac_status )
libltdl_cv_need_uscore=yes
fi
@@ -23677,7 +23615,7 @@
fi
fi
-@@ -23013,8 +23716,8 @@
+@@ -23013,8 +23718,8 @@
fi
@@ -23688,7 +23626,7 @@
if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23045,8 +23748,8 @@
+@@ -23045,8 +23750,8 @@
esac
fi
@@ -23699,7 +23637,7 @@
if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -23067,18 +23770,19 @@
+@@ -23067,18 +23772,19 @@
for ac_header in malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h dld.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23727,7 +23665,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23115,15 +23819,16 @@
+@@ -23115,15 +23821,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23749,7 +23687,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23157,9 +23862,10 @@
+@@ -23157,9 +23864,10 @@
ac_header_preproc=no
fi
@@ -23762,7 +23700,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23183,25 +23889,19 @@
+@@ -23183,25 +23891,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;}
@@ -23795,7 +23733,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23218,18 +23918,19 @@
+@@ -23218,18 +23920,19 @@
for ac_header in string.h strings.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23823,7 +23761,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23266,15 +23967,16 @@
+@@ -23266,15 +23969,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23845,7 +23783,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23308,9 +24010,10 @@
+@@ -23308,9 +24012,10 @@
ac_header_preproc=no
fi
@@ -23858,7 +23796,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23334,25 +24037,19 @@
+@@ -23334,25 +24039,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;}
@@ -23891,7 +23829,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23369,9 +24066,9 @@
+@@ -23369,9 +24068,9 @@
for ac_func in strchr index
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -23904,7 +23842,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23397,30 +24094,24 @@
+@@ -23397,30 +24096,24 @@
#undef $ac_func
@@ -23940,7 +23878,7 @@
;
return 0;
}
-@@ -23452,13 +24143,15 @@
+@@ -23452,13 +24145,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23959,7 +23897,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23472,9 +24165,9 @@
+@@ -23472,9 +24167,9 @@
for ac_func in strrchr rindex
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -23972,7 +23910,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23500,30 +24193,24 @@
+@@ -23500,30 +24195,24 @@
#undef $ac_func
@@ -24008,7 +23946,7 @@
;
return 0;
}
-@@ -23555,13 +24242,15 @@
+@@ -23555,13 +24244,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24027,7 +23965,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23575,9 +24264,9 @@
+@@ -23575,9 +24266,9 @@
for ac_func in memcpy bcopy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -24040,7 +23978,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23603,30 +24292,24 @@
+@@ -23603,30 +24294,24 @@
#undef $ac_func
@@ -24076,7 +24014,7 @@
;
return 0;
}
-@@ -23658,13 +24341,15 @@
+@@ -23658,13 +24343,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24095,7 +24033,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23677,9 +24362,9 @@
+@@ -23677,9 +24364,9 @@
for ac_func in strcmp
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -24108,7 +24046,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23705,30 +24390,24 @@
+@@ -23705,30 +24392,24 @@
#undef $ac_func
@@ -24144,7 +24082,7 @@
;
return 0;
}
-@@ -23760,13 +24439,15 @@
+@@ -23760,13 +24441,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24163,7 +24101,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23789,8 +24470,8 @@
+@@ -23789,8 +24472,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -24174,7 +24112,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23816,17 +24497,17 @@
+@@ -23816,17 +24499,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -24198,7 +24136,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23841,32 +24522,33 @@
+@@ -23841,32 +24524,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24240,7 +24178,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -23875,8 +24557,8 @@
+@@ -23875,8 +24559,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -24251,7 +24189,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23902,11 +24584,11 @@
+@@ -23902,11 +24586,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -24267,7 +24205,7 @@
fi
-@@ -23914,8 +24596,8 @@
+@@ -23914,8 +24598,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -24278,7 +24216,7 @@
XGETTEXT=":"
fi
fi
-@@ -23925,8 +24607,8 @@
+@@ -23925,8 +24609,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
@@ -24289,7 +24227,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23939,32 +24621,34 @@
+@@ -23939,32 +24623,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24331,7 +24269,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23977,33 +24661,47 @@
+@@ -23977,33 +24663,47 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24388,7 +24326,7 @@
if test "${ac_cv_type_off_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24014,12 +24712,13 @@
+@@ -24014,12 +24714,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24404,7 +24342,7 @@
return 0;
;
return 0;
-@@ -24052,24 +24751,25 @@
+@@ -24052,24 +24753,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24436,7 +24374,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24080,12 +24780,13 @@
+@@ -24080,12 +24782,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -24452,7 +24390,7 @@
return 0;
;
return 0;
-@@ -24118,26 +24819,27 @@
+@@ -24118,26 +24821,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24486,7 +24424,7 @@
if test "${ac_cv_working_alloca_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24183,13 +24885,14 @@
+@@ -24183,13 +24887,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24504,7 +24442,7 @@
if test $ac_cv_working_alloca_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24198,8 +24901,8 @@
+@@ -24198,8 +24903,8 @@
fi
@@ -24515,7 +24453,7 @@
if test "${ac_cv_func_alloca_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24265,13 +24968,14 @@
+@@ -24265,13 +24970,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24533,7 +24471,7 @@
if test $ac_cv_func_alloca_works = yes; then
-@@ -24285,15 +24989,15 @@
+@@ -24285,15 +24991,15 @@
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
@@ -24552,7 +24490,7 @@
if test "${ac_cv_os_cray+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24303,7 +25007,7 @@
+@@ -24303,7 +25009,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24561,7 +24499,7 @@
webecray
#else
wenotbecray
-@@ -24319,14 +25023,14 @@
+@@ -24319,14 +25025,14 @@
rm -f conftest*
fi
@@ -24581,7 +24519,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -24352,30 +25056,24 @@
+@@ -24352,30 +25058,24 @@
#undef $ac_func
@@ -24617,7 +24555,7 @@
;
return 0;
}
-@@ -24407,13 +25105,15 @@
+@@ -24407,13 +25107,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24636,7 +24574,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -24426,8 +25126,8 @@
+@@ -24426,8 +25128,8 @@
done
fi
@@ -24647,7 +24585,7 @@
if test "${ac_cv_c_stack_direction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24440,6 +25140,7 @@
+@@ -24440,6 +25142,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -24655,7 +24593,7 @@
int
find_stack_direction ()
{
-@@ -24457,7 +25158,7 @@
+@@ -24457,7 +25160,7 @@
int
main ()
{
@@ -24664,7 +24602,7 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -24480,11 +25181,13 @@
+@@ -24480,11 +25183,13 @@
( exit $ac_status )
ac_cv_c_stack_direction=-1
fi
@@ -24681,7 +24619,7 @@
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -24498,18 +25201,19 @@
+@@ -24498,18 +25203,19 @@
for ac_header in stdlib.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -24709,7 +24647,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24546,15 +25250,16 @@
+@@ -24546,15 +25252,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24731,7 +24669,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24588,9 +25293,10 @@
+@@ -24588,9 +25295,10 @@
ac_header_preproc=no
fi
@@ -24744,7 +24682,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24614,25 +25320,19 @@
+@@ -24614,25 +25322,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;}
@@ -24777,7 +24715,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24648,9 +25348,9 @@
+@@ -24648,9 +25350,9 @@
for ac_func in getpagesize
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -24790,7 +24728,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -24676,30 +25376,24 @@
+@@ -24676,30 +25378,24 @@
#undef $ac_func
@@ -24826,7 +24764,7 @@
;
return 0;
}
-@@ -24731,13 +25425,15 @@
+@@ -24731,13 +25427,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24845,7 +24783,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -24746,8 +25442,8 @@
+@@ -24746,8 +25444,8 @@
fi
done
@@ -24856,7 +24794,7 @@
if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24842,15 +25538,15 @@
+@@ -24842,15 +25540,15 @@
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
@@ -24875,7 +24813,7 @@
close (fd);
/* Next, try to mmap the file at a fixed address which already has
-@@ -24858,17 +25554,17 @@
+@@ -24858,17 +25556,17 @@
we see the same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
@@ -24898,7 +24836,7 @@
/* Finally, make sure that changes to the mapped area do not
percolate back to the file as seen by read(). (This is a bug on
-@@ -24877,14 +25573,14 @@
+@@ -24877,14 +25575,14 @@
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
@@ -24917,7 +24855,7 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -24907,11 +25603,13 @@
+@@ -24907,11 +25605,13 @@
( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no
fi
@@ -24934,7 +24872,7 @@
if test $ac_cv_func_mmap_fixed_mapped = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24930,18 +25628,19 @@
+@@ -24930,18 +25630,19 @@
for ac_header in limits.h locale.h nl_types.h string.h values.h alloca.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -24962,7 +24900,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24978,15 +25677,16 @@
+@@ -24978,15 +25679,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24984,7 +24922,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25020,9 +25720,10 @@
+@@ -25020,9 +25722,10 @@
ac_header_preproc=no
fi
@@ -24997,7 +24935,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25046,25 +25747,19 @@
+@@ -25046,25 +25749,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;}
@@ -25030,7 +24968,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -25089,9 +25784,9 @@
+@@ -25089,9 +25786,9 @@
__argz_count __argz_stringify __argz_next
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -25043,7 +24981,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25117,30 +25812,24 @@
+@@ -25117,30 +25814,24 @@
#undef $ac_func
@@ -25060,17 +24998,15 @@
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
+ something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-+ something starting with __ and the normal name is an alias. */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
#endif
int
@@ -25081,7 +25017,7 @@
;
return 0;
}
-@@ -25172,13 +25861,15 @@
+@@ -25172,13 +25863,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25100,7 +25036,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -25188,8 +25879,8 @@
+@@ -25188,8 +25881,8 @@
done
@@ -25111,7 +25047,7 @@
if test "${kde_cv_func_stpcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25197,8 +25888,7 @@
+@@ -25197,8 +25890,7 @@
kde_safe_cxxflags=$CXXFLAGS
CXXFLAGS="-Werror"
@@ -25121,7 +25057,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'
-@@ -25254,8 +25944,9 @@
+@@ -25254,8 +25946,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25132,7 +25068,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -25267,8 +25958,8 @@
+@@ -25267,8 +25960,8 @@
fi
@@ -25143,7 +25079,7 @@
if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -25278,8 +25969,8 @@
+@@ -25278,8 +25971,8 @@
fi
if test $ac_cv_header_locale_h = yes; then
@@ -25154,7 +25090,7 @@
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25325,13 +26016,14 @@
+@@ -25325,13 +26018,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25172,7 +25108,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -25345,8 +26037,8 @@
+@@ -25345,8 +26039,8 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -25183,7 +25119,7 @@
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
-@@ -25354,8 +26046,8 @@
+@@ -25354,8 +26048,8 @@
esac
done
LINGUAS=$NEW_LINGUAS
@@ -25194,7 +25130,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -25367,8 +26059,7 @@
+@@ -25367,8 +26061,7 @@
@@ -25204,7 +25140,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'
-@@ -25380,8 +26071,8 @@
+@@ -25380,8 +26073,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25215,7 +25151,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25435,15 +26126,16 @@
+@@ -25435,15 +26128,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25235,7 +25171,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -25478,9 +26170,9 @@
+@@ -25478,9 +26172,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`
@@ -25248,52 +25184,75 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25528,12 +26220,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+@@ -25500,138 +26194,10 @@
+ ;
+ return 0;
+ }
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -25545,13 +26239,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
- echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
+-if test "${ac_cv_search_opendir+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -25559,77 +26252,29 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
+- builtin and then its argument prototype would still apply. */
-char opendir ();
-int
-main ()
@@ -25344,6 +25303,97 @@
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -25645,40 +26211,42 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
++ eval "$as_ac_Header=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++ eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+-fi
+-LIBS=$ac_func_search_save_LIBS
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++ac_res=`eval echo '${'$as_ac_Header'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++_ACEOF
+
++ac_header_dirent=$ac_hdr; break
+ fi
+
+-else
+- echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -25686,22 +26254,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -25371,12 +25421,11 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -25651,34 +26296,43 @@
+@@ -25723,40 +26298,73 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
+- ac_cv_search_opendir="none required"
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
@@ -25387,7 +25436,10 @@
+
rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-- done
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -25397,97 +25449,36 @@
+ :
+else
+ ac_cv_search_opendir=no
- fi
++fi
+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++LIBS=$ac_func_search_save_LIBS
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++
++fi
++
++else
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
++if test "${ac_cv_search_opendir+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25686,77 +26340,29 @@
+ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -25515,7 +25506,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
-@@ -25778,30 +26384,40 @@
+@@ -25778,30 +26386,40 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25566,7 +25557,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25851,8 +26467,9 @@
+@@ -25851,8 +26469,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25577,7 +25568,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -25909,6 +26526,7 @@
+@@ -25909,6 +26528,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -25585,7 +25576,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -25928,8 +26546,8 @@
+@@ -25928,8 +26548,8 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -25596,7 +25587,7 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -25952,12 +26570,14 @@
+@@ -25952,12 +26572,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -25614,7 +25605,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -25979,21 +26599,23 @@
+@@ -25979,21 +26601,23 @@
@@ -25647,7 +25638,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26030,15 +26652,16 @@
+@@ -26030,15 +26654,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25669,7 +25660,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26072,9 +26695,10 @@
+@@ -26072,9 +26697,10 @@
ac_header_preproc=no
fi
@@ -25682,7 +25673,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -26098,25 +26722,19 @@
+@@ -26098,25 +26724,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;}
@@ -25715,7 +25706,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -26130,13 +26748,13 @@
+@@ -26130,13 +26750,13 @@
@@ -25733,7 +25724,7 @@
ACL_LIBS=""
if test "x$with_acl" != xno; then
-@@ -26147,8 +26765,7 @@
+@@ -26147,8 +26767,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -25743,7 +25734,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'
-@@ -26158,17 +26775,17 @@
+@@ -26158,17 +26777,17 @@
if test "${ac_cv_header_sys_acl_h+set}" = set; then
@@ -25767,7 +25758,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26205,15 +26822,16 @@
+@@ -26205,15 +26824,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25789,7 +25780,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26247,9 +26865,10 @@
+@@ -26247,9 +26867,10 @@
ac_header_preproc=no
fi
@@ -25802,7 +25793,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -26273,25 +26892,18 @@
+@@ -26273,25 +26894,18 @@
echo "$as_me: WARNING: sys/acl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sys/acl.h: in the future, the compiler will take precedence" >&2;}
@@ -25833,7 +25824,7 @@
fi
if test $ac_cv_header_sys_acl_h = yes; then
-@@ -26314,8 +26926,7 @@
+@@ -26314,8 +26928,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -25843,7 +25834,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'
-@@ -26325,17 +26936,17 @@
+@@ -26325,17 +26938,17 @@
if test "${ac_cv_header_sys_xattr_h+set}" = set; then
@@ -25867,7 +25858,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26372,15 +26983,16 @@
+@@ -26372,15 +26985,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25889,7 +25880,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26414,9 +27026,10 @@
+@@ -26414,9 +27028,10 @@
ac_header_preproc=no
fi
@@ -25902,7 +25893,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -26440,25 +27053,18 @@
+@@ -26440,25 +27055,18 @@
echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;}
@@ -25933,7 +25924,7 @@
fi
if test $ac_cv_header_sys_xattr_h = yes; then
-@@ -26493,8 +27099,8 @@
+@@ -26493,8 +27101,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -25944,7 +25935,7 @@
if test "${ac_cv_lib_c_acl_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26507,17 +27113,17 @@
+@@ -26507,17 +27115,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25966,7 +25957,7 @@
;
return 0;
}
-@@ -26549,14 +27155,15 @@
+@@ -26549,14 +27157,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25985,7 +25976,7 @@
if test $ac_cv_lib_c_acl_init = yes; then
ACL_LIBS="-lc"
else
-@@ -26572,8 +27179,7 @@
+@@ -26572,8 +27181,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -25995,7 +25986,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'
-@@ -26583,17 +27189,17 @@
+@@ -26583,17 +27191,17 @@
if test "${ac_cv_header_attr_libattr_h+set}" = set; then
@@ -26019,7 +26010,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26630,15 +27236,16 @@
+@@ -26630,15 +27238,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26041,7 +26032,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26672,9 +27279,10 @@
+@@ -26672,9 +27281,10 @@
ac_header_preproc=no
fi
@@ -26054,7 +26045,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -26698,25 +27306,18 @@
+@@ -26698,25 +27308,18 @@
echo "$as_me: WARNING: attr/libattr.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: attr/libattr.h: in the future, the compiler will take precedence" >&2;}
@@ -26085,7 +26076,7 @@
fi
if test $ac_cv_header_attr_libattr_h = yes; then
-@@ -26743,8 +27344,8 @@
+@@ -26743,8 +27346,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -26096,7 +26087,7 @@
if test "${ac_cv_lib_acl_acl_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26757,17 +27358,17 @@
+@@ -26757,17 +27360,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26118,7 +26109,7 @@
;
return 0;
}
-@@ -26799,14 +27400,15 @@
+@@ -26799,14 +27402,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26137,7 +26128,7 @@
if test $ac_cv_lib_acl_acl_init = yes; then
ACL_LIBS="-lacl -lattr"
else
-@@ -26820,8 +27422,7 @@
+@@ -26820,8 +27424,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -26147,7 +26138,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'
-@@ -26831,17 +27432,17 @@
+@@ -26831,17 +27434,17 @@
if test "${ac_cv_header_acl_libacl_h+set}" = set; then
@@ -26171,7 +26162,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26878,15 +27479,16 @@
+@@ -26878,15 +27481,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26193,7 +26184,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26920,9 +27522,10 @@
+@@ -26920,9 +27524,10 @@
ac_header_preproc=no
fi
@@ -26206,7 +26197,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -26946,25 +27549,18 @@
+@@ -26946,25 +27551,18 @@
echo "$as_me: WARNING: acl/libacl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: acl/libacl.h: in the future, the compiler will take precedence" >&2;}
@@ -26237,7 +26228,7 @@
fi
if test $ac_cv_header_acl_libacl_h = yes; then
-@@ -27019,15 +27615,14 @@
+@@ -27019,15 +27617,14 @@
@@ -26256,7 +26247,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'
-@@ -27039,9 +27634,6 @@
+@@ -27039,9 +27636,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26266,7 +26257,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27093,8 +27685,9 @@
+@@ -27093,8 +27687,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26277,7 +26268,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -27108,11 +27701,11 @@
+@@ -27108,11 +27703,11 @@
fi
@@ -26293,7 +26284,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27133,8 +27726,7 @@
+@@ -27133,8 +27728,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26303,7 +26294,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'
-@@ -27199,9 +27791,10 @@
+@@ -27199,9 +27793,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26315,7 +26306,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -27215,8 +27808,8 @@
+@@ -27215,8 +27810,8 @@
fi
@@ -26326,7 +26317,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -27240,15 +27833,14 @@
+@@ -27240,15 +27835,14 @@
@@ -26345,7 +26336,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'
-@@ -27260,9 +27852,6 @@
+@@ -27260,9 +27854,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26355,7 +26346,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27313,8 +27902,9 @@
+@@ -27313,8 +27904,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26366,7 +26357,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -27328,11 +27918,11 @@
+@@ -27328,11 +27920,11 @@
fi
@@ -26382,7 +26373,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27353,8 +27943,7 @@
+@@ -27353,8 +27945,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26392,7 +26383,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'
-@@ -27418,9 +28007,10 @@
+@@ -27418,9 +28009,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26404,7 +26395,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -27434,8 +28024,8 @@
+@@ -27434,8 +28026,8 @@
fi
@@ -26415,7 +26406,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -27458,8 +28048,8 @@
+@@ -27458,8 +28050,8 @@
@@ -26426,7 +26417,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27476,7 +28066,7 @@
+@@ -27476,7 +28068,7 @@
int
main ()
{
@@ -26435,7 +26426,7 @@
;
return 0;
}
-@@ -27508,20 +28098,21 @@
+@@ -27508,20 +28100,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26462,7 +26453,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27538,7 +28129,7 @@
+@@ -27538,7 +28131,7 @@
int
main ()
{
@@ -26471,7 +26462,7 @@
;
return 0;
}
-@@ -27570,21 +28161,22 @@
+@@ -27570,21 +28163,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26499,7 +26490,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27597,17 +28189,17 @@
+@@ -27597,17 +28191,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26521,7 +26512,7 @@
;
return 0;
}
-@@ -27639,19 +28231,20 @@
+@@ -27639,19 +28233,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26547,7 +26538,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27664,17 +28257,17 @@
+@@ -27664,17 +28259,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26569,7 +26560,7 @@
;
return 0;
}
-@@ -27706,14 +28299,15 @@
+@@ -27706,14 +28301,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26588,7 +26579,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -27739,13 +28333,13 @@
+@@ -27739,13 +28335,13 @@
fi
@@ -26605,7 +26596,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'
-@@ -27803,7 +28397,9 @@
+@@ -27803,7 +28399,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26615,7 +26606,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -27814,17 +28410,17 @@
+@@ -27814,17 +28412,17 @@
fi
@@ -26638,7 +26629,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'
-@@ -27882,7 +28478,9 @@
+@@ -27882,7 +28480,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26648,7 +26639,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -27894,8 +28492,8 @@
+@@ -27894,8 +28494,8 @@
fi
@@ -26659,7 +26650,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -27908,8 +28506,8 @@
+@@ -27908,8 +28508,8 @@
_ACEOF
@@ -26670,7 +26661,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27922,17 +28520,17 @@
+@@ -27922,17 +28522,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26692,7 +26683,7 @@
;
return 0;
}
-@@ -27964,21 +28562,22 @@
+@@ -27964,21 +28564,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26720,7 +26711,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27991,17 +28590,17 @@
+@@ -27991,17 +28592,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26742,7 +26733,7 @@
;
return 0;
}
-@@ -28033,21 +28632,22 @@
+@@ -28033,21 +28634,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26770,7 +26761,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28074,30 +28674,24 @@
+@@ -28074,30 +28676,24 @@
#undef inet_ntoa
@@ -26806,7 +26797,7 @@
;
return 0;
}
-@@ -28129,17 +28723,18 @@
+@@ -28129,17 +28725,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26830,7 +26821,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28152,17 +28747,17 @@
+@@ -28152,17 +28749,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26852,7 +26843,7 @@
;
return 0;
}
-@@ -28194,21 +28789,22 @@
+@@ -28194,21 +28791,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26880,7 +26871,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28235,30 +28831,24 @@
+@@ -28235,30 +28833,24 @@
#undef connect
@@ -26916,7 +26907,7 @@
;
return 0;
}
-@@ -28290,17 +28880,18 @@
+@@ -28290,17 +28882,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26940,7 +26931,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28313,17 +28904,17 @@
+@@ -28313,17 +28906,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26962,7 +26953,7 @@
;
return 0;
}
-@@ -28355,22 +28946,23 @@
+@@ -28355,22 +28948,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26991,7 +26982,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28397,30 +28989,24 @@
+@@ -28397,30 +28991,24 @@
#undef remove
@@ -27027,7 +27018,7 @@
;
return 0;
}
-@@ -28452,17 +29038,18 @@
+@@ -28452,17 +29040,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27051,7 +27042,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28475,17 +29062,17 @@
+@@ -28475,17 +29064,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27073,7 +27064,7 @@
;
return 0;
}
-@@ -28517,14 +29104,15 @@
+@@ -28517,14 +29106,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27092,7 +27083,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -28532,8 +29120,8 @@
+@@ -28532,8 +29122,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27103,7 +27094,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28560,30 +29148,24 @@
+@@ -28560,30 +29150,24 @@
#undef shmat
@@ -27139,7 +27130,7 @@
;
return 0;
}
-@@ -28615,18 +29197,19 @@
+@@ -28615,18 +29199,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27164,7 +27155,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28639,17 +29222,17 @@
+@@ -28639,17 +29224,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27186,7 +27177,7 @@
;
return 0;
}
-@@ -28681,14 +29264,15 @@
+@@ -28681,14 +29266,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27205,7 +27196,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -28702,18 +29286,19 @@
+@@ -28702,18 +29288,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27233,7 +27224,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28750,15 +29335,16 @@
+@@ -28750,15 +29337,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27255,7 +27246,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28792,9 +29378,10 @@
+@@ -28792,9 +29380,10 @@
ac_header_preproc=no
fi
@@ -27268,7 +27259,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28818,25 +29405,19 @@
+@@ -28818,25 +29407,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;}
@@ -27301,7 +27292,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28854,18 +29435,19 @@
+@@ -28854,18 +29437,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27329,7 +27320,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28902,15 +29484,16 @@
+@@ -28902,15 +29486,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27351,7 +27342,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28944,9 +29527,10 @@
+@@ -28944,9 +29529,10 @@
ac_header_preproc=no
fi
@@ -27364,7 +27355,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28970,25 +29554,19 @@
+@@ -28970,25 +29556,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;}
@@ -27397,7 +27388,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -29002,8 +29580,8 @@
+@@ -29002,8 +29582,8 @@
# darwin requires a poll emulation library
@@ -27408,7 +27399,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29016,17 +29594,17 @@
+@@ -29016,17 +29596,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27430,7 +27421,7 @@
;
return 0;
}
-@@ -29058,14 +29636,15 @@
+@@ -29058,14 +29638,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27449,7 +27440,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -29076,18 +29655,19 @@
+@@ -29076,18 +29657,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27477,7 +27468,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29124,15 +29704,16 @@
+@@ -29124,15 +29706,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27499,7 +27490,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29166,9 +29747,10 @@
+@@ -29166,9 +29749,10 @@
ac_header_preproc=no
fi
@@ -27512,7 +27503,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -29192,25 +29774,19 @@
+@@ -29192,25 +29776,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;}
@@ -27545,7 +27536,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -29225,17 +29801,17 @@
+@@ -29225,17 +29803,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27569,7 +27560,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29272,15 +29848,16 @@
+@@ -29272,15 +29850,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27591,7 +27582,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29314,9 +29891,10 @@
+@@ -29314,9 +29893,10 @@
ac_header_preproc=no
fi
@@ -27604,7 +27595,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -29340,25 +29918,18 @@
+@@ -29340,25 +29920,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;}
@@ -27635,7 +27626,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -29375,8 +29946,8 @@
+@@ -29375,8 +29948,8 @@
@@ -27646,7 +27637,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29425,8 +29996,8 @@
+@@ -29425,8 +29998,8 @@
(exit $ac_status); }; }; then
LIBRESOLV="-lresolv"
@@ -27657,7 +27648,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -29437,25 +30008,25 @@
+@@ -29437,25 +30010,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27689,7 +27680,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'
-@@ -29467,9 +30038,6 @@
+@@ -29467,9 +30040,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27699,7 +27690,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29521,8 +30089,9 @@
+@@ -29521,8 +30091,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27710,7 +27701,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -29536,11 +30105,11 @@
+@@ -29536,11 +30107,11 @@
fi
@@ -27726,7 +27717,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29561,8 +30130,7 @@
+@@ -29561,8 +30132,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -27736,7 +27727,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'
-@@ -29627,9 +30195,10 @@
+@@ -29627,9 +30197,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27748,7 +27739,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29643,8 +30212,8 @@
+@@ -29643,8 +30214,8 @@
fi
@@ -27759,7 +27750,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -29671,8 +30240,8 @@
+@@ -29671,8 +30242,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -27770,7 +27761,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29685,17 +30254,17 @@
+@@ -29685,17 +30256,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27792,7 +27783,7 @@
;
return 0;
}
-@@ -29727,27 +30296,28 @@
+@@ -29727,27 +30298,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27830,7 +27821,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29760,17 +30330,17 @@
+@@ -29760,17 +30332,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27852,7 +27843,7 @@
;
return 0;
}
-@@ -29802,22 +30372,23 @@
+@@ -29802,22 +30374,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27881,7 +27872,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29828,12 +30399,13 @@
+@@ -29828,12 +30401,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27897,7 +27888,7 @@
return 0;
;
return 0;
-@@ -29866,20 +30438,21 @@
+@@ -29866,20 +30440,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27925,7 +27916,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -29892,10 +30465,11 @@
+@@ -29892,10 +30467,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27938,7 +27929,7 @@
test_array [0] = 0
;
-@@ -29933,10 +30507,11 @@
+@@ -29933,10 +30509,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -27951,7 +27942,7 @@
test_array [0] = 0
;
-@@ -29970,30 +30545,32 @@
+@@ -29970,30 +30547,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27992,7 +27983,7 @@
test_array [0] = 0
;
-@@ -30031,10 +30608,11 @@
+@@ -30031,10 +30610,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28005,7 +27996,7 @@
test_array [0] = 0
;
-@@ -30068,23 +30646,26 @@
+@@ -30068,23 +30648,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28039,7 +28030,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -30096,10 +30677,11 @@
+@@ -30096,10 +30679,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28052,7 +28043,7 @@
test_array [0] = 0
;
-@@ -30133,26 +30715,20 @@
+@@ -30133,26 +30717,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28084,7 +28075,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30160,8 +30736,9 @@
+@@ -30160,8 +30738,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28096,7 +28087,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -30170,22 +30747,22 @@
+@@ -30170,22 +30749,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28128,7 +28119,7 @@
;
return 0;
-@@ -30209,28 +30786,27 @@
+@@ -30209,28 +30788,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -28165,7 +28156,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30241,12 +30817,13 @@
+@@ -30241,12 +30819,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28181,7 +28172,7 @@
return 0;
;
return 0;
-@@ -30279,20 +30856,21 @@
+@@ -30279,20 +30858,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28209,7 +28200,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -30305,10 +30883,11 @@
+@@ -30305,10 +30885,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28222,7 +28213,7 @@
test_array [0] = 0
;
-@@ -30346,10 +30925,11 @@
+@@ -30346,10 +30927,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28235,7 +28226,7 @@
test_array [0] = 0
;
-@@ -30383,30 +30963,32 @@
+@@ -30383,30 +30965,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28276,7 +28267,7 @@
test_array [0] = 0
;
-@@ -30444,10 +31026,11 @@
+@@ -30444,10 +31028,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28289,7 +28280,7 @@
test_array [0] = 0
;
-@@ -30481,23 +31064,26 @@
+@@ -30481,23 +31066,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28323,7 +28314,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -30509,10 +31095,11 @@
+@@ -30509,10 +31097,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28336,7 +28327,7 @@
test_array [0] = 0
;
-@@ -30546,26 +31133,20 @@
+@@ -30546,26 +31135,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28368,7 +28359,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30573,8 +31154,9 @@
+@@ -30573,8 +31156,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28380,7 +28371,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -30583,22 +31165,22 @@
+@@ -30583,22 +31167,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28412,7 +28403,7 @@
;
return 0;
-@@ -30622,28 +31204,27 @@
+@@ -30622,28 +31206,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -28449,7 +28440,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30654,12 +31235,13 @@
+@@ -30654,12 +31237,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28465,7 +28456,7 @@
return 0;
;
return 0;
-@@ -30692,20 +31274,21 @@
+@@ -30692,20 +31276,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28493,7 +28484,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -30718,10 +31301,11 @@
+@@ -30718,10 +31303,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28506,7 +28497,7 @@
test_array [0] = 0
;
-@@ -30759,10 +31343,11 @@
+@@ -30759,10 +31345,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28519,7 +28510,7 @@
test_array [0] = 0
;
-@@ -30796,30 +31381,32 @@
+@@ -30796,30 +31383,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28560,7 +28551,7 @@
test_array [0] = 0
;
-@@ -30857,10 +31444,11 @@
+@@ -30857,10 +31446,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28573,7 +28564,7 @@
test_array [0] = 0
;
-@@ -30894,23 +31482,26 @@
+@@ -30894,23 +31484,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28607,7 +28598,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -30922,10 +31513,11 @@
+@@ -30922,10 +31515,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28620,7 +28611,7 @@
test_array [0] = 0
;
-@@ -30959,26 +31551,20 @@
+@@ -30959,26 +31553,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28652,7 +28643,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30986,8 +31572,9 @@
+@@ -30986,8 +31574,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28664,7 +28655,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -30996,22 +31583,22 @@
+@@ -30996,22 +31585,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28696,7 +28687,7 @@
;
return 0;
-@@ -31035,28 +31622,27 @@
+@@ -31035,28 +31624,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -28733,7 +28724,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31067,12 +31653,13 @@
+@@ -31067,12 +31655,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28749,7 +28740,7 @@
return 0;
;
return 0;
-@@ -31105,20 +31692,21 @@
+@@ -31105,20 +31694,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28777,7 +28768,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -31131,10 +31719,11 @@
+@@ -31131,10 +31721,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28790,7 +28781,7 @@
test_array [0] = 0
;
-@@ -31172,10 +31761,11 @@
+@@ -31172,10 +31763,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28803,7 +28794,7 @@
test_array [0] = 0
;
-@@ -31209,30 +31799,32 @@
+@@ -31209,30 +31801,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28844,7 +28835,7 @@
test_array [0] = 0
;
-@@ -31270,10 +31862,11 @@
+@@ -31270,10 +31864,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28857,7 +28848,7 @@
test_array [0] = 0
;
-@@ -31307,23 +31900,26 @@
+@@ -31307,23 +31902,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28891,7 +28882,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -31335,10 +31931,11 @@
+@@ -31335,10 +31933,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28904,7 +28895,7 @@
test_array [0] = 0
;
-@@ -31372,26 +31969,20 @@
+@@ -31372,26 +31971,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28936,7 +28927,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31399,8 +31990,9 @@
+@@ -31399,8 +31992,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28948,7 +28939,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -31409,22 +32001,22 @@
+@@ -31409,22 +32003,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28980,7 +28971,7 @@
;
return 0;
-@@ -31448,30 +32040,29 @@
+@@ -31448,30 +32042,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29019,7 +29010,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31484,17 +32075,17 @@
+@@ -31484,17 +32077,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29041,7 +29032,7 @@
;
return 0;
}
-@@ -31526,14 +32117,15 @@
+@@ -31526,14 +32119,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29060,7 +29051,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -31542,8 +32134,8 @@
+@@ -31542,8 +32136,8 @@
fi
@@ -29071,7 +29062,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31556,17 +32148,17 @@
+@@ -31556,17 +32150,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29093,7 +29084,7 @@
;
return 0;
}
-@@ -31598,14 +32190,15 @@
+@@ -31598,14 +32192,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29112,7 +29103,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -31619,8 +32212,8 @@
+@@ -31619,8 +32214,8 @@
@@ -29123,7 +29114,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31631,12 +32224,13 @@
+@@ -31631,12 +32226,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29139,7 +29130,7 @@
return 0;
;
return 0;
-@@ -31669,20 +32263,21 @@
+@@ -31669,20 +32265,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29167,7 +29158,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -31695,10 +32290,11 @@
+@@ -31695,10 +32292,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29180,7 +29171,7 @@
test_array [0] = 0
;
-@@ -31736,10 +32332,11 @@
+@@ -31736,10 +32334,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29193,7 +29184,7 @@
test_array [0] = 0
;
-@@ -31773,30 +32370,32 @@
+@@ -31773,30 +32372,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29234,7 +29225,7 @@
test_array [0] = 0
;
-@@ -31834,10 +32433,11 @@
+@@ -31834,10 +32435,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29247,7 +29238,7 @@
test_array [0] = 0
;
-@@ -31871,23 +32471,26 @@
+@@ -31871,23 +32473,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29281,7 +29272,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -31899,10 +32502,11 @@
+@@ -31899,10 +32504,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29294,7 +29285,7 @@
test_array [0] = 0
;
-@@ -31936,26 +32540,20 @@
+@@ -31936,26 +32542,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29326,7 +29317,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31963,8 +32561,9 @@
+@@ -31963,8 +32563,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29338,7 +29329,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -31973,22 +32572,22 @@
+@@ -31973,22 +32574,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29370,7 +29361,7 @@
;
return 0;
-@@ -32012,29 +32611,28 @@
+@@ -32012,29 +32613,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29408,7 +29399,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32045,12 +32643,13 @@
+@@ -32045,12 +32645,13 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29424,7 +29415,7 @@
return 0;
;
return 0;
-@@ -32083,20 +32682,21 @@
+@@ -32083,20 +32684,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29452,7 +29443,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -32109,10 +32709,11 @@
+@@ -32109,10 +32711,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29465,7 +29456,7 @@
test_array [0] = 0
;
-@@ -32150,10 +32751,11 @@
+@@ -32150,10 +32753,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29478,7 +29469,7 @@
test_array [0] = 0
;
-@@ -32187,30 +32789,32 @@
+@@ -32187,30 +32791,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29519,7 +29510,7 @@
test_array [0] = 0
;
-@@ -32248,10 +32852,11 @@
+@@ -32248,10 +32854,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29532,7 +29523,7 @@
test_array [0] = 0
;
-@@ -32285,23 +32890,26 @@
+@@ -32285,23 +32892,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29566,7 +29557,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -32313,10 +32921,11 @@
+@@ -32313,10 +32923,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29579,7 +29570,7 @@
test_array [0] = 0
;
-@@ -32350,26 +32959,20 @@
+@@ -32350,26 +32961,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29611,7 +29602,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32377,8 +32980,9 @@
+@@ -32377,8 +32982,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29623,7 +29614,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -32387,22 +32991,22 @@
+@@ -32387,22 +32993,22 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29655,7 +29646,7 @@
;
return 0;
-@@ -32426,30 +33030,29 @@
+@@ -32426,30 +33032,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29694,7 +29685,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32491,15 +33094,15 @@
+@@ -32491,15 +33096,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -29714,7 +29705,7 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -32511,18 +33114,18 @@
+@@ -32511,18 +33116,18 @@
{ (exit 1); exit 1; }; }
fi
@@ -29737,7 +29728,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'
-@@ -32578,8 +33181,9 @@
+@@ -32578,8 +33183,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29748,7 +29739,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -32593,26 +33197,26 @@
+@@ -32593,26 +33199,26 @@
fi
@@ -29785,7 +29776,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -32631,18 +33235,19 @@
+@@ -32631,18 +33237,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29813,7 +29804,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32679,15 +33284,16 @@
+@@ -32679,15 +33286,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29835,7 +29826,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32721,9 +33327,10 @@
+@@ -32721,9 +33329,10 @@
ac_header_preproc=no
fi
@@ -29848,7 +29839,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -32747,25 +33354,19 @@
+@@ -32747,25 +33356,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;}
@@ -29881,7 +29872,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -32777,8 +33378,8 @@
+@@ -32777,8 +33380,8 @@
done
@@ -29892,7 +29883,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32805,30 +33406,24 @@
+@@ -32805,30 +33408,24 @@
#undef _NSGetEnviron
@@ -29928,7 +29919,7 @@
;
return 0;
}
-@@ -32860,13 +33455,14 @@
+@@ -32860,13 +33457,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29946,7 +29937,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -32887,9 +33483,9 @@
+@@ -32887,9 +33485,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29959,7 +29950,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32915,30 +33511,24 @@
+@@ -32915,30 +33513,24 @@
#undef $ac_func
@@ -29995,7 +29986,7 @@
;
return 0;
}
-@@ -32970,13 +33560,15 @@
+@@ -32970,13 +33562,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30014,7 +30005,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -32993,32 +33585,32 @@
+@@ -32993,32 +33587,32 @@
@@ -30059,7 +30050,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -33034,8 +33626,8 @@
+@@ -33034,8 +33628,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -30070,7 +30061,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33140,6 +33732,7 @@
+@@ -33140,6 +33734,7 @@
fi
done
fi
@@ -30078,7 +30069,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -33197,7 +33790,7 @@
+@@ -33197,7 +33792,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30087,7 +30078,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}/` \
-@@ -33245,6 +33838,7 @@
+@@ -33245,6 +33840,7 @@
done
done
fi
@@ -30095,7 +30086,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -33255,7 +33849,7 @@
+@@ -33255,7 +33851,7 @@
*-*-solaris*)
;;
*)
@@ -30104,7 +30095,7 @@
if mkdir conftest.dir; then
cd conftest.dir
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
-@@ -33263,13 +33857,13 @@
+@@ -33263,13 +33859,13 @@
acfindx:
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
_ACEOF
@@ -30121,7 +30112,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -33277,7 +33871,7 @@
+@@ -33277,7 +33873,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
@@ -30130,7 +30121,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -33286,7 +33880,7 @@
+@@ -33286,7 +33882,7 @@
esac
fi
cd ..
@@ -30139,7 +30130,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -33330,12 +33924,12 @@
+@@ -33330,12 +33926,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -30156,7 +30147,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -33363,8 +33957,8 @@
+@@ -33363,8 +33959,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.
@@ -30167,7 +30158,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33377,17 +33971,17 @@
+@@ -33377,17 +33973,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30189,7 +30180,7 @@
;
return 0;
}
-@@ -33419,14 +34013,15 @@
+@@ -33419,14 +34015,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30208,7 +30199,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -33435,8 +34030,8 @@
+@@ -33435,8 +34032,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -30219,7 +30210,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33496,9 +34091,10 @@
+@@ -33496,9 +34093,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30231,7 +30222,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -33508,8 +34104,8 @@
+@@ -33508,8 +34106,8 @@
fi
@@ -30242,7 +30233,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -33655,8 +34251,8 @@
+@@ -33655,8 +34253,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -30253,7 +30244,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -33667,9 +34263,9 @@
+@@ -33667,9 +34265,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -30266,7 +30257,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -33681,17 +34277,17 @@
+@@ -33681,17 +34279,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30288,7 +30279,7 @@
;
return 0;
}
-@@ -33723,14 +34319,16 @@
+@@ -33723,14 +34321,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30308,7 +30299,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -33743,8 +34341,8 @@
+@@ -33743,8 +34343,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -30319,7 +30310,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33757,17 +34355,17 @@
+@@ -33757,17 +34357,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30341,7 +30332,7 @@
;
return 0;
}
-@@ -33799,14 +34397,15 @@
+@@ -33799,14 +34399,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30360,7 +30351,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -33814,8 +34413,8 @@
+@@ -33814,8 +34415,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -30371,7 +30362,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -33856,17 +34455,18 @@
+@@ -33856,17 +34457,18 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -30394,7 +30385,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -33882,16 +34482,15 @@
+@@ -33882,16 +34484,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -30415,7 +30406,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'
-@@ -33944,7 +34543,9 @@
+@@ -33944,7 +34545,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30425,7 +30416,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -33958,13 +34559,13 @@
+@@ -33958,13 +34561,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -30443,7 +30434,7 @@
:
fi
-@@ -33976,16 +34577,15 @@
+@@ -33976,16 +34579,15 @@
case $host_os in
solaris*)
@@ -30464,7 +30455,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'
-@@ -34038,7 +34638,9 @@
+@@ -34038,7 +34640,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30474,7 +30465,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -34052,13 +34654,13 @@
+@@ -34052,13 +34656,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -30492,7 +30483,7 @@
:
fi
-@@ -34085,17 +34687,17 @@
+@@ -34085,17 +34689,17 @@
@@ -30516,7 +30507,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -34113,21 +34715,21 @@
+@@ -34113,21 +34717,21 @@
fi
@@ -30546,7 +30537,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -34146,14 +34748,14 @@
+@@ -34146,14 +34750,14 @@
@@ -30565,7 +30556,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34213,8 +34815,9 @@
+@@ -34213,8 +34817,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30576,7 +30567,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -34228,8 +34831,8 @@
+@@ -34228,8 +34833,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -30587,7 +30578,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -34249,8 +34852,8 @@
+@@ -34249,8 +34854,8 @@
@@ -30598,7 +30589,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34312,9 +34915,10 @@
+@@ -34312,9 +34917,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30610,7 +30601,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -34329,19 +34933,19 @@
+@@ -34329,19 +34935,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -30636,7 +30627,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34400,8 +35004,9 @@
+@@ -34400,8 +35006,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30647,7 +30638,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -34412,14 +35017,14 @@
+@@ -34412,14 +35019,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -30668,7 +30659,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34478,8 +35083,9 @@
+@@ -34478,8 +35085,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30679,7 +30670,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -34490,11 +35096,11 @@
+@@ -34490,11 +35098,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -30695,16 +30686,16 @@
LIBJPEG=
-@@ -34514,7 +35120,7 @@
+@@ -34514,7 +35122,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 34517: $i/$j" >&5
-+ echo "configure: 35123: $i/$j" >&5
++ echo "configure: 35125: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34561,14 +35167,14 @@
+@@ -34561,14 +35169,14 @@
@@ -30722,7 +30713,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34611,8 +35217,8 @@
+@@ -34611,8 +35219,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30733,7 +30724,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -34621,8 +35227,8 @@
+@@ -34621,8 +35229,8 @@
{ (exit 1); exit 1; }; }
else
@@ -30744,7 +30735,7 @@
PERL=$kde_cv_path
fi
-@@ -34636,10 +35242,9 @@
+@@ -34636,10 +35244,9 @@
@@ -30757,7 +30748,7 @@
else
if test $kde_qtver = 3; then
-@@ -34649,7 +35254,8 @@
+@@ -34649,7 +35256,8 @@
fi
@@ -30767,7 +30758,7 @@
USING_QT_MT=""
-@@ -34669,13 +35275,13 @@
+@@ -34669,13 +35277,13 @@
else
kde_check_threading_default=yes
fi
@@ -30785,7 +30776,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -34747,8 +35353,8 @@
+@@ -34747,8 +35355,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -30796,7 +30787,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"
-@@ -34757,34 +35363,34 @@
+@@ -34757,34 +35365,34 @@
qt_libraries=""
qt_includes=""
@@ -30811,14 +30802,14 @@
-fi;
+fi
-+
-# Check whether --with-qt-includes or --without-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"
--
++if test "${with_qt_includes+set}" = set; then
+ withval=$with_qt_includes;
ac_qt_includes="$withval"
@@ -30843,16 +30834,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -34812,7 +35418,7 @@
+@@ -34812,7 +35420,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 34815: $i/$j" >&5
-+ echo "configure: 35421: $i/$j" >&5
++ echo "configure: 35423: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -34849,8 +35455,7 @@
+@@ -34849,8 +35457,7 @@
ac_qt_libraries="$qt_libdir"
@@ -30862,7 +30853,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'
-@@ -34987,13 +35592,13 @@
+@@ -34987,13 +35594,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -30880,7 +30871,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -35002,15 +35607,14 @@
+@@ -35002,15 +35609,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -30899,7 +30890,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'
-@@ -35131,12 +35735,12 @@
+@@ -35131,12 +35737,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -30916,7 +30907,7 @@
fi
-@@ -35174,14 +35778,14 @@
+@@ -35174,14 +35780,14 @@
fi
@@ -30934,7 +30925,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35224,8 +35828,8 @@
+@@ -35224,8 +35830,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30945,7 +30936,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -35246,22 +35850,22 @@
+@@ -35246,22 +35852,22 @@
{ (exit 1); exit 1; }; }
else
@@ -30973,7 +30964,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35304,12 +35908,12 @@
+@@ -35304,12 +35910,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -30990,7 +30981,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -35339,10 +35943,10 @@
+@@ -35339,10 +35945,10 @@
if test $kde_qtver = 3; then
@@ -31004,7 +30995,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35365,22 +35969,22 @@
+@@ -35365,22 +35971,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -31034,7 +31025,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35403,13 +36007,13 @@
+@@ -35403,13 +36009,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -31052,7 +31043,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -35440,15 +36044,14 @@
+@@ -35440,15 +36046,14 @@
if test -n "$LIBJPEG"; then
@@ -31071,7 +31062,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'
-@@ -35507,8 +36110,9 @@
+@@ -35507,8 +36112,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31082,7 +31073,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -35525,12 +36129,12 @@
+@@ -35525,12 +36131,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -31099,7 +31090,7 @@
LIBJPEG_QT=
fi
-@@ -35560,15 +36164,15 @@
+@@ -35560,15 +36166,15 @@
@@ -31121,7 +31112,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -35592,11 +36196,11 @@
+@@ -35592,11 +36198,11 @@
@@ -31137,34 +31128,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -35648,7 +36252,7 @@
+@@ -35648,7 +36254,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 35651: $i/$j" >&5
-+ echo "configure: 36255: $i/$j" >&5
++ echo "configure: 36257: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -35678,7 +36282,7 @@
+@@ -35678,7 +36284,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 35681: $i/$j" >&5
-+ echo "configure: 36285: $i/$j" >&5
++ echo "configure: 36287: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -35696,7 +36300,7 @@
+@@ -35696,7 +36302,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 35699: $i/$j" >&5
-+ echo "configure: 36303: $i/$j" >&5
++ echo "configure: 36305: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -35755,12 +36359,12 @@
+@@ -35755,12 +36361,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -31181,7 +31172,7 @@
fi
kde_libraries="${libdir}"
-@@ -35769,8 +36373,8 @@
+@@ -35769,8 +36375,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -31192,7 +31183,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -35808,8 +36412,8 @@
+@@ -35808,8 +36414,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -31203,7 +31194,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35852,8 +36456,8 @@
+@@ -35852,8 +36458,8 @@
fi
@@ -31214,7 +31205,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -35887,13 +36491,12 @@
+@@ -35887,13 +36493,12 @@
@@ -31231,7 +31222,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'
-@@ -35914,13 +36517,13 @@
+@@ -35914,13 +36519,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -31249,7 +31240,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
-@@ -35940,16 +36543,15 @@
+@@ -35940,16 +36545,15 @@
kde_have_gcc_visibility=no
@@ -31270,7 +31261,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'
-@@ -36002,7 +36604,9 @@
+@@ -36002,7 +36606,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31280,7 +31271,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -36016,28 +36620,27 @@
+@@ -36016,28 +36622,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -31301,10 +31292,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
@@ -31318,7 +31309,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'
-@@ -36098,8 +36701,9 @@
+@@ -36098,8 +36703,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31329,7 +31320,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -36112,21 +36716,20 @@
+@@ -36112,21 +36718,20 @@
fi
@@ -31356,7 +31347,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'
-@@ -36192,8 +36795,9 @@
+@@ -36192,8 +36797,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31367,7 +31358,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -36208,8 +36812,8 @@
+@@ -36208,8 +36814,8 @@
fi
@@ -31378,7 +31369,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -36225,8 +36829,8 @@
+@@ -36225,8 +36831,8 @@
fi
else
@@ -31389,7 +31380,7 @@
:
fi
-@@ -36237,8 +36841,8 @@
+@@ -36237,8 +36843,8 @@
@@ -31400,28 +31391,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -36349,15 +36953,14 @@
+@@ -36349,15 +36955,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36409,8 +37012,8 @@
+@@ -36409,8 +37014,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -31432,7 +31423,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.
-@@ -36449,8 +37052,8 @@
+@@ -36449,8 +37054,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -31443,7 +31434,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
-@@ -36458,8 +37061,8 @@
+@@ -36458,8 +37063,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -31454,28 +31445,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
-@@ -36652,15 +37255,14 @@
+@@ -36652,15 +37257,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36712,8 +37314,8 @@
+@@ -36712,8 +37316,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -31486,7 +31477,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.
-@@ -36752,8 +37354,8 @@
+@@ -36752,8 +37356,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -31497,7 +31488,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
-@@ -36761,8 +37363,8 @@
+@@ -36761,8 +37365,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -31508,7 +31499,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
-@@ -36854,22 +37456,22 @@
+@@ -36854,22 +37458,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -31537,7 +31528,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -36902,14 +37504,14 @@
+@@ -36902,14 +37506,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -31555,7 +31546,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36952,8 +37554,8 @@
+@@ -36952,8 +37556,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31566,7 +31557,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -36964,21 +37566,21 @@
+@@ -36964,21 +37568,21 @@
{ (exit 1); exit 1; }; }
else
@@ -31593,7 +31584,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37021,8 +37623,8 @@
+@@ -37021,8 +37625,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31604,7 +31595,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -37033,22 +37635,22 @@
+@@ -37033,22 +37637,22 @@
{ (exit 1); exit 1; }; }
else
@@ -31632,7 +31623,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37091,8 +37693,8 @@
+@@ -37091,8 +37695,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31643,7 +31634,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -37105,21 +37707,21 @@
+@@ -37105,21 +37709,21 @@
{ (exit 1); exit 1; }; }
else
@@ -31670,7 +31661,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37162,8 +37764,8 @@
+@@ -37162,8 +37766,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31681,7 +31672,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -37176,22 +37778,22 @@
+@@ -37176,22 +37780,22 @@
{ (exit 1); exit 1; }; }
else
@@ -31709,7 +31700,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37234,12 +37836,12 @@
+@@ -37234,12 +37838,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31726,7 +31717,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -37268,14 +37870,14 @@
+@@ -37268,14 +37872,14 @@
if test -n "$kde32ornewer"; then
@@ -31744,7 +31735,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37318,8 +37920,8 @@
+@@ -37318,8 +37922,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31755,7 +31746,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -37330,21 +37932,21 @@
+@@ -37330,21 +37934,21 @@
{ (exit 1); exit 1; }; }
else
@@ -31782,7 +31773,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37387,8 +37989,8 @@
+@@ -37387,8 +37991,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31793,7 +31784,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -37399,8 +38001,8 @@
+@@ -37399,8 +38003,8 @@
{ (exit 1); exit 1; }; }
else
@@ -31804,7 +31795,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -37408,14 +38010,14 @@
+@@ -37408,14 +38012,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -31822,7 +31813,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37458,8 +38060,8 @@
+@@ -37458,8 +38062,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31833,7 +31824,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -37470,8 +38072,8 @@
+@@ -37470,8 +38074,8 @@
{ (exit 1); exit 1; }; }
else
@@ -31844,7 +31835,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -37479,14 +38081,14 @@
+@@ -37479,14 +38083,14 @@
fi
@@ -31862,7 +31853,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37529,12 +38131,12 @@
+@@ -37529,12 +38133,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -31879,16 +31870,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -37549,7 +38151,7 @@
+@@ -37549,7 +38153,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 37552: $i/$j" >&5
-+ echo "configure: 38154: $i/$j" >&5
++ echo "configure: 38156: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -37743,10 +38345,9 @@
+@@ -37743,10 +38347,9 @@
@@ -31900,7 +31891,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'
-@@ -37759,9 +38360,9 @@
+@@ -37759,9 +38362,9 @@
for ac_header in X11/extensions/shape.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31913,7 +31904,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37804,12 +38405,14 @@
+@@ -37804,12 +38407,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31931,7 +31922,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -37831,10 +38434,9 @@
+@@ -37831,10 +38436,9 @@
@@ -31943,7 +31934,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'
-@@ -37847,9 +38449,9 @@
+@@ -37847,9 +38451,9 @@
for ac_header in X11/extensions/XShm.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31956,7 +31947,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37889,12 +38491,14 @@
+@@ -37889,12 +38493,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31974,7 +31965,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -37918,10 +38522,9 @@
+@@ -37918,10 +38524,9 @@
@@ -31986,7 +31977,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'
-@@ -37934,18 +38537,19 @@
+@@ -37934,18 +38539,19 @@
for ac_header in X11/ICE/ICElib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32014,7 +32005,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37982,15 +38586,16 @@
+@@ -37982,15 +38588,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32036,7 +32027,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38024,9 +38629,10 @@
+@@ -38024,9 +38631,10 @@
ac_header_preproc=no
fi
@@ -32049,7 +32040,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38050,25 +38656,19 @@
+@@ -38050,25 +38658,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;}
@@ -32082,7 +32073,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -38092,8 +38692,7 @@
+@@ -38092,8 +38694,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -32092,7 +32083,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'
-@@ -38103,17 +38702,17 @@
+@@ -38103,17 +38704,17 @@
if test "${ac_cv_header_sys_sendfile_h+set}" = set; then
@@ -32116,7 +32107,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38150,15 +38749,16 @@
+@@ -38150,15 +38751,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32138,7 +32129,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38192,9 +38792,10 @@
+@@ -38192,9 +38794,10 @@
ac_header_preproc=no
fi
@@ -32151,7 +32142,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38218,25 +38819,18 @@
+@@ -38218,25 +38821,18 @@
echo "$as_me: WARNING: sys/sendfile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sys/sendfile.h: in the future, the compiler will take precedence" >&2;}
@@ -32182,7 +32173,7 @@
fi
if test $ac_cv_header_sys_sendfile_h = yes; then
-@@ -38255,8 +38849,8 @@
+@@ -38255,8 +38851,8 @@
ac_cpp=$ac_cpp_safe
CPPFLAGS=$ac_CPPFLAGS_safe
@@ -32193,7 +32184,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38306,12 +38900,13 @@
+@@ -38306,12 +38902,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32210,7 +32201,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -38322,15 +38917,14 @@
+@@ -38322,15 +38919,14 @@
@@ -32228,7 +32219,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38425,14 +39019,15 @@
+@@ -38425,14 +39021,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32246,7 +32237,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -38442,11 +39037,11 @@
+@@ -38442,11 +39039,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32262,7 +32253,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -38493,7 +39088,9 @@
+@@ -38493,7 +39090,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32272,7 +32263,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38502,17 +39099,22 @@
+@@ -38502,17 +39101,22 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32298,7 +32289,7 @@
}
_ACEOF
rm -f conftest$ac_exeext
-@@ -38535,13 +39137,16 @@
+@@ -38535,13 +39139,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -32318,7 +32309,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -38576,15 +39181,14 @@
+@@ -38576,15 +39183,14 @@
@@ -32337,7 +32328,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'
-@@ -38596,9 +39200,6 @@
+@@ -38596,9 +39202,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32347,7 +32338,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38647,8 +39248,9 @@
+@@ -38647,8 +39250,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32358,7 +32349,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -38662,11 +39264,11 @@
+@@ -38662,11 +39266,11 @@
fi
@@ -32374,7 +32365,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38687,8 +39289,7 @@
+@@ -38687,8 +39291,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -32384,7 +32375,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'
-@@ -38750,9 +39351,10 @@
+@@ -38750,9 +39353,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32396,7 +32387,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -38766,8 +39368,8 @@
+@@ -38766,8 +39370,8 @@
fi
@@ -32407,7 +32398,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -38791,15 +39393,14 @@
+@@ -38791,15 +39395,14 @@
@@ -32426,7 +32417,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'
-@@ -38811,9 +39412,6 @@
+@@ -38811,9 +39414,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32436,7 +32427,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38862,8 +39460,9 @@
+@@ -38862,8 +39462,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32447,7 +32438,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -38877,11 +39476,11 @@
+@@ -38877,11 +39478,11 @@
fi
@@ -32463,7 +32454,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38902,8 +39501,7 @@
+@@ -38902,8 +39503,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -32473,7 +32464,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'
-@@ -38965,9 +39563,10 @@
+@@ -38965,9 +39565,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32485,7 +32476,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -38981,8 +39580,8 @@
+@@ -38981,8 +39582,8 @@
fi
@@ -32496,7 +32487,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -39006,15 +39605,14 @@
+@@ -39006,15 +39607,14 @@
@@ -32515,7 +32506,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'
-@@ -39026,9 +39624,6 @@
+@@ -39026,9 +39626,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32525,7 +32516,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39079,8 +39674,9 @@
+@@ -39079,8 +39676,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32536,7 +32527,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -39094,11 +39690,11 @@
+@@ -39094,11 +39692,11 @@
fi
@@ -32552,7 +32543,7 @@
if test "${kde_cv_proto_random+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39119,8 +39715,7 @@
+@@ -39119,8 +39717,7 @@
if test "x$kde_cv_proto_random" = xunknown; then
@@ -32562,7 +32553,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'
-@@ -39184,9 +39779,10 @@
+@@ -39184,9 +39781,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32574,7 +32565,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -39200,8 +39796,8 @@
+@@ -39200,8 +39798,8 @@
fi
@@ -32585,7 +32576,7 @@
if test "x$kde_cv_func_random" = xyes; then
-@@ -39224,15 +39820,14 @@
+@@ -39224,15 +39822,14 @@
@@ -32604,7 +32595,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'
-@@ -39244,9 +39839,6 @@
+@@ -39244,9 +39841,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32614,7 +32605,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39297,8 +39889,9 @@
+@@ -39297,8 +39891,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32625,7 +32616,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -39312,11 +39905,11 @@
+@@ -39312,11 +39907,11 @@
fi
@@ -32641,7 +32632,7 @@
if test "${kde_cv_proto_srandom+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39337,8 +39930,7 @@
+@@ -39337,8 +39932,7 @@
if test "x$kde_cv_proto_srandom" = xunknown; then
@@ -32651,7 +32642,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'
-@@ -39402,9 +39994,10 @@
+@@ -39402,9 +39996,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32663,7 +32654,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -39418,8 +40011,8 @@
+@@ -39418,8 +40013,8 @@
fi
@@ -32674,7 +32665,7 @@
if test "x$kde_cv_func_srandom" = xyes; then
-@@ -39444,15 +40037,14 @@
+@@ -39444,15 +40039,14 @@
@@ -32693,7 +32684,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'
-@@ -39464,9 +40056,6 @@
+@@ -39464,9 +40058,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32703,7 +32694,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39518,8 +40107,9 @@
+@@ -39518,8 +40109,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32714,7 +32705,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -39533,11 +40123,11 @@
+@@ -39533,11 +40125,11 @@
fi
@@ -32730,7 +32721,7 @@
if test "${kde_cv_proto_mkstemps+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39558,8 +40148,7 @@
+@@ -39558,8 +40150,7 @@
if test "x$kde_cv_proto_mkstemps" = xunknown; then
@@ -32740,7 +32731,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'
-@@ -39624,9 +40213,10 @@
+@@ -39624,9 +40215,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32752,7 +32743,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -39640,8 +40230,8 @@
+@@ -39640,8 +40232,8 @@
fi
@@ -32763,7 +32754,7 @@
if test "x$kde_cv_func_mkstemps" = xyes; then
-@@ -39665,15 +40255,14 @@
+@@ -39665,15 +40257,14 @@
@@ -32782,7 +32773,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'
-@@ -39685,9 +40274,6 @@
+@@ -39685,9 +40276,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32792,7 +32783,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39739,8 +40325,9 @@
+@@ -39739,8 +40327,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32803,7 +32794,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -39754,11 +40341,11 @@
+@@ -39754,11 +40343,11 @@
fi
@@ -32819,7 +32810,7 @@
if test "${kde_cv_proto_mkstemp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39779,8 +40366,7 @@
+@@ -39779,8 +40368,7 @@
if test "x$kde_cv_proto_mkstemp" = xunknown; then
@@ -32829,7 +32820,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'
-@@ -39845,9 +40431,10 @@
+@@ -39845,9 +40433,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32841,7 +32832,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -39861,8 +40448,8 @@
+@@ -39861,8 +40450,8 @@
fi
@@ -32852,7 +32843,7 @@
if test "x$kde_cv_func_mkstemp" = xyes; then
-@@ -39886,15 +40473,14 @@
+@@ -39886,15 +40475,14 @@
@@ -32871,7 +32862,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'
-@@ -39906,9 +40492,6 @@
+@@ -39906,9 +40494,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32881,7 +32872,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39960,8 +40543,9 @@
+@@ -39960,8 +40545,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32892,7 +32883,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -39975,11 +40559,11 @@
+@@ -39975,11 +40561,11 @@
fi
@@ -32908,7 +32899,7 @@
if test "${kde_cv_proto_mkdtemp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40000,8 +40584,7 @@
+@@ -40000,8 +40586,7 @@
if test "x$kde_cv_proto_mkdtemp" = xunknown; then
@@ -32918,7 +32909,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'
-@@ -40066,9 +40649,10 @@
+@@ -40066,9 +40651,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32930,7 +32921,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40082,8 +40666,8 @@
+@@ -40082,8 +40668,8 @@
fi
@@ -32941,7 +32932,7 @@
if test "x$kde_cv_func_mkdtemp" = xyes; then
-@@ -40114,12 +40698,14 @@
+@@ -40114,12 +40700,14 @@
@@ -32960,7 +32951,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40145,30 +40731,24 @@
+@@ -40145,30 +40733,24 @@
#undef $ac_func
@@ -32996,7 +32987,7 @@
;
return 0;
}
-@@ -40200,13 +40780,15 @@
+@@ -40200,13 +40782,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33015,7 +33006,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -40221,15 +40803,14 @@
+@@ -40221,15 +40805,14 @@
@@ -33034,7 +33025,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'
-@@ -40241,9 +40822,6 @@
+@@ -40241,9 +40824,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -33044,7 +33035,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40294,8 +40872,9 @@
+@@ -40294,8 +40874,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33055,7 +33046,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -40309,11 +40888,11 @@
+@@ -40309,11 +40890,11 @@
fi
@@ -33071,7 +33062,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40334,8 +40913,7 @@
+@@ -40334,8 +40915,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -33081,7 +33072,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'
-@@ -40399,9 +40977,10 @@
+@@ -40399,9 +40979,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33093,7 +33084,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40415,8 +40994,8 @@
+@@ -40415,8 +40996,8 @@
fi
@@ -33104,7 +33095,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -40440,15 +41019,14 @@
+@@ -40440,15 +41021,14 @@
@@ -33123,7 +33114,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'
-@@ -40460,9 +41038,6 @@
+@@ -40460,9 +41040,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -33133,7 +33124,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40515,8 +41090,9 @@
+@@ -40515,8 +41092,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33144,7 +33135,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -40530,11 +41106,11 @@
+@@ -40530,11 +41108,11 @@
fi
@@ -33160,7 +33151,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40555,8 +41131,7 @@
+@@ -40555,8 +41133,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -33170,7 +33161,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'
-@@ -40622,9 +41197,10 @@
+@@ -40622,9 +41199,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33182,7 +33173,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40638,8 +41214,8 @@
+@@ -40638,8 +41216,8 @@
fi
@@ -33193,7 +33184,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -40663,15 +41239,14 @@
+@@ -40663,15 +41241,14 @@
@@ -33212,7 +33203,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'
-@@ -40683,9 +41258,6 @@
+@@ -40683,9 +41260,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -33222,7 +33213,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40736,8 +41308,9 @@
+@@ -40736,8 +41310,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33233,7 +33224,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -40751,11 +41324,11 @@
+@@ -40751,11 +41326,11 @@
fi
@@ -33249,7 +33240,7 @@
if test "${kde_cv_proto_random+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40776,8 +41349,7 @@
+@@ -40776,8 +41351,7 @@
if test "x$kde_cv_proto_random" = xunknown; then
@@ -33259,7 +33250,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'
-@@ -40841,9 +41413,10 @@
+@@ -40841,9 +41415,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33271,7 +33262,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40857,8 +41430,8 @@
+@@ -40857,8 +41432,8 @@
fi
@@ -33282,7 +33273,7 @@
if test "x$kde_cv_func_random" = xyes; then
-@@ -40881,15 +41454,14 @@
+@@ -40881,15 +41456,14 @@
@@ -33301,7 +33292,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'
-@@ -40901,9 +41473,6 @@
+@@ -40901,9 +41475,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -33311,7 +33302,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40954,8 +41523,9 @@
+@@ -40954,8 +41525,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33322,7 +33313,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -40969,11 +41539,11 @@
+@@ -40969,11 +41541,11 @@
fi
@@ -33338,7 +33329,7 @@
if test "${kde_cv_proto_srandom+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40994,8 +41564,7 @@
+@@ -40994,8 +41566,7 @@
if test "x$kde_cv_proto_srandom" = xunknown; then
@@ -33348,7 +33339,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'
-@@ -41059,9 +41628,10 @@
+@@ -41059,9 +41630,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33360,7 +33351,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -41075,8 +41645,8 @@
+@@ -41075,8 +41647,8 @@
fi
@@ -33371,7 +33362,7 @@
if test "x$kde_cv_func_srandom" = xyes; then
-@@ -41100,8 +41670,8 @@
+@@ -41100,8 +41672,8 @@
@@ -33382,7 +33373,7 @@
if test "${ac_cv_have_s_issock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41153,15 +41723,16 @@
+@@ -41153,15 +41725,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33402,7 +33393,7 @@
if test "$ac_cv_have_s_issock" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -41176,15 +41747,14 @@
+@@ -41176,15 +41749,14 @@
@@ -33421,7 +33412,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'
-@@ -41196,9 +41766,6 @@
+@@ -41196,9 +41768,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -33431,7 +33422,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41252,8 +41819,9 @@
+@@ -41252,8 +41821,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33442,7 +33433,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -41267,11 +41835,11 @@
+@@ -41267,11 +41837,11 @@
fi
@@ -33458,7 +33449,7 @@
if test "${kde_cv_proto_initgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41292,8 +41860,7 @@
+@@ -41292,8 +41862,7 @@
if test "x$kde_cv_proto_initgroups" = xunknown; then
@@ -33468,7 +33459,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'
-@@ -41360,9 +41927,10 @@
+@@ -41360,9 +41929,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33480,7 +33471,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -41376,8 +41944,8 @@
+@@ -41376,8 +41946,8 @@
fi
@@ -33491,7 +33482,7 @@
if test "x$kde_cv_func_initgroups" = xyes; then
-@@ -41400,8 +41968,8 @@
+@@ -41400,8 +41970,8 @@
@@ -33502,7 +33493,7 @@
if test "${kde_cv_mtab_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41423,8 +41991,8 @@
+@@ -41423,8 +41993,8 @@
fi
@@ -33513,7 +33504,7 @@
if test "$kde_cv_mtab_file" != "no"; then
cat >>confdefs.h <<_ACEOF
-@@ -41439,8 +42007,7 @@
+@@ -41439,8 +42009,7 @@
@@ -33523,7 +33514,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'
-@@ -41449,8 +42016,8 @@
+@@ -41449,8 +42018,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -33534,7 +33525,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41490,8 +42057,8 @@
+@@ -41490,8 +42059,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -33545,7 +33536,7 @@
cat >>confdefs.h <<\_ACEOF
#define GETMNTINFO_USES_STATVFS
-@@ -41501,9 +42068,10 @@
+@@ -41501,9 +42070,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33558,7 +33549,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -41556,23 +42124,23 @@
+@@ -41556,23 +42126,23 @@
@@ -33594,7 +33585,7 @@
if test "$want_sendfile" = "yes" -a "$have_sendfile" = "yes"; then
-@@ -41583,23 +42151,23 @@
+@@ -41583,23 +42153,23 @@
fi
@@ -33630,7 +33621,7 @@
if test "$want_mitshm" = "yes" -a "$have_mitshm" = "yes"; then
-@@ -41610,8 +42178,8 @@
+@@ -41610,8 +42180,8 @@
fi
@@ -33641,7 +33632,7 @@
if test "${ac_cv_func_posix_fadvise+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41638,30 +42206,24 @@
+@@ -41638,30 +42208,24 @@
#undef posix_fadvise
@@ -33677,7 +33668,7 @@
;
return 0;
}
-@@ -41693,13 +42255,14 @@
+@@ -41693,13 +42257,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33695,7 +33686,7 @@
if test $ac_cv_func_posix_fadvise = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41731,9 +42294,9 @@
+@@ -41731,9 +42296,9 @@
for ac_func in _IceTransNoListen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33708,7 +33699,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41759,30 +42322,24 @@
+@@ -41759,30 +42324,24 @@
#undef $ac_func
@@ -33744,7 +33735,7 @@
;
return 0;
}
-@@ -41814,13 +42371,15 @@
+@@ -41814,13 +42373,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33763,7 +33754,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -41836,13 +42395,13 @@
+@@ -41836,13 +42397,13 @@
fi
@@ -33781,7 +33772,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -41850,8 +42409,8 @@
+@@ -41850,8 +42411,8 @@
_ACEOF
@@ -33792,7 +33783,7 @@
case "$CXX" in
xlC*)
# The __IBMCPP__ macro contains the C++ compiler version in decimal notation.
-@@ -41891,11 +42450,11 @@
+@@ -41891,11 +42452,11 @@
#define KDE_COMPILER_VERSION "$clean_compiler_version"
_ACEOF
@@ -33808,7 +33799,7 @@
case `uname -s` in
AIX)
IBM_ARCH=PowerPC #good default
-@@ -41916,40 +42475,40 @@
+@@ -41916,40 +42477,40 @@
#define KDE_COMPILING_OS "$uname_string"
_ACEOF
@@ -33865,7 +33856,7 @@
if test "${ac_cv_lib_utempter_addToUtmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41962,17 +42521,17 @@
+@@ -41962,17 +42523,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33887,7 +33878,7 @@
;
return 0;
}
-@@ -42004,14 +42563,15 @@
+@@ -42004,14 +42565,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33906,7 +33897,7 @@
if test $ac_cv_lib_utempter_addToUtmp = yes; then
LIBUTEMPTER=-lutempter
else
-@@ -42034,8 +42594,8 @@
+@@ -42034,8 +42596,8 @@
fi
@@ -33917,16 +33908,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -42047,7 +42607,7 @@
+@@ -42047,7 +42609,7 @@
do
for j in qsql.html;
do
- echo "configure: 42050: $i/$j" >&5
-+ echo "configure: 42610: $i/$j" >&5
++ echo "configure: 42612: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -42056,20 +42616,20 @@
+@@ -42056,20 +42618,20 @@
done
done
@@ -33952,7 +33943,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42112,12 +42672,12 @@
+@@ -42112,12 +42674,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33969,7 +33960,7 @@
DOT=$kde_cv_path
fi
-@@ -42129,14 +42689,14 @@
+@@ -42129,14 +42691,14 @@
fi
@@ -33987,7 +33978,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42179,12 +42739,12 @@
+@@ -42179,12 +42741,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34004,7 +33995,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -42204,8 +42764,8 @@
+@@ -42204,8 +42766,8 @@
@@ -34015,7 +34006,7 @@
kde_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-@@ -42260,8 +42820,9 @@
+@@ -42260,8 +42822,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34026,7 +34017,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$kde_save_LDFLAGS"
-@@ -42277,8 +42838,8 @@
+@@ -42277,8 +42840,8 @@
fi
@@ -34037,7 +34028,7 @@
-@@ -42290,15 +42851,15 @@
+@@ -42290,15 +42853,15 @@
ARTS_HAVE_VERSION=none
ARTS_HAVE_PREFIX=none
@@ -34057,7 +34048,7 @@
else
if test "x$ARTSCCONFIG" != "xno"; then
-@@ -42333,8 +42894,8 @@
+@@ -42333,8 +42896,8 @@
fi
fi
@@ -34068,7 +34059,7 @@
if test "x$ARTS_OK" = "xno"; then
{ { echo "$as_me:$LINENO: error: aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
-@@ -42376,15 +42937,15 @@
+@@ -42376,15 +42939,15 @@
#define DCOP_PATH "${dcop_prefix}/bin"
_ACEOF
@@ -34087,7 +34078,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42399,27 +42960,28 @@
+@@ -42399,27 +42962,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -34122,7 +34113,7 @@
test -n "$MD5SUM" && break
done
test -n "$MD5SUM" || MD5SUM="md5sum"
-@@ -42427,110 +42989,163 @@
+@@ -42427,110 +42991,289 @@
#MIN_CONFIG
@@ -34152,14 +34143,10 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
-- #include <dns_sd.h>
+# Check for pkg-config manually first, as if its not installed the
+# PKG_PROG_PKG_CONFIG macro won't be defined.
--int
--main ()
--{
+- #include <dns_sd.h>
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -34185,8 +34172,9 @@
+done
+IFS=$as_save_IFS
-- DNSServiceRefDeallocate( (DNSServiceRef) 0);
-- TXTRecordDeallocate( (TXTRecordRef*) 0);
+-int
+-main ()
+-{
+ test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config="no"
+fi
+fi
@@ -34199,6 +34187,9 @@
+echo "${ECHO_T}no" >&6; }
+fi
+- DNSServiceRefDeallocate( (DNSServiceRef) 0);
+- TXTRecordDeallocate( (TXTRecordRef*) 0);
+
- ;
- return 0;
-}
@@ -34226,16 +34217,16 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_DNSSD 1
--_ACEOF
+if test x"$have_pkg_config" == xno; then
+ { { echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
+echo "$as_me: error: pkg-config is required to install this program" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
+
- case $host_os in
- darwin*) LIB_DNSSD="" ;;
- *) LIB_DNSSD="-ldns_sd" ;;
@@ -34243,17 +34234,139 @@
- have_libdns_sd="yes"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+PKG_PROG_PKG_CONFIG
--else
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
-+ succeeded=no
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- LIB_DNSSD=""
+
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
+ fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ PKG_CONFIG=""
++ fi
++
++fi
++
+
++ succeeded=no
+
+ 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
@@ -34282,20 +34395,20 @@
+done
+IFS=$as_save_IFS
+-if test "$have_libdns_sd" = "yes"; then
+- HAVE_DNSSD_TRUE=
+- HAVE_DNSSD_FALSE='#'
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--CPPFLAGS=$save_dnssdtest_CPPFLAGS
--LDFLAGS=$save_dnssdtest_LDFLAGS
--LIBS=$save_dnssdtest_LIBS
++fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
+ else
+- HAVE_DNSSD_TRUE='#'
+- HAVE_DNSSD_FALSE=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -34354,26 +34467,26 @@
+echo "$as_me: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
-
--if test "$have_libdns_sd" = "yes"; then
-- HAVE_DNSSD_TRUE=
-- HAVE_DNSSD_FALSE='#'
--else
-- HAVE_DNSSD_TRUE='#'
-- HAVE_DNSSD_FALSE=
--fi
-
-
-+PKG_CHECK_EXISTS( avahi-client >= 0.6,
++
++
++
++if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++
+cat >>confdefs.h <<\_ACEOF
+#define AVAHI_API_0_6 1
+_ACEOF
-+ )
+
++fi
++
-@@ -42539,42 +43154,42 @@
+@@ -42539,42 +43282,42 @@
HAVE_LUA=""
@@ -34434,7 +34547,7 @@
fi
ac_save_CFLAGS="$CFLAGS"
-@@ -42586,17 +43201,17 @@
+@@ -42586,17 +43329,17 @@
LUAH_FOUND=""
if test "${ac_cv_header_lua_h+set}" = set; then
@@ -34458,7 +34571,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42633,15 +43248,16 @@
+@@ -42633,15 +43376,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34480,7 +34593,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42675,9 +43291,10 @@
+@@ -42675,9 +43419,10 @@
ac_header_preproc=no
fi
@@ -34493,7 +34606,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -42701,49 +43318,42 @@
+@@ -42701,49 +43446,42 @@
echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;}
@@ -34556,7 +34669,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42780,15 +43390,16 @@
+@@ -42780,15 +43518,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34578,7 +34691,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42822,9 +43433,10 @@
+@@ -42822,9 +43561,10 @@
ac_header_preproc=no
fi
@@ -34591,7 +34704,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -42848,32 +43460,25 @@
+@@ -42848,32 +43588,25 @@
echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;}
@@ -34631,7 +34744,7 @@
fi
-@@ -42883,8 +43488,8 @@
+@@ -42883,8 +43616,8 @@
if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then
LUA_LIBS=""
else
@@ -34642,7 +34755,7 @@
if test "${ac_cv_lib_lua50_lua_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42897,17 +43502,17 @@
+@@ -42897,17 +43630,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34664,7 +34777,7 @@
;
return 0;
}
-@@ -42939,19 +43544,20 @@
+@@ -42939,19 +43672,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34690,7 +34803,7 @@
if test "${ac_cv_lib_lua_lua_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42964,17 +43570,17 @@
+@@ -42964,17 +43698,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34712,7 +34825,7 @@
;
return 0;
}
-@@ -43006,20 +43612,21 @@
+@@ -43006,20 +43740,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34739,7 +34852,7 @@
fi
-@@ -43067,15 +43674,15 @@
+@@ -43067,15 +43802,15 @@
_ACEOF
@@ -34761,7 +34874,7 @@
if test "$ac_use_openpty" = "yes"; then
kde_safe_LIBS=$LIBS
LIBS="$LIBS $LIBUTIL"
-@@ -43125,8 +43732,10 @@
+@@ -43125,8 +43860,10 @@
( exit $ac_status )
ac_use_openpty="no"
fi
@@ -34773,7 +34886,7 @@
LIBS=$kde_safe_LIBS
fi
if test "$ac_use_openpty" = "yes"; then
-@@ -43135,22 +43744,22 @@
+@@ -43135,22 +43872,22 @@
#define HAVE_OPENPTY 1
_ACEOF
@@ -34804,7 +34917,7 @@
LIB_IDN=
if test "x$with_libidn" != xno; then
-@@ -43159,18 +43768,19 @@
+@@ -43159,18 +43896,19 @@
for ac_header in idna.h punycode.h stringprep.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34832,7 +34945,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43207,15 +43817,16 @@
+@@ -43207,15 +43945,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34854,7 +34967,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43249,9 +43860,10 @@
+@@ -43249,9 +43988,10 @@
ac_header_preproc=no
fi
@@ -34867,7 +34980,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43275,25 +43887,19 @@
+@@ -43275,25 +44015,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;}
@@ -34900,7 +35013,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43314,8 +43920,8 @@
+@@ -43314,8 +44048,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -34911,7 +35024,7 @@
if test "${ac_cv_lib_idn_idna_to_ascii_4i+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43328,17 +43934,17 @@
+@@ -43328,17 +44062,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34933,7 +35046,7 @@
;
return 0;
}
-@@ -43370,14 +43976,15 @@
+@@ -43370,14 +44104,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34952,7 +35065,7 @@
if test $ac_cv_lib_idn_idna_to_ascii_4i = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -43421,9 +44028,9 @@
+@@ -43421,9 +44156,9 @@
for ac_func in inet_ntop inet_pton getpeername getsockname getsockopt gethostbyname2_r gethostbyname_r gethostbyname2 if_nametoindex getprotobyname_r getservbyname_r getservbyport_r
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34965,7 +35078,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -43449,30 +44056,24 @@
+@@ -43449,30 +44184,24 @@
#undef $ac_func
@@ -35001,7 +35114,7 @@
;
return 0;
}
-@@ -43504,13 +44105,15 @@
+@@ -43504,13 +44233,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35020,7 +35133,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -43523,8 +44126,8 @@
+@@ -43523,8 +44254,8 @@
if test "x$ac_cv_func_getservbyname_r" = "xyes"; then
@@ -35031,7 +35144,7 @@
if test "${ac_cv_have_decl_getservbyname_r+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43541,6 +44144,7 @@
+@@ -43541,6 +44272,7 @@
{
#ifndef getservbyname_r
char *p = (char *) getservbyname_r;
@@ -35039,7 +35152,7 @@
#endif
;
-@@ -43574,12 +44178,13 @@
+@@ -43574,12 +44306,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35056,7 +35169,7 @@
if test $ac_cv_have_decl_getservbyname_r = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -43604,10 +44209,9 @@
+@@ -43604,10 +44337,9 @@
@@ -35068,7 +35181,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'
-@@ -43621,9 +44225,9 @@
+@@ -43621,9 +44353,9 @@
for ac_header in netinet/in.h net/if.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35081,7 +35194,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -43663,12 +44267,14 @@
+@@ -43663,12 +44395,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35099,7 +35212,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -43690,10 +44296,9 @@
+@@ -43690,10 +44424,9 @@
@@ -35111,7 +35224,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'
-@@ -43706,18 +44311,19 @@
+@@ -43706,18 +44439,19 @@
for ac_header in sys/filio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35139,7 +35252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43754,15 +44360,16 @@
+@@ -43754,15 +44488,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35161,7 +35274,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43796,9 +44403,10 @@
+@@ -43796,9 +44531,10 @@
ac_header_preproc=no
fi
@@ -35174,7 +35287,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -43822,25 +44430,19 @@
+@@ -43822,25 +44558,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;}
@@ -35207,7 +35320,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43866,9 +44468,9 @@
+@@ -43866,9 +44596,9 @@
for ac_func in usleep poll madvise
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35220,7 +35333,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -43894,30 +44496,24 @@
+@@ -43894,30 +44624,24 @@
#undef $ac_func
@@ -35256,7 +35369,7 @@
;
return 0;
}
-@@ -43949,13 +44545,15 @@
+@@ -43949,13 +44673,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35275,7 +35388,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -43965,8 +44563,8 @@
+@@ -43965,8 +44691,8 @@
done
@@ -35286,7 +35399,7 @@
if test "${ac_cv_type_struct_addrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43978,12 +44576,13 @@
+@@ -43978,12 +44704,13 @@
/* end confdefs.h. */
$netincludes
@@ -35302,7 +35415,7 @@
return 0;
;
return 0;
-@@ -44016,12 +44615,13 @@
+@@ -44016,12 +44743,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35319,7 +35432,7 @@
if test $ac_cv_type_struct_addrinfo = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -44038,9 +44638,9 @@
+@@ -44038,9 +44766,9 @@
for ac_func in getaddrinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35332,7 +35445,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44066,30 +44666,24 @@
+@@ -44066,30 +44794,24 @@
#undef $ac_func
@@ -35368,7 +35481,7 @@
;
return 0;
}
-@@ -44121,13 +44715,15 @@
+@@ -44121,13 +44843,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35387,7 +35500,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -44140,9 +44736,9 @@
+@@ -44140,9 +44864,9 @@
for ac_func in freeaddrinfo getnameinfo gai_strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35400,7 +35513,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44168,30 +44764,24 @@
+@@ -44168,30 +44892,24 @@
#undef $ac_func
@@ -35436,7 +35549,7 @@
;
return 0;
}
-@@ -44223,13 +44813,15 @@
+@@ -44223,13 +44941,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35455,7 +35568,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -44254,12 +44846,12 @@
+@@ -44254,12 +44974,12 @@
done
@@ -35472,7 +35585,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44301,8 +44893,8 @@
+@@ -44301,8 +45021,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -35483,7 +35596,7 @@
else
echo "$as_me: program exited with status $ac_status" >&5
-@@ -44311,8 +44903,8 @@
+@@ -44311,8 +45031,8 @@
( exit $ac_status )
@@ -35494,7 +35607,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_BROKEN_GETADDRINFO 1
-@@ -44320,17 +44912,19 @@
+@@ -44320,17 +45040,19 @@
fi
@@ -35517,7 +35630,7 @@
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44379,7 +44973,7 @@
+@@ -44379,7 +45101,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35526,7 +35639,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -44424,14 +45018,16 @@
+@@ -44424,14 +45146,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35546,7 +35659,7 @@
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -44441,8 +45037,8 @@
+@@ -44441,8 +45165,8 @@
fi
@@ -35557,7 +35670,7 @@
if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44455,12 +45051,13 @@
+@@ -44455,12 +45179,13 @@
#include <sys/types.h>
#include <netinet/in.h>
@@ -35573,7 +35686,7 @@
return 0;
;
return 0;
-@@ -44493,20 +45090,21 @@
+@@ -44493,20 +45218,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35600,7 +35713,7 @@
if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44555,7 +45153,7 @@
+@@ -44555,7 +45281,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35609,7 +35722,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -44600,14 +45198,16 @@
+@@ -44600,14 +45326,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35629,7 +35742,7 @@
if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -44620,8 +45220,8 @@
+@@ -44620,8 +45348,8 @@
fi
@@ -35640,7 +35753,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44670,17 +45270,18 @@
+@@ -44670,17 +45398,18 @@
#define HAVE_BACKTRACE 1
_ACEOF
@@ -35663,7 +35776,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -44688,18 +45289,19 @@
+@@ -44688,18 +45417,19 @@
for ac_header in sys/mount.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35691,7 +35804,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44736,15 +45338,16 @@
+@@ -44736,15 +45466,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35713,7 +35826,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44778,9 +45381,10 @@
+@@ -44778,9 +45509,10 @@
ac_header_preproc=no
fi
@@ -35726,7 +35839,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -44804,25 +45408,19 @@
+@@ -44804,25 +45536,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;}
@@ -35759,7 +35872,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -44836,30 +45434,30 @@
+@@ -44836,30 +45562,30 @@
@@ -35798,7 +35911,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44902,15 +45500,15 @@
+@@ -44902,15 +45628,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35818,7 +35931,7 @@
LIBART_CONFIG=$kde_cv_path
fi
-@@ -44975,18 +45573,19 @@
+@@ -44975,18 +45701,19 @@
for ac_header in sys/stropts.h sys/select.h libutil.h util.h termios.h pty.h termio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35846,7 +35959,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45023,15 +45622,16 @@
+@@ -45023,15 +45750,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35868,7 +35981,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45065,9 +45665,10 @@
+@@ -45065,9 +45793,10 @@
ac_header_preproc=no
fi
@@ -35881,7 +35994,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -45091,25 +45692,19 @@
+@@ -45091,25 +45820,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;}
@@ -35914,7 +36027,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -45121,8 +45716,8 @@
+@@ -45121,8 +45844,8 @@
done
@@ -35925,7 +36038,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45170,26 +45765,26 @@
+@@ -45170,26 +45893,26 @@
#define HAVE_REVOKE 1
_ACEOF
@@ -35959,7 +36072,7 @@
if test "$enableval" = "full"; then
kde_fast_malloc=full
elif test "$enableval" = "yes"; then
-@@ -45204,7 +45799,8 @@
+@@ -45204,7 +45927,8 @@
kde_fast_malloc=notgiven
@@ -35969,7 +36082,7 @@
if test "$kde_fast_malloc" != "no"; then
if test "$GCC" != "yes"; then
-@@ -45253,8 +45849,8 @@
+@@ -45253,8 +45977,8 @@
fi
if test "$kde_fast_malloc" = "yes" -o "$kde_fast_malloc" = "notgiven" -o "$kde_fast_malloc" = "debug"; then
@@ -35980,7 +36093,7 @@
if test "${kde_cv_libc_glibc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45304,13 +45900,14 @@
+@@ -45304,13 +46028,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35998,7 +36111,7 @@
if test "$kde_cv_libc_glibc" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -45345,23 +45942,23 @@
+@@ -45345,23 +46070,23 @@
fi
fi
@@ -36034,7 +36147,7 @@
fi
if test "$kde_fast_malloc" != "no"; then
-@@ -45389,16 +45986,15 @@
+@@ -45389,16 +46114,15 @@
fi
@@ -36055,7 +36168,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'
-@@ -45451,7 +46047,9 @@
+@@ -45451,7 +46175,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36065,7 +36178,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -45465,13 +46063,13 @@
+@@ -45465,13 +46191,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36083,7 +36196,7 @@
:
KDE_FORCE_INLINE=
fi
-@@ -45485,8 +46083,7 @@
+@@ -45485,8 +46211,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36093,7 +36206,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'
-@@ -45496,17 +46093,17 @@
+@@ -45496,17 +46221,17 @@
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -36117,7 +36230,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45543,15 +46140,16 @@
+@@ -45543,15 +46268,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36139,7 +36252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45585,9 +46183,10 @@
+@@ -45585,9 +46311,10 @@
ac_header_preproc=no
fi
@@ -36152,7 +36265,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45611,25 +46210,18 @@
+@@ -45611,25 +46338,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;}
@@ -36183,7 +36296,7 @@
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -45657,8 +46249,8 @@
+@@ -45657,8 +46377,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -36194,7 +36307,7 @@
if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45671,17 +46263,17 @@
+@@ -45671,17 +46391,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36216,7 +36329,7 @@
;
return 0;
}
-@@ -45713,14 +46305,15 @@
+@@ -45713,14 +46433,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36235,7 +36348,7 @@
if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
LIB_XRENDER=-lXrender
-@@ -45740,8 +46333,8 @@
+@@ -45740,8 +46461,8 @@
case $host_cpu in
i*86 )
@@ -36246,7 +36359,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -45792,8 +46385,9 @@
+@@ -45792,8 +46513,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36257,7 +36370,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -45845,8 +46439,9 @@
+@@ -45845,8 +46567,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36268,7 +36381,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -45898,8 +46493,9 @@
+@@ -45898,8 +46621,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36279,7 +36392,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -45951,14 +46547,15 @@
+@@ -45951,14 +46675,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36298,7 +36411,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46008,8 +46605,9 @@
+@@ -46008,8 +46733,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36309,7 +36422,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo
;;
-@@ -46022,13 +46620,13 @@
+@@ -46022,13 +46748,13 @@
ac_cups_libs=0
CUPSSUBDIR=
LIB_CUPS=
@@ -36327,7 +36440,7 @@
if test "$ac_use_cups" = "yes"; then
ac_CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $all_includes"
-@@ -46038,8 +46636,8 @@
+@@ -46038,8 +46764,8 @@
kde_cups_libs="-lcups $LIBDL $LIBSOCKET"
# Extract the first word of "cups-config", so it can be a program name with args.
set dummy cups-config; ac_word=$2
@@ -36338,7 +36451,7 @@
if test "${ac_cv_path_kde_cups_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46054,32 +46652,33 @@
+@@ -46054,32 +46780,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -36380,7 +36493,7 @@
fi
kde_save_LDFLAGS="$LDFLAGS"
-@@ -46090,8 +46689,8 @@
+@@ -46090,8 +46817,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -36391,7 +36504,7 @@
if test "${ac_cv_lib_cups_cupsServer+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46104,17 +46703,17 @@
+@@ -46104,17 +46831,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36413,7 +36526,7 @@
;
return 0;
}
-@@ -46146,14 +46745,15 @@
+@@ -46146,14 +46873,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36432,7 +36545,7 @@
if test $ac_cv_lib_cups_cupsServer = yes; then
ac_cups_libs=1
else
-@@ -46171,17 +46771,17 @@
+@@ -46171,17 +46899,17 @@
if test "$ac_use_cups" = "yes"; then
ac_cups_headers=0
if test "${ac_cv_header_cups_cups_h+set}" = set; then
@@ -36456,7 +36569,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46218,15 +46818,16 @@
+@@ -46218,15 +46946,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36478,7 +36591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46260,9 +46861,10 @@
+@@ -46260,9 +46989,10 @@
ac_header_preproc=no
fi
@@ -36491,7 +36604,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -46286,25 +46888,18 @@
+@@ -46286,25 +47016,18 @@
echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
@@ -36522,7 +36635,7 @@
fi
if test $ac_cv_header_cups_cups_h = yes; then
-@@ -46322,8 +46917,8 @@
+@@ -46322,8 +47045,8 @@
kde_save_libs="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $kde_cups_libs"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
@@ -36533,7 +36646,7 @@
kde_save_link=$ac_link
ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
cat > conftest.c <<EOF
-@@ -46354,8 +46949,8 @@
+@@ -46354,8 +47077,8 @@
ac_link="$kde_save_link"
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
@@ -36544,7 +36657,7 @@
if test "$ac_have_new_cups" = "no"; then
{ echo "$as_me:$LINENO: WARNING: CUPS version too old. You should upgrade to version >= 1.1.9" >&5
-@@ -46369,8 +46964,8 @@
+@@ -46369,8 +47092,8 @@
kde_save_libs="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $kde_cups_libs"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
@@ -36555,7 +36668,7 @@
kde_save_link=$ac_link
ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
cat > conftest.c <<EOF
-@@ -46401,8 +46996,8 @@
+@@ -46401,8 +47124,8 @@
ac_link="$kde_save_link"
CFLAGS="$kde_save_cflags"
LIBS="$kde_save_libs"
@@ -36566,7 +36679,7 @@
if test "$ac_have_new_cups" = "yes"; then
-@@ -46437,8 +47032,8 @@
+@@ -46437,8 +47160,8 @@
@@ -36577,7 +36690,7 @@
ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups"
cups_modeldir=""
for d in $ac_cups_share_test; do
-@@ -46451,17 +47046,17 @@
+@@ -46451,17 +47174,17 @@
if test -n "$cups_modeldir"; then
@@ -36601,7 +36714,7 @@
if test "${ac_cv_path_path_su+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46476,28 +47071,29 @@
+@@ -46476,28 +47199,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -36637,7 +36750,7 @@
if test "$path_su" = "no"; then
{ echo "$as_me:$LINENO: WARNING: su was not found" >&5
echo "$as_me: WARNING: su was not found" >&2;}
-@@ -46509,8 +47105,8 @@
+@@ -46509,8 +47233,8 @@
fi
@@ -36648,7 +36761,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46557,8 +47153,9 @@
+@@ -46557,8 +47281,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36659,7 +36772,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$have_rtsched" = "yes"; then
-@@ -46567,20 +47164,20 @@
+@@ -46567,20 +47292,20 @@
#define POSIX1B_SCHEDULING 1
_ACEOF
@@ -36687,7 +36800,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -46606,30 +47203,24 @@
+@@ -46606,30 +47331,24 @@
#undef $ac_func
@@ -36723,7 +36836,7 @@
;
return 0;
}
-@@ -46661,13 +47252,15 @@
+@@ -46661,13 +47380,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36742,7 +36855,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -46683,18 +47276,19 @@
+@@ -46683,18 +47404,19 @@
for ac_header in libutil.h util.h pty.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36770,7 +36883,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46731,15 +47325,16 @@
+@@ -46731,15 +47453,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36792,7 +36905,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46773,9 +47368,10 @@
+@@ -46773,9 +47496,10 @@
ac_header_preproc=no
fi
@@ -36805,7 +36918,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -46799,25 +47395,19 @@
+@@ -46799,25 +47523,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;}
@@ -36838,7 +36951,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -46829,8 +47419,8 @@
+@@ -46829,8 +47547,8 @@
done
@@ -36849,7 +36962,7 @@
if test "${ac_cv_lib_util_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46843,17 +47433,17 @@
+@@ -46843,17 +47561,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36871,7 +36984,7 @@
;
return 0;
}
-@@ -46885,14 +47475,15 @@
+@@ -46885,14 +47603,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36890,7 +37003,7 @@
if test $ac_cv_lib_util_openpty = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -46913,9 +47504,9 @@
+@@ -46913,9 +47632,9 @@
for ac_func in openpty initgroups setgroups getgroups grantpt setpriority getpt unlockpt ptsname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36903,7 +37016,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -46941,30 +47532,24 @@
+@@ -46941,30 +47660,24 @@
#undef $ac_func
@@ -36939,7 +37052,7 @@
;
return 0;
}
-@@ -46996,13 +47581,15 @@
+@@ -46996,13 +47709,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36958,7 +37071,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47019,9 +47606,9 @@
+@@ -47019,9 +47734,9 @@
for ac_func in _getpty
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36971,7 +37084,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47047,30 +47634,24 @@
+@@ -47047,30 +47762,24 @@
#undef $ac_func
@@ -37007,7 +37120,7 @@
;
return 0;
}
-@@ -47102,13 +47683,15 @@
+@@ -47102,13 +47811,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37026,7 +37139,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47118,8 +47701,8 @@
+@@ -47118,8 +47829,8 @@
done
@@ -37037,7 +37150,7 @@
if test "${kde_cv_have_struct_ucred+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47170,15 +47753,16 @@
+@@ -47170,15 +47881,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37057,7 +37170,7 @@
if test "$kde_cv_have_struct_ucred" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -47190,9 +47774,9 @@
+@@ -47190,9 +47902,9 @@
for ac_func in getpeereid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37070,7 +37183,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47218,30 +47802,24 @@
+@@ -47218,30 +47930,24 @@
#undef $ac_func
@@ -37106,7 +37219,7 @@
;
return 0;
}
-@@ -47273,13 +47851,15 @@
+@@ -47273,13 +47979,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37125,7 +37238,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47294,14 +47874,14 @@
+@@ -47294,14 +48002,14 @@
HELP_SUBDIR=kdoctools
@@ -37143,7 +37256,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47344,16 +47924,16 @@
+@@ -47344,16 +48052,16 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37164,7 +37277,7 @@
XML_CONFIG=$kde_cv_path
fi
-@@ -47376,14 +47956,14 @@
+@@ -47376,14 +48084,14 @@
LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
@@ -37182,7 +37295,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47426,12 +48006,12 @@
+@@ -47426,12 +48134,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37199,7 +37312,7 @@
XMLLINT=$kde_cv_path
fi
-@@ -47451,14 +48031,14 @@
+@@ -47451,14 +48159,14 @@
if test -n "$HELP_SUBDIR"; then
@@ -37217,7 +37330,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47501,16 +48081,16 @@
+@@ -47501,16 +48209,16 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37238,7 +37351,7 @@
XSLT_CONFIG=$kde_cv_path
fi
-@@ -47541,15 +48121,14 @@
+@@ -47541,15 +48249,14 @@
@@ -37257,7 +37370,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'
-@@ -47607,8 +48186,9 @@
+@@ -47607,8 +48314,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37268,7 +37381,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -47621,8 +48201,8 @@
+@@ -47621,8 +48329,8 @@
fi
@@ -37279,7 +37392,7 @@
if test ! "$ac_cv_lib_bzip2" = no; then
BZIP2DIR=bzip2
-@@ -47635,16 +48215,15 @@
+@@ -47635,16 +48343,15 @@
cxx_shared_flag=
ld_shared_flag=
@@ -37300,7 +37413,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'
-@@ -47697,7 +48276,9 @@
+@@ -47697,7 +48404,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37310,7 +37423,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -47711,30 +48292,29 @@
+@@ -47711,30 +48420,29 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -37349,7 +37462,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'
-@@ -47787,7 +48367,9 @@
+@@ -47787,7 +48495,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37359,7 +37472,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -47801,29 +48383,28 @@
+@@ -47801,29 +48511,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -37396,7 +37509,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'
-@@ -47882,8 +48463,9 @@
+@@ -47882,8 +48591,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37407,7 +37520,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -47897,8 +48479,8 @@
+@@ -47897,8 +48607,8 @@
fi
@@ -37418,7 +37531,7 @@
if test ! "$ac_cv_lib_bzip2_prefix" = no; then
BZIP2DIR=bzip2
-@@ -47927,15 +48509,15 @@
+@@ -47927,15 +48637,15 @@
@@ -37440,7 +37553,7 @@
fi
-@@ -47982,17 +48564,17 @@
+@@ -47982,17 +48692,17 @@
@@ -37464,7 +37577,7 @@
if test "$ac_libthai" != "no"; then
if test "${kde_link_libthai+set}" = set; then
-@@ -48055,9 +48637,10 @@
+@@ -48055,9 +48765,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37476,7 +37589,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -48082,9 +48665,8 @@
+@@ -48082,9 +48793,8 @@
fi
fi
@@ -37488,7 +37601,7 @@
-@@ -48093,7 +48675,7 @@
+@@ -48093,7 +48803,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37497,7 +37610,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'
-@@ -48106,18 +48688,19 @@
+@@ -48106,18 +48816,19 @@
for ac_header in valgrind/memcheck.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37525,7 +37638,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48154,15 +48737,16 @@
+@@ -48154,15 +48865,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37547,7 +37660,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48196,9 +48780,10 @@
+@@ -48196,9 +48908,10 @@
ac_header_preproc=no
fi
@@ -37560,7 +37673,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -48222,25 +48807,19 @@
+@@ -48222,25 +48935,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;}
@@ -37593,7 +37706,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -48274,13 +48853,13 @@
+@@ -48274,13 +48981,13 @@
@@ -37611,7 +37724,7 @@
if test "x$tiff_test" = "xyes" ; then
-@@ -48290,16 +48869,15 @@
+@@ -48290,16 +48997,15 @@
@@ -37631,7 +37744,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'
-@@ -48367,6 +48945,7 @@
+@@ -48367,6 +49073,7 @@
kde_cv_libtiff_tiff=no
fi
@@ -37639,7 +37752,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -48383,20 +48962,19 @@
+@@ -48383,20 +49090,19 @@
if test "$kde_cv_libtiff_tiff" = "no"; then
@@ -37665,7 +37778,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'
-@@ -48464,6 +49042,7 @@
+@@ -48464,6 +49170,7 @@
kde_cv_libtiff_tiff34=no
fi
@@ -37673,7 +37786,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -48480,14 +49059,14 @@
+@@ -48480,14 +49187,14 @@
if test "$kde_cv_libtiff_tiff34" = "no"; then
@@ -37692,7 +37805,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTIFF 1
-@@ -48499,8 +49078,8 @@
+@@ -48499,8 +49206,8 @@
else
LIBTIFF="$kde_cv_libtiff_tiff"
@@ -37703,7 +37816,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTIFF 1
-@@ -48517,8 +49096,8 @@
+@@ -48517,8 +49224,8 @@
@@ -37714,7 +37827,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48577,8 +49156,9 @@
+@@ -48577,8 +49284,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37725,7 +37838,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -48589,14 +49169,14 @@
+@@ -48589,14 +49297,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -37746,7 +37859,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48655,8 +49235,9 @@
+@@ -48655,8 +49363,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37757,7 +37870,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -48667,11 +49248,11 @@
+@@ -48667,11 +49376,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -37773,16 +37886,16 @@
LIBJPEG=
-@@ -48691,7 +49272,7 @@
+@@ -48691,7 +49400,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 48694: $i/$j" >&5
-+ echo "configure: 49275: $i/$j" >&5
++ echo "configure: 49403: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -48739,8 +49320,8 @@
+@@ -48739,8 +49448,8 @@
@@ -37793,7 +37906,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48802,9 +49383,10 @@
+@@ -48802,9 +49511,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37805,7 +37918,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -48819,31 +49401,31 @@
+@@ -48819,31 +49529,31 @@
LIBPNG="$ac_cv_lib_png"
@@ -37847,7 +37960,7 @@
if test "${ac_cv_jasper+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48899,9 +49481,10 @@
+@@ -48899,9 +49609,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37859,7 +37972,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -48915,11 +49498,11 @@
+@@ -48915,11 +49626,11 @@
_ACEOF
LIB_JASPER="$ac_cv_jasper"
@@ -37875,7 +37988,7 @@
LIB_JASPER=""
fi
-@@ -48927,13 +49510,13 @@
+@@ -48927,13 +49638,13 @@
fi
@@ -37893,7 +38006,7 @@
if test "x$openexr_test" = "xyes" ; then
-@@ -48946,8 +49529,8 @@
+@@ -48946,8 +49657,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
@@ -37904,7 +38017,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48962,56 +49545,56 @@
+@@ -48962,56 +49673,56 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37977,7 +38090,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'
-@@ -49072,9 +49655,10 @@
+@@ -49072,9 +49783,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37989,7 +38102,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -49094,11 +49678,11 @@
+@@ -49094,11 +49806,11 @@
_ACEOF
LIB_EXR="$ac_cv_libexr"
@@ -38005,7 +38118,7 @@
LIB_EXR=""
fi
fi
-@@ -49151,8 +49735,8 @@
+@@ -49151,8 +49863,8 @@
;;
esac
@@ -38016,7 +38129,7 @@
if test "${ac_cv_lib_qt_mt_XftInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49165,17 +49749,17 @@
+@@ -49165,17 +49877,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38038,7 +38151,7 @@
;
return 0;
}
-@@ -49207,14 +49791,15 @@
+@@ -49207,14 +49919,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38057,7 +38170,7 @@
if test $ac_cv_lib_qt_mt_XftInit = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBQT_MT 1
-@@ -49231,14 +49816,14 @@
+@@ -49231,14 +49944,14 @@
@@ -38075,7 +38188,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49281,17 +49866,17 @@
+@@ -49281,17 +49994,17 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38098,7 +38211,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49334,22 +49919,22 @@
+@@ -49334,22 +50047,22 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38127,7 +38240,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -49374,14 +49959,14 @@
+@@ -49374,14 +50087,14 @@
fi
@@ -38145,7 +38258,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49424,12 +50009,12 @@
+@@ -49424,12 +50137,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38162,7 +38275,7 @@
KDEINIT_FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -49442,8 +50027,7 @@
+@@ -49442,8 +50155,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38172,7 +38285,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'
-@@ -49453,17 +50037,17 @@
+@@ -49453,17 +50165,17 @@
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@@ -38196,7 +38309,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49500,15 +50084,16 @@
+@@ -49500,15 +50212,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38218,7 +38331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49542,9 +50127,10 @@
+@@ -49542,9 +50255,10 @@
ac_header_preproc=no
fi
@@ -38231,7 +38344,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -49568,25 +50154,18 @@
+@@ -49568,25 +50282,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;}
@@ -38262,7 +38375,7 @@
fi
if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-@@ -49626,17 +50205,16 @@
+@@ -49626,17 +50333,16 @@
kde_have_fam=yes
@@ -38285,7 +38398,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'
-@@ -49654,8 +50232,8 @@
+@@ -49654,8 +50360,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38296,7 +38409,7 @@
if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49668,17 +50246,17 @@
+@@ -49668,17 +50374,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38318,7 +38431,7 @@
;
return 0;
}
-@@ -49710,14 +50288,15 @@
+@@ -49710,14 +50416,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38337,7 +38450,7 @@
if test $ac_cv_lib_fam_FAMOpen = yes; then
LIBFAM="-lfam"; kde_have_fam=yes
else
-@@ -49745,8 +50324,8 @@
+@@ -49745,8 +50452,8 @@
@@ -38348,7 +38461,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49806,8 +50385,9 @@
+@@ -49806,8 +50513,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38359,7 +38472,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -49821,8 +50401,8 @@
+@@ -49821,8 +50529,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -38370,7 +38483,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -49849,18 +50429,19 @@
+@@ -49849,18 +50557,19 @@
for ac_header in sys/mnttab.h sys/mntent.h mntent.h fstab.h sys/ucred.h sys/mount.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38398,7 +38511,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49897,15 +50478,16 @@
+@@ -49897,15 +50606,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38420,7 +38533,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49939,9 +50521,10 @@
+@@ -49939,9 +50649,10 @@
ac_header_preproc=no
fi
@@ -38433,7 +38546,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49965,25 +50548,19 @@
+@@ -49965,25 +50676,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;}
@@ -38466,7 +38579,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50000,9 +50577,9 @@
+@@ -50000,9 +50705,9 @@
for ac_func in setmntent getmntinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38479,7 +38592,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -50028,30 +50605,24 @@
+@@ -50028,30 +50733,24 @@
#undef $ac_func
@@ -38515,7 +38628,7 @@
;
return 0;
}
-@@ -50083,13 +50654,15 @@
+@@ -50083,13 +50782,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38534,7 +38647,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -50103,8 +50676,8 @@
+@@ -50103,8 +50804,8 @@
kde_have_volmgt=yes
@@ -38545,7 +38658,7 @@
if test "${ac_cv_lib_volmgt_volmgt_running+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50117,17 +50690,17 @@
+@@ -50117,17 +50818,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38567,7 +38680,7 @@
;
return 0;
}
-@@ -50159,14 +50732,15 @@
+@@ -50159,14 +50860,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38586,7 +38699,7 @@
if test $ac_cv_lib_volmgt_volmgt_running = yes; then
LIBVOLMGT=-lvolmgt
else
-@@ -50183,14 +50757,14 @@
+@@ -50183,14 +50885,14 @@
fi
@@ -38607,7 +38720,7 @@
if test "${ac_cv_gnu_extensions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50214,8 +50788,8 @@
+@@ -50214,8 +50916,8 @@
fi
@@ -38618,7 +38731,7 @@
if test "$ac_cv_gnu_extensions" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -50226,15 +50800,14 @@
+@@ -50226,15 +50928,14 @@
if test "x$kde_enable_dnotify" = "xyes"; then
@@ -38636,7 +38749,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -50297,7 +50870,9 @@
+@@ -50297,7 +50998,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38646,7 +38759,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
-@@ -50316,25 +50891,25 @@
+@@ -50316,25 +51019,25 @@
#define HAVE_DNOTIFY 1
_ACEOF
@@ -38682,7 +38795,7 @@
if test "${ac_cv_gnu_extensions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50358,8 +50933,8 @@
+@@ -50358,8 +51061,8 @@
fi
@@ -38693,7 +38806,7 @@
if test "$ac_cv_gnu_extensions" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -50370,15 +50945,14 @@
+@@ -50370,15 +51073,14 @@
if test "x$kde_enable_inotify" = "xyes"; then
@@ -38711,7 +38824,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -50440,8 +51014,9 @@
+@@ -50440,8 +51142,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38722,7 +38835,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
-@@ -50460,11 +51035,11 @@
+@@ -50460,11 +51163,11 @@
#define HAVE_INOTIFY 1
_ACEOF
@@ -38738,7 +38851,7 @@
fi
fi
-@@ -50476,26 +51051,26 @@
+@@ -50476,26 +51179,26 @@
ssl_libraries=""
ssl_includes=""
@@ -38775,16 +38888,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -50510,7 +51085,7 @@
+@@ -50510,7 +51213,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 50513: $i/$j" >&5
-+ echo "configure: 51088: $i/$j" >&5
++ echo "configure: 51216: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -50584,9 +51159,10 @@
+@@ -50584,9 +51287,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38796,7 +38909,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -50605,26 +51181,26 @@
+@@ -50605,26 +51309,26 @@
eval "$ac_cv_have_ssl"
@@ -38836,7 +38949,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50697,8 +51273,8 @@
+@@ -50697,8 +51401,8 @@
eval "$ac_cv_ssl_version"
@@ -38847,7 +38960,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -50758,11 +51334,11 @@
+@@ -50758,11 +51462,11 @@
fi
@@ -38862,7 +38975,7 @@
if test "${kde_cv_shortsetgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50816,13 +51392,15 @@
+@@ -50816,13 +51520,15 @@
( exit $ac_status )
kde_cv_shortsetgroups="no"
fi
@@ -38881,7 +38994,7 @@
if test "$kde_cv_shortsetgroups" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -50836,18 +51414,19 @@
+@@ -50836,18 +51542,19 @@
for ac_header in arpa/nameser8_compat.h sys/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38909,7 +39022,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50884,15 +51463,16 @@
+@@ -50884,15 +51591,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38931,7 +39044,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50926,9 +51506,10 @@
+@@ -50926,9 +51634,10 @@
ac_header_preproc=no
fi
@@ -38944,7 +39057,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -50952,25 +51533,19 @@
+@@ -50952,25 +51661,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;}
@@ -38977,7 +39090,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -51008,8 +51583,7 @@
+@@ -51008,8 +51711,7 @@
@@ -38987,7 +39100,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'
-@@ -51022,9 +51596,9 @@
+@@ -51022,9 +51724,9 @@
for ac_func in setfsent
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39000,7 +39113,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51050,30 +51624,24 @@
+@@ -51050,30 +51752,24 @@
#undef $ac_func
@@ -39036,7 +39149,7 @@
;
return 0;
}
-@@ -51105,13 +51673,15 @@
+@@ -51105,13 +51801,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39055,7 +39168,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -51127,13 +51697,12 @@
+@@ -51127,13 +51825,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -39073,7 +39186,7 @@
yes)
with_gssapi=CHECK
;;
-@@ -51141,18 +51710,19 @@
+@@ -51141,18 +51838,19 @@
else
with_gssapi=CHECK
@@ -39097,7 +39210,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51195,15 +51765,15 @@
+@@ -51195,15 +51893,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -39117,25 +39230,25 @@
KRB5_CONFIG=$kde_cv_path
fi
-@@ -51241,7 +51811,7 @@
+@@ -51241,7 +51939,7 @@
do
for j in gssapi.h;
do
- echo "configure: 51244: $i/$j" >&5
-+ echo "configure: 51814: $i/$j" >&5
++ echo "configure: 51942: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -51263,7 +51833,7 @@
+@@ -51263,7 +51961,7 @@
do
for j in libgssapi.$ext;
do
- echo "configure: 51266: $i/$j" >&5
-+ echo "configure: 51836: $i/$j" >&5
++ echo "configure: 51964: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -51288,8 +51858,8 @@
+@@ -51288,8 +51986,8 @@
fi
case "$with_gssapi" in
@@ -39146,7 +39259,7 @@
framework)
GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
-@@ -51298,11 +51868,11 @@
+@@ -51298,11 +51996,11 @@
_ACEOF
GSSAPI_SUBDIR="gssapi"
@@ -39162,7 +39275,7 @@
*)
if test "x$with_gssapi" = "xFOUND" ; then
msg="incs=$gssapi_incdir libs=$gssapi_libdir"
-@@ -51336,8 +51906,8 @@
+@@ -51336,8 +52034,8 @@
#define HAVE_LIBGSSAPI 1
_ACEOF
@@ -39173,7 +39286,7 @@
;;
esac
-@@ -51351,18 +51921,19 @@
+@@ -51351,18 +52049,19 @@
for ac_header in ieeefp.h float.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39201,7 +39314,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51399,15 +51970,16 @@
+@@ -51399,15 +52098,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39223,7 +39336,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51441,9 +52013,10 @@
+@@ -51441,9 +52141,10 @@
ac_header_preproc=no
fi
@@ -39236,7 +39349,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51467,25 +52040,19 @@
+@@ -51467,25 +52168,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;}
@@ -39269,7 +39382,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -51497,8 +52064,8 @@
+@@ -51497,8 +52192,8 @@
done
@@ -39280,7 +39393,7 @@
if test "${ac_cv_lib_m_isinf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51511,17 +52078,17 @@
+@@ -51511,17 +52206,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39302,7 +39415,7 @@
;
return 0;
}
-@@ -51553,14 +52120,15 @@
+@@ -51553,14 +52248,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39321,7 +39434,7 @@
if test $ac_cv_lib_m_isinf = yes; then
-@@ -51571,8 +52139,8 @@
+@@ -51571,8 +52267,8 @@
fi
@@ -39332,7 +39445,7 @@
if test "${ac_cv_lib_m_finite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51585,17 +52153,17 @@
+@@ -51585,17 +52281,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39354,7 +39467,7 @@
;
return 0;
}
-@@ -51627,14 +52195,15 @@
+@@ -51627,14 +52323,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39373,7 +39486,7 @@
if test $ac_cv_lib_m_finite = yes; then
-@@ -51645,8 +52214,8 @@
+@@ -51645,8 +52342,8 @@
fi
@@ -39384,7 +39497,7 @@
if test "${ac_cv_lib_m__finite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51659,17 +52228,17 @@
+@@ -51659,17 +52356,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39406,7 +39519,7 @@
;
return 0;
}
-@@ -51701,14 +52270,15 @@
+@@ -51701,14 +52398,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39425,7 +39538,7 @@
if test $ac_cv_lib_m__finite = yes; then
-@@ -51719,8 +52289,8 @@
+@@ -51719,8 +52417,8 @@
fi
@@ -39436,7 +39549,7 @@
if test "${ac_cv_lib_m_isnan+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51733,17 +52303,17 @@
+@@ -51733,17 +52431,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39458,7 +39571,7 @@
;
return 0;
}
-@@ -51775,14 +52345,15 @@
+@@ -51775,14 +52473,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39477,7 +39590,7 @@
if test $ac_cv_lib_m_isnan = yes; then
-@@ -51796,25 +52367,25 @@
+@@ -51796,25 +52495,25 @@
@@ -39510,7 +39623,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51857,12 +52428,12 @@
+@@ -51857,12 +52556,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -39527,7 +39640,7 @@
PCRE_CONFIG=$kde_cv_path
fi
-@@ -51926,9 +52497,10 @@
+@@ -51926,9 +52625,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39539,7 +39652,7 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
-@@ -51961,20 +52533,19 @@
+@@ -51961,20 +52661,19 @@
@@ -39565,7 +39678,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -51991,8 +52562,8 @@
+@@ -51991,8 +52690,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39576,7 +39689,7 @@
if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52005,17 +52576,17 @@
+@@ -52005,17 +52704,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39598,7 +39711,7 @@
;
return 0;
}
-@@ -52047,14 +52618,15 @@
+@@ -52047,14 +52746,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39617,7 +39730,7 @@
if test $ac_cv_lib_aspell_new_aspell_config = yes; then
LIBASPELL="-laspell"
fi
-@@ -52066,8 +52638,7 @@
+@@ -52066,8 +52766,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -39627,7 +39740,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'
-@@ -52077,17 +52648,17 @@
+@@ -52077,17 +52776,17 @@
if test "${ac_cv_header_aspell_h+set}" = set; then
@@ -39651,7 +39764,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52124,15 +52695,16 @@
+@@ -52124,15 +52823,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39673,7 +39786,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52166,9 +52738,10 @@
+@@ -52166,9 +52866,10 @@
ac_header_preproc=no
fi
@@ -39686,7 +39799,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -52192,25 +52765,18 @@
+@@ -52192,25 +52893,18 @@
echo "$as_me: WARNING: aspell.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: aspell.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: aspell.h: in the future, the compiler will take precedence" >&2;}
@@ -39717,7 +39830,7 @@
fi
-@@ -52260,16 +52826,15 @@
+@@ -52260,16 +52954,15 @@
@@ -39738,7 +39851,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -52286,8 +52851,8 @@
+@@ -52286,8 +52979,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39749,7 +39862,7 @@
if test "${ac_cv_lib_hspell_hspell_check_word+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52300,17 +52865,17 @@
+@@ -52300,17 +52993,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39771,7 +39884,7 @@
;
return 0;
}
-@@ -52342,14 +52907,15 @@
+@@ -52342,14 +53035,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39790,7 +39903,7 @@
if test $ac_cv_lib_hspell_hspell_check_word = yes; then
LIBHSPELL="-lhspell"
fi
-@@ -52361,8 +52927,7 @@
+@@ -52361,8 +53055,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -39800,7 +39913,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'
-@@ -52372,17 +52937,17 @@
+@@ -52372,17 +53065,17 @@
if test "${ac_cv_header_hspell_h+set}" = set; then
@@ -39824,7 +39937,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52419,15 +52984,16 @@
+@@ -52419,15 +53112,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39846,7 +39959,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52461,9 +53027,10 @@
+@@ -52461,9 +53155,10 @@
ac_header_preproc=no
fi
@@ -39859,7 +39972,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -52487,25 +53054,18 @@
+@@ -52487,25 +53182,18 @@
echo "$as_me: WARNING: hspell.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: hspell.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: hspell.h: in the future, the compiler will take precedence" >&2;}
@@ -39890,7 +40003,7 @@
fi
-@@ -52588,18 +53148,19 @@
+@@ -52588,18 +53276,19 @@
for ac_header in sys/soundcard.h machine/soundcard.h linux/awe_voice.h awe_voice.h /usr/src/sys/i386/isa/sound/awe_voice.h /usr/src/sys/gnu/i386/isa/sound/awe_voice.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39918,7 +40031,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52636,15 +53197,16 @@
+@@ -52636,15 +53325,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39940,7 +40053,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52678,9 +53240,10 @@
+@@ -52678,9 +53368,10 @@
ac_header_preproc=no
fi
@@ -39953,7 +40066,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -52704,25 +53267,19 @@
+@@ -52704,25 +53395,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;}
@@ -39986,7 +40099,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -52738,11 +53295,11 @@
+@@ -52738,11 +53423,11 @@
kde_with_alsa=yes
@@ -40002,7 +40115,7 @@
if test "$kde_with_alsa" = "yes"; then
-@@ -52756,18 +53313,19 @@
+@@ -52756,18 +53441,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40030,7 +40143,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52804,15 +53362,16 @@
+@@ -52804,15 +53490,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40052,7 +40165,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52846,9 +53405,10 @@
+@@ -52846,9 +53533,10 @@
ac_header_preproc=no
fi
@@ -40065,7 +40178,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -52872,25 +53432,19 @@
+@@ -52872,25 +53560,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;}
@@ -40098,7 +40211,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -52906,7 +53460,6 @@
+@@ -52906,7 +53588,6 @@
@@ -40106,7 +40219,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -52970,8 +53523,9 @@
+@@ -52970,8 +53651,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40117,7 +40230,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-@@ -53032,8 +53586,9 @@
+@@ -53032,8 +53714,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40128,7 +40241,7 @@
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_ext=c
-@@ -53044,8 +53599,8 @@
+@@ -53044,8 +53727,8 @@
if test "x$kde_has_asoundlib" = "xyes"; then
@@ -40139,7 +40252,7 @@
if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53058,17 +53613,17 @@
+@@ -53058,17 +53741,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40161,7 +40274,7 @@
;
return 0;
}
-@@ -53100,14 +53655,15 @@
+@@ -53100,14 +53783,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40180,7 +40293,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
if test "x$kde_has_alsa_0_5" = "xyes"; then
-@@ -53125,8 +53681,8 @@
+@@ -53125,8 +53809,8 @@
#define HAVE_LIBASOUND2 1
_ACEOF
@@ -40191,7 +40304,7 @@
if test "${ac_cv_lib_asound_snd_pcm_resume+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53139,17 +53695,17 @@
+@@ -53139,17 +53823,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40213,7 +40326,7 @@
;
return 0;
}
-@@ -53181,14 +53737,15 @@
+@@ -53181,14 +53865,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40232,7 +40345,7 @@
if test $ac_cv_lib_asound_snd_pcm_resume = yes; then
-@@ -53245,8 +53802,8 @@
+@@ -53245,8 +53930,8 @@
fi
for i in $ac_topsubdirs; do
@@ -40243,7 +40356,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -53257,8 +53814,8 @@
+@@ -53257,8 +53942,8 @@
else
install_it="no"
fi
@@ -40254,7 +40367,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -53670,417 +54227,417 @@
+@@ -53670,417 +54355,417 @@
kate_SUBDIR_included_FALSE=
fi
@@ -40878,7 +40991,7 @@
all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/kdefx -I$(top_builddir)/kdecore -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
-@@ -54105,39 +54662,58 @@
+@@ -54105,39 +54790,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -40953,7 +41066,7 @@
fi
fi
rm -f confcache
-@@ -54146,38 +54722,31 @@
+@@ -54146,38 +54850,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -41005,7 +41118,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
-@@ -54241,13 +54810,6 @@
+@@ -54241,13 +54938,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -41019,7 +41132,7 @@
if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -54636,11 +55198,35 @@
+@@ -54636,11 +55326,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -41057,7 +41170,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -54649,8 +55235,43 @@
+@@ -54649,8 +55363,43 @@
fi
@@ -41102,7 +41215,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -54664,18 +55285,19 @@
+@@ -54664,18 +55413,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -41125,7 +41238,7 @@
as_basename=basename
else
as_basename=false
-@@ -54683,159 +55305,120 @@
+@@ -54683,159 +55433,120 @@
# Name of the executable.
@@ -41356,7 +41469,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -54844,7 +55427,19 @@
+@@ -54844,7 +55555,19 @@
as_mkdir_p=false
fi
@@ -41377,7 +41490,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'"
-@@ -54853,31 +55448,14 @@
+@@ -54853,31 +55576,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -41413,7 +41526,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -54885,30 +55463,20 @@
+@@ -54885,30 +55591,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -41452,7 +41565,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -54935,19 +55503,21 @@
+@@ -54935,19 +55631,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -41479,7 +41592,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -54958,39 +55528,24 @@
+@@ -54958,39 +55656,24 @@
do
case $1 in
--*=*)
@@ -41525,7 +41638,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -55000,18 +55555,24 @@
+@@ -55000,18 +55683,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -41555,7 +41668,7 @@
esac
shift
-@@ -55027,246 +55588,258 @@
+@@ -55027,246 +55716,258 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -42034,7 +42147,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
-@@ -55278,662 +55851,895 @@
+@@ -55278,662 +55979,895 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -43531,7 +43644,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -55941,248 +56747,122 @@
+@@ -55941,248 +56875,122 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -43873,7 +43986,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -56193,135 +56873,39 @@
+@@ -56193,135 +57001,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -44035,7 +44148,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.
-@@ -56331,18 +56915,29 @@
+@@ -56331,18 +57043,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
@@ -44073,7 +44186,7 @@
else
continue
fi
-@@ -56364,53 +56959,79 @@
+@@ -56364,53 +57087,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
More information about the pkg-kde-commits
mailing list