rev 4259 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:52:49 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:52:42 +0000 (Sun, 30 Jul 2006)
New Revision: 4259
Modified:
trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-07-30 01:46:43 UTC (rev 4258)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-07-30 01:52:42 UTC (rev 4259)
@@ -4341,7 +4341,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59d.
++# Generated by GNU Autoconf 2.60.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4623,8 +4623,8 @@
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells which exist, to save several forks.
-+ if test -f "$as_shell" &&
++ # Try only shells that exist, to save several forks.
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -6003,7 +6003,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6022,7 +6022,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -6656,7 +6656,7 @@
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7758,8 +7758,9 @@
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -7832,7 +7833,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3101,285 +3899,273 @@
+@@ -3101,285 +3899,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8108,15 +8109,16 @@
-continue
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -8182,6 +8184,11 @@
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
@@ -8254,7 +8261,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
@@ -8289,7 +8296,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3388,8 +4174,8 @@
+@@ -3388,8 +4179,8 @@
depcc="$CC" am_compiler_list=
@@ -8300,7 +8307,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3478,8 +4264,8 @@
+@@ -3478,8 +4269,8 @@
fi
fi
@@ -8311,7 +8318,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3501,8 +4287,8 @@
+@@ -3501,8 +4292,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
@@ -8322,7 +8329,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3536,8 +4322,13 @@
+@@ -3536,8 +4327,13 @@
#endif
Syntax error
_ACEOF
@@ -8338,7 +8345,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3562,9 +4353,10 @@
+@@ -3562,9 +4358,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8350,7 +8357,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3574,8 +4366,13 @@
+@@ -3574,8 +4371,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8366,7 +8373,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3602,6 +4399,7 @@
+@@ -3602,6 +4404,7 @@
ac_preproc_ok=:
break
fi
@@ -8374,7 +8381,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3619,8 +4417,8 @@
+@@ -3619,8 +4422,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8385,7 +8392,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3643,8 +4441,13 @@
+@@ -3643,8 +4446,13 @@
#endif
Syntax error
_ACEOF
@@ -8401,7 +8408,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3669,9 +4472,10 @@
+@@ -3669,9 +4477,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8413,7 +8420,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3681,8 +4485,13 @@
+@@ -3681,8 +4490,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8429,7 +8436,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3709,6 +4518,7 @@
+@@ -3709,6 +4523,7 @@
ac_preproc_ok=:
break
fi
@@ -8437,7 +8444,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3759,18 +4569,22 @@
+@@ -3759,18 +4574,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8465,7 +8472,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3783,36 +4597,38 @@
+@@ -3783,36 +4602,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8512,7 +8519,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3825,55 +4641,85 @@
+@@ -3825,55 +4646,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8616,7 +8623,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3896,24 +4742,36 @@
+@@ -3896,24 +4747,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8661,15 +8668,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3922,24 +4780,28 @@
+@@ -3922,24 +4785,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -8697,7 +8705,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3955,24 +4817,36 @@
+@@ -3955,24 +4822,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8742,7 +8750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3981,70 +4855,53 @@
+@@ -3981,70 +4860,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8837,7 +8845,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4053,61 +4910,91 @@
+@@ -4053,61 +4915,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8914,20 +8922,21 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8950,7 +8959,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4116,8 +5003,8 @@
+@@ -4116,8 +5008,8 @@
depcc="$CXX" am_compiler_list=
@@ -8961,7 +8970,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4206,8 +5093,8 @@
+@@ -4206,8 +5098,8 @@
fi
fi
@@ -8972,7 +8981,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4225,8 +5112,8 @@
+@@ -4225,8 +5117,8 @@
@@ -8983,7 +8992,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4251,24 +5138,36 @@
+@@ -4251,24 +5143,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9028,7 +9037,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4277,13 +5176,14 @@
+@@ -4277,13 +5181,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9036,17 +9045,18 @@
+ kde_bad_compiler=yes
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+echo "${ECHO_T}$kde_bad_compiler" >&6; }
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4325,17 +5225,16 @@
+@@ -4325,17 +5230,16 @@
fi
fi
@@ -9068,7 +9078,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4363,24 +5262,36 @@
+@@ -4363,24 +5267,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9113,17 +9123,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4389,7 +5300,9 @@
+@@ -4389,8 +5305,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4403,29 +5316,28 @@
+ ac_ext=c
+@@ -4403,29 +5321,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9161,7 +9173,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4452,24 +5364,36 @@
+@@ -4452,24 +5369,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9206,17 +9218,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4478,7 +5402,9 @@
+@@ -4478,8 +5407,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4492,13 +5418,13 @@
+ ac_ext=c
+@@ -4492,13 +5423,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9234,7 +9248,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4519,16 +5445,15 @@
+@@ -4519,16 +5450,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9255,7 +9269,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4555,24 +5480,36 @@
+@@ -4555,24 +5485,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9300,17 +9314,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4581,7 +5518,9 @@
+@@ -4581,8 +5523,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4595,16 +5534,16 @@
+ ac_ext=c
+@@ -4595,16 +5539,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9331,7 +9347,7 @@
:
fi
-@@ -4619,16 +5558,15 @@
+@@ -4619,16 +5563,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"
@@ -9352,7 +9368,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4655,24 +5593,36 @@
+@@ -4655,24 +5598,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9397,17 +9413,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4681,7 +5631,9 @@
+@@ -4681,8 +5636,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4695,27 +5647,26 @@
+ ac_ext=c
+@@ -4695,27 +5652,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9442,7 +9460,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4740,24 +5691,36 @@
+@@ -4740,24 +5696,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9487,17 +9505,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4766,7 +5729,9 @@
+@@ -4766,8 +5734,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4780,13 +5745,13 @@
+ ac_ext=c
+@@ -4780,13 +5750,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9515,7 +9535,7 @@
:
fi
-@@ -4794,16 +5759,15 @@
+@@ -4794,16 +5764,15 @@
;;
esac
@@ -9536,7 +9556,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4830,24 +5794,36 @@
+@@ -4830,24 +5799,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9581,17 +9601,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4856,7 +5832,9 @@
+@@ -4856,8 +5837,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4870,28 +5848,27 @@
+ ac_ext=c
+@@ -4870,28 +5853,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9628,7 +9650,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4918,24 +5895,36 @@
+@@ -4918,24 +5900,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9673,17 +9695,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4944,7 +5933,9 @@
+@@ -4944,8 +5938,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4958,28 +5949,27 @@
+ ac_ext=c
+@@ -4958,28 +5954,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9720,7 +9744,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5006,24 +5996,36 @@
+@@ -5006,24 +6001,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9765,17 +9789,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5032,7 +6034,9 @@
+@@ -5032,8 +6039,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5046,13 +6050,13 @@
+ ac_ext=c
+@@ -5046,13 +6055,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9793,7 +9819,7 @@
:
fi
-@@ -5064,13 +6068,13 @@
+@@ -5064,13 +6073,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9811,7 +9837,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5078,16 +6082,15 @@
+@@ -5078,16 +6087,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9832,7 +9858,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5114,24 +6117,36 @@
+@@ -5114,24 +6122,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9877,17 +9903,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5140,7 +6155,9 @@
+@@ -5140,8 +6160,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5154,13 +6171,13 @@
+ ac_ext=c
+@@ -5154,13 +6176,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9905,7 +9933,7 @@
:
fi
-@@ -5172,16 +6189,15 @@
+@@ -5172,16 +6194,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9926,7 +9954,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5208,24 +6224,36 @@
+@@ -5208,24 +6229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9971,17 +9999,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5234,7 +6262,9 @@
+@@ -5234,8 +6267,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5248,28 +6278,27 @@
+ ac_ext=c
+@@ -5248,28 +6283,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10018,7 +10048,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5296,24 +6325,36 @@
+@@ -5296,24 +6330,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10063,17 +10093,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5322,7 +6363,9 @@
+@@ -5322,8 +6368,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5336,28 +6379,27 @@
+ ac_ext=c
+@@ -5336,28 +6384,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10110,7 +10142,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5384,24 +6426,36 @@
+@@ -5384,24 +6431,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10155,17 +10187,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5410,7 +6464,9 @@
+@@ -5410,8 +6469,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5424,28 +6480,27 @@
+ ac_ext=c
+@@ -5424,28 +6485,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10202,7 +10236,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5472,24 +6527,36 @@
+@@ -5472,24 +6532,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10247,17 +10281,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5498,7 +6565,9 @@
+@@ -5498,8 +6570,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5512,13 +6581,13 @@
+ ac_ext=c
+@@ -5512,13 +6586,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10275,7 +10311,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5526,37 +6595,37 @@
+@@ -5526,37 +6600,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10327,7 +10363,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5588,24 +6657,36 @@
+@@ -5588,24 +6662,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10372,7 +10408,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5614,9 +6695,10 @@
+@@ -5614,18 +6700,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10380,11 +10416,12 @@
+ kde_cv_opt_noinline_match=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5624,8 +6706,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -10395,7 +10432,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5645,16 +6727,15 @@
+@@ -5645,16 +6732,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10416,7 +10453,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5681,24 +6762,36 @@
+@@ -5681,24 +6767,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10461,17 +10498,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5707,7 +6800,9 @@
+@@ -5707,8 +6805,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5721,29 +6816,28 @@
+ ac_ext=c
+@@ -5721,29 +6821,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10509,7 +10548,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5770,24 +6864,36 @@
+@@ -5770,24 +6869,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10554,17 +10593,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5796,7 +6902,9 @@
+@@ -5796,8 +6907,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5810,28 +6918,27 @@
+ ac_ext=c
+@@ -5810,28 +6923,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10601,7 +10642,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5858,24 +6965,36 @@
+@@ -5858,24 +6970,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10646,17 +10687,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5884,7 +7003,9 @@
+@@ -5884,8 +7008,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5898,28 +7019,27 @@
+ ac_ext=c
+@@ -5898,28 +7024,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10693,7 +10736,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5946,24 +7066,36 @@
+@@ -5946,24 +7071,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10738,17 +10781,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5972,7 +7104,9 @@
+@@ -5972,8 +7109,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5986,28 +7120,27 @@
+ ac_ext=c
+@@ -5986,28 +7125,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10785,7 +10830,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6034,24 +7167,36 @@
+@@ -6034,24 +7172,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10830,17 +10875,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6060,7 +7205,9 @@
+@@ -6060,8 +7210,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6074,28 +7221,27 @@
+ ac_ext=c
+@@ -6074,28 +7226,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10877,7 +10924,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6122,24 +7268,36 @@
+@@ -6122,24 +7273,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10922,17 +10969,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6148,7 +7306,9 @@
+@@ -6148,8 +7311,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6162,13 +7322,13 @@
+ ac_ext=c
+@@ -6162,13 +7327,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10950,7 +10999,7 @@
:
fi
-@@ -6275,13 +7435,13 @@
+@@ -6275,13 +7440,13 @@
fi
@@ -10967,7 +11016,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6311,8 +7471,13 @@
+@@ -6311,8 +7476,13 @@
#endif
Syntax error
_ACEOF
@@ -10983,7 +11032,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6337,9 +7502,10 @@
+@@ -6337,9 +7507,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10995,7 +11044,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6349,8 +7515,13 @@
+@@ -6349,8 +7520,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11011,7 +11060,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6377,6 +7548,7 @@
+@@ -6377,6 +7553,7 @@
ac_preproc_ok=:
break
fi
@@ -11019,7 +11068,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6394,8 +7566,8 @@
+@@ -6394,8 +7571,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11030,7 +11079,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6418,8 +7590,13 @@
+@@ -6418,8 +7595,13 @@
#endif
Syntax error
_ACEOF
@@ -11046,7 +11095,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6444,9 +7621,10 @@
+@@ -6444,9 +7626,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11058,7 +11107,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6456,8 +7634,13 @@
+@@ -6456,8 +7639,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11074,7 +11123,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6484,6 +7667,7 @@
+@@ -6484,6 +7672,7 @@
ac_preproc_ok=:
break
fi
@@ -11082,7 +11131,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6510,16 +7694,15 @@
+@@ -6510,16 +7699,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11103,7 +11152,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6546,24 +7729,36 @@
+@@ -6546,24 +7734,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11148,17 +11197,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6572,7 +7767,9 @@
+@@ -6572,8 +7772,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6586,22 +7783,21 @@
+ ac_ext=c
+@@ -6586,22 +7788,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11187,7 +11238,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6617,36 +7813,36 @@
+@@ -6617,36 +7818,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11234,7 +11285,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6673,24 +7869,36 @@
+@@ -6673,24 +7874,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11279,17 +11330,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6699,7 +7907,9 @@
+@@ -6699,8 +7912,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6713,29 +7923,28 @@
+ ac_ext=c
+@@ -6713,29 +7928,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11327,7 +11380,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6762,24 +7971,36 @@
+@@ -6762,24 +7976,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11372,17 +11425,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6788,7 +8009,9 @@
+@@ -6788,8 +8014,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6802,13 +8025,13 @@
+ ac_ext=c
+@@ -6802,13 +8030,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11400,7 +11455,7 @@
:
fi
-@@ -6818,13 +8041,13 @@
+@@ -6818,13 +8046,13 @@
@@ -11418,7 +11473,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6837,13 +8060,13 @@
+@@ -6837,13 +8065,13 @@
@@ -11436,7 +11491,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6854,216 +8077,36 @@
+@@ -6854,216 +8082,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11449,25 +11504,9 @@
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+ # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-+ kde_use_nmcheck=no
-+fi
+-else
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11476,6 +11515,12 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -11486,7 +11531,14 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
+
-int
-main ()
-{
@@ -11657,12 +11709,12 @@
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
--
+
+
+
-
--
--
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11672,7 +11724,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7082,12 +8125,12 @@
+@@ -7082,12 +8130,12 @@
esac
else
enable_shared=yes
@@ -11689,7 +11741,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7106,7 +8149,8 @@
+@@ -7106,7 +8154,8 @@
esac
else
enable_static=no
@@ -11699,7 +11751,7 @@
-@@ -7115,11 +8159,11 @@
+@@ -7115,11 +8164,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -11715,7 +11767,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7140,8 +8184,8 @@
+@@ -7140,8 +8189,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11726,7 +11778,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7157,14 +8201,13 @@
+@@ -7157,14 +8206,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11745,7 +11797,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7183,10 +8226,11 @@
+@@ -7183,10 +8231,11 @@
esac
else
enable_fast_install=yes
@@ -11760,7 +11812,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7210,7 +8254,7 @@
+@@ -7210,7 +8259,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
@@ -11769,7 +11821,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7239,37 +8283,184 @@
+@@ -7239,37 +8288,184 @@
fi
SED=$lt_cv_path_SED
@@ -11845,7 +11897,10 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -11855,11 +11910,8 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
+
++
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
@@ -11932,25 +11984,25 @@
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
@@ -11971,7 +12023,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7298,11 +8489,11 @@
+@@ -7298,11 +8494,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11987,7 +12039,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7315,7 +8506,7 @@
+@@ -7315,7 +8511,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,
@@ -11996,7 +12048,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7335,21 +8526,21 @@
+@@ -7335,21 +8531,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12025,7 +12077,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7359,29 +8550,38 @@
+@@ -7359,29 +8555,38 @@
;;
esac
fi
@@ -12072,7 +12124,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7389,56 +8589,63 @@
+@@ -7389,56 +8594,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12170,7 +12222,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7465,44 +8672,36 @@
+@@ -7465,44 +8677,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12225,7 +12277,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7518,7 +8717,7 @@
+@@ -7518,7 +8722,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12234,7 +12286,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7534,43 +8733,27 @@
+@@ -7534,43 +8738,27 @@
esac
;;
@@ -12291,7 +12343,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7589,32 +8772,22 @@
+@@ -7589,32 +8777,22 @@
;;
openbsd*)
@@ -12327,7 +12379,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7635,17 +8808,20 @@
+@@ -7635,17 +8813,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12351,7 +12403,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7654,14 +8830,17 @@
+@@ -7654,14 +8835,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12372,16 +12424,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7688,7 +8867,7 @@
+@@ -7688,7 +8872,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7691 "configure"' > conftest.$ac_ext
-+ echo '#line 8870 "configure"' > conftest.$ac_ext
++ echo '#line 8875 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7731,14 +8910,13 @@
+@@ -7731,14 +8915,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12398,7 +12450,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7750,7 +8928,6 @@
+@@ -7750,7 +8933,6 @@
esac
;;
*64-bit*)
@@ -12406,7 +12458,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7775,8 +8952,8 @@
+@@ -7775,8 +8957,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12417,7 +12469,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7802,24 +8979,36 @@
+@@ -7802,24 +8984,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12462,18 +12514,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7828,8 +9017,9 @@
+@@ -7828,9 +9022,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7839,13 +9029,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7839,13 +9034,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12509,7 +12563,7 @@
esac
-@@ -7853,8 +9063,8 @@
+@@ -7853,8 +9068,8 @@
@@ -12520,7 +12574,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7878,24 +9088,36 @@
+@@ -7878,24 +9093,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12565,18 +12619,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7904,8 +9126,9 @@
+@@ -7904,9 +9131,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7962,6 +9185,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7962,6 +9190,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12584,7 +12640,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7981,18 +9205,27 @@
+@@ -7981,18 +9210,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12618,7 +12674,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8005,12 +9238,14 @@
+@@ -8005,12 +9243,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12636,7 +12692,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8033,9 +9268,9 @@
+@@ -8033,9 +9273,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12649,7 +12705,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8049,24 +9284,36 @@
+@@ -8049,24 +9289,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12694,15 +12750,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8075,12 +9322,14 @@
+@@ -8075,12 +9327,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -12712,7 +12769,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8095,18 +9344,19 @@
+@@ -8095,18 +9349,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12740,7 +12797,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8117,24 +9367,36 @@
+@@ -8117,24 +9372,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12785,17 +12842,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8143,15 +9405,16 @@
+@@ -8143,15 +9410,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -12807,7 +12865,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8160,8 +9423,13 @@
+@@ -8160,8 +9428,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12823,7 +12881,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8185,9 +9453,10 @@
+@@ -8185,9 +9458,10 @@
ac_header_preproc=no
fi
@@ -12836,7 +12894,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8211,25 +9480,19 @@
+@@ -8211,25 +9485,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;}
@@ -12869,7 +12927,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8241,219 +9504,538 @@
+@@ -8241,226 +9509,545 @@
done
@@ -13153,25 +13211,23 @@
+ else
+ ac_cpp_err=
+ fi
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
++else
+ ac_cpp_err=yes
- fi
++fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
+ # Passes both tests.
+ac_preproc_ok=:
+break
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -13179,7 +13235,16 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+-if test "$ac_test_FFLAGS" = set; then
+- FFLAGS=$ac_save_FFLAGS
+-elif test $ac_cv_prog_f77_g = yes; then
+- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+- FFLAGS="-g -O2"
+- else
+- FFLAGS="-g"
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -13517,7 +13582,7 @@
+ ac_compiler_gnu=no
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+fi
@@ -13580,17 +13645,22 @@
+ ac_cv_prog_f77_g=no
+fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -8482,13 +10064,13 @@
++if test "$ac_test_FFLAGS" = set; then
++ FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++ FFLAGS="-g -O2"
++ else
++ FFLAGS="-g"
+ fi
+ else
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+@@ -8482,13 +10069,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13607,7 +13677,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8517,20 +10099,70 @@
+@@ -8517,20 +10104,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13684,7 +13754,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8541,19 +10173,19 @@
+@@ -8541,19 +10178,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13710,7 +13780,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8567,9 +10199,6 @@
+@@ -8567,9 +10204,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13720,7 +13790,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8591,14 +10220,30 @@
+@@ -8591,14 +10225,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'"
;;
@@ -13753,7 +13823,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8616,14 +10261,17 @@
+@@ -8616,14 +10266,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13773,7 +13843,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8741,15 +10389,15 @@
+@@ -8741,15 +10394,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
@@ -13795,7 +13865,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8763,8 +10411,8 @@
+@@ -8763,8 +10416,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13806,7 +13876,7 @@
objdir=$lt_cv_objdir
-@@ -8785,7 +10433,7 @@
+@@ -8785,7 +10438,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13815,7 +13885,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8805,7 +10453,7 @@
+@@ -8805,7 +10458,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13824,7 +13894,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8815,8 +10463,8 @@
+@@ -8815,8 +10468,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
@@ -13835,7 +13905,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8829,32 +10477,34 @@
+@@ -8829,32 +10482,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13877,7 +13947,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8867,27 +10517,41 @@
+@@ -8867,27 +10522,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13926,7 +13996,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8895,8 +10559,8 @@
+@@ -8895,8 +10564,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
@@ -13937,7 +14007,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8909,32 +10573,34 @@
+@@ -8909,32 +10578,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13979,7 +14049,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8947,27 +10613,41 @@
+@@ -8947,27 +10618,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14028,7 +14098,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8975,8 +10655,8 @@
+@@ -8975,8 +10660,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
@@ -14039,7 +14109,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8989,32 +10669,34 @@
+@@ -8989,32 +10674,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14081,7 +14151,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9027,27 +10709,41 @@
+@@ -9027,27 +10714,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14130,7 +14200,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9062,6 +10758,7 @@
+@@ -9062,6 +10763,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14138,7 +14208,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9081,21 +10778,32 @@
+@@ -9081,21 +10783,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14175,7 +14245,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9115,7 +10823,7 @@
+@@ -9115,7 +10828,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14184,7 +14254,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9147,17 +10855,17 @@
+@@ -9147,17 +10860,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14208,7 +14278,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9177,7 +10885,7 @@
+@@ -9177,7 +10890,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14217,7 +14287,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9209,11 +10917,11 @@
+@@ -9209,11 +10922,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14233,7 +14303,7 @@
fi
else
-@@ -9228,21 +10936,21 @@
+@@ -9228,21 +10941,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14262,7 +14332,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9272,68 +10980,25 @@
+@@ -9272,68 +10985,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14346,7 +14416,7 @@
## CAVEAT EMPTOR:
-@@ -9347,8 +11012,8 @@
+@@ -9347,8 +11017,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14357,7 +14427,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9362,26 +11027,28 @@
+@@ -9362,26 +11032,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 \
@@ -14366,12 +14436,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9368: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11033: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11038: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9372: \$? = $ac_status" >&5
-+ echo "$as_me:11037: \$? = $ac_status" >&5
++ echo "$as_me:11042: \$? = $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
@@ -14393,7 +14463,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9395,8 +11062,8 @@
+@@ -9395,8 +11067,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14404,7 +14474,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9434,6 +11101,11 @@
+@@ -9434,6 +11106,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14416,7 +14486,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9450,7 +11122,7 @@
+@@ -9450,7 +11127,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14425,7 +14495,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9476,6 +11148,16 @@
+@@ -9476,6 +11153,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14442,7 +14512,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9487,7 +11169,7 @@
+@@ -9487,7 +11174,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.
@@ -14451,7 +14521,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9510,13 +11192,20 @@
+@@ -9510,13 +11197,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14474,7 +14544,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9531,15 +11220,15 @@
+@@ -9531,15 +11225,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14496,7 +14566,7 @@
;;
sunos4*)
-@@ -9548,7 +11237,7 @@
+@@ -9548,7 +11242,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14505,7 +14575,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9561,6 +11250,17 @@
+@@ -9561,6 +11255,17 @@
fi
;;
@@ -14523,7 +14593,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9572,16 +11272,16 @@
+@@ -9572,16 +11277,16 @@
esac
fi
@@ -14544,7 +14614,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9595,26 +11295,28 @@
+@@ -9595,26 +11300,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 \
@@ -14553,12 +14623,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11301: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11306: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9605: \$? = $ac_status" >&5
-+ echo "$as_me:11305: \$? = $ac_status" >&5
++ echo "$as_me:11310: \$? = $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
@@ -14580,7 +14650,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9627,7 +11329,7 @@
+@@ -9627,7 +11334,7 @@
fi
fi
@@ -14589,7 +14659,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9637,8 +11339,50 @@
+@@ -9637,8 +11344,50 @@
;;
esac
@@ -14642,7 +14712,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9649,60 +11393,58 @@
+@@ -9649,60 +11398,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14664,12 +14734,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9668: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11405: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11410: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9672: \$? = $ac_status" >&5
-+ echo "$as_me:11409: \$? = $ac_status" >&5
++ echo "$as_me:11414: \$? = $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
@@ -14721,7 +14791,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9712,8 +11454,8 @@
+@@ -9712,8 +11459,8 @@
need_locks=no
fi
@@ -14732,7 +14802,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9751,6 +11493,16 @@
+@@ -9751,6 +11498,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14749,7 +14819,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9761,6 +11513,10 @@
+@@ -9761,6 +11518,10 @@
with_gnu_ld=no
fi
;;
@@ -14760,7 +14830,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9771,6 +11527,27 @@
+@@ -9771,6 +11532,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14788,7 +14858,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9808,7 +11585,7 @@
+@@ -9808,7 +11590,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14797,7 +14867,7 @@
else
ld_shlibs=no
fi
-@@ -9818,13 +11595,13 @@
+@@ -9818,13 +11600,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'
@@ -14814,7 +14884,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9833,23 +11610,70 @@
+@@ -9833,23 +11615,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14890,7 +14960,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9863,13 +11687,40 @@
+@@ -9863,13 +11692,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14933,7 +15003,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9879,24 +11730,19 @@
+@@ -9879,24 +11735,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14965,7 +15035,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9908,7 +11754,7 @@
+@@ -9908,7 +11759,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14974,7 +15044,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9930,9 +11776,21 @@
+@@ -9930,9 +11781,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
@@ -14998,7 +15068,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9949,7 +11807,7 @@
+@@ -9949,7 +11812,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15007,7 +15077,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9968,8 +11826,12 @@
+@@ -9968,8 +11831,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15020,7 +15090,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9977,22 +11839,23 @@
+@@ -9977,22 +11844,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15051,7 +15121,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10008,24 +11871,36 @@
+@@ -10008,24 +11876,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15096,14 +15166,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10039,19 +11914,20 @@
+@@ -10039,19 +11919,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15121,7 +15192,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10070,24 +11946,36 @@
+@@ -10070,24 +11951,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15166,17 +15237,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10101,7 +11989,9 @@
+@@ -10101,8 +11994,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10111,13 +12001,11 @@
+
+@@ -10111,13 +12006,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15193,7 +15266,7 @@
fi
fi
;;
-@@ -10130,7 +12018,7 @@
+@@ -10130,7 +12023,7 @@
ld_shlibs=no
;;
@@ -15202,7 +15275,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10140,13 +12028,13 @@
+@@ -10140,13 +12033,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15219,7 +15292,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -10156,52 +12044,52 @@
+@@ -10156,52 +12049,52 @@
;;
darwin* | rhapsody*)
@@ -15312,7 +15385,7 @@
fi
;;
-@@ -10235,8 +12123,8 @@
+@@ -10235,8 +12128,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15323,7 +15396,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10244,7 +12132,7 @@
+@@ -10244,7 +12137,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15332,7 +15405,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10258,47 +12146,62 @@
+@@ -10258,47 +12151,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15419,7 +15492,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10312,7 +12215,7 @@
+@@ -10312,7 +12220,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15428,7 +15501,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10322,7 +12225,7 @@
+@@ -10322,7 +12230,7 @@
link_all_deplibs=yes
;;
@@ -15437,7 +15510,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10345,7 +12248,8 @@
+@@ -10345,7 +12253,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
@@ -15447,7 +15520,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10355,7 +12259,7 @@
+@@ -10355,7 +12264,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15456,7 +15529,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10366,14 +12270,14 @@
+@@ -10366,14 +12275,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15473,7 +15546,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10385,13 +12289,13 @@
+@@ -10385,13 +12294,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15489,7 +15562,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10399,21 +12303,15 @@
+@@ -10399,21 +12308,15 @@
hardcode_libdir_separator=:
;;
@@ -15515,7 +15588,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10422,8 +12320,18 @@
+@@ -10422,8 +12325,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15536,7 +15609,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10432,7 +12340,7 @@
+@@ -10432,7 +12345,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.
@@ -15545,7 +15618,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10480,36 +12388,45 @@
+@@ -10480,36 +12393,45 @@
fi
;;
@@ -15612,7 +15685,7 @@
;;
uts4*)
-@@ -10524,15 +12441,10 @@
+@@ -10524,15 +12446,10 @@
esac
fi
@@ -15630,7 +15703,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10550,8 +12462,8 @@
+@@ -10550,8 +12467,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.
@@ -15641,7 +15714,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10565,6 +12477,7 @@
+@@ -10565,6 +12482,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15649,7 +15722,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10587,20 +12500,20 @@
+@@ -10587,20 +12505,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15675,7 +15748,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10610,7 +12523,20 @@
+@@ -10610,7 +12528,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15697,7 +15770,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10675,7 +12601,7 @@
+@@ -10675,7 +12606,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15706,7 +15779,7 @@
;;
beos*)
-@@ -10684,7 +12610,7 @@
+@@ -10684,7 +12615,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15715,7 +15788,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10700,7 +12626,7 @@
+@@ -10700,7 +12631,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15724,7 +15797,7 @@
need_version=no
need_lib_prefix=no
-@@ -10712,7 +12638,8 @@
+@@ -10712,7 +12643,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15734,7 +15807,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10742,7 +12669,7 @@
+@@ -10742,7 +12674,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15743,7 +15816,7 @@
;;
esac
;;
-@@ -10765,7 +12692,7 @@
+@@ -10765,7 +12697,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15752,7 +15825,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10788,20 +12715,17 @@
+@@ -10788,20 +12720,17 @@
dynamic_linker=no
;;
@@ -15784,7 +15857,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10819,14 +12743,19 @@
+@@ -10819,14 +12748,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15806,7 +15879,7 @@
esac
;;
-@@ -10846,9 +12775,9 @@
+@@ -10846,9 +12780,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15818,7 +15891,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10863,7 +12792,7 @@
+@@ -10863,7 +12797,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15827,7 +15900,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10874,7 +12803,7 @@
+@@ -10874,7 +12808,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15836,7 +15909,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10886,6 +12815,18 @@
+@@ -10886,6 +12820,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15855,7 +15928,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10929,29 +12870,26 @@
+@@ -10929,29 +12875,26 @@
;;
# This must be Linux ELF.
@@ -15892,7 +15965,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10961,6 +12899,18 @@
+@@ -10961,6 +12904,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15911,7 +15984,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10970,7 +12920,7 @@
+@@ -10970,7 +12925,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15920,7 +15993,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10998,8 +12948,13 @@
+@@ -10998,8 +12953,13 @@
openbsd*)
version_type=sunos
@@ -15935,7 +16008,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -11019,7 +12974,7 @@
+@@ -11019,7 +12979,7 @@
os2*)
libname_spec='$name'
@@ -15944,7 +16017,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11037,13 +12992,6 @@
+@@ -11037,13 +12997,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15958,7 +16031,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11069,7 +13017,7 @@
+@@ -11069,7 +13022,7 @@
need_version=yes
;;
@@ -15967,7 +16040,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11102,6 +13050,29 @@
+@@ -11102,6 +13055,29 @@
fi
;;
@@ -15997,7 +16070,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11113,16 +13084,21 @@
+@@ -11113,16 +13089,21 @@
dynamic_linker=no
;;
esac
@@ -16025,7 +16098,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11142,8 +13118,8 @@
+@@ -11142,8 +13123,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16036,7 +16109,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11156,29 +13132,29 @@
+@@ -11156,29 +13137,29 @@
striplib=
old_striplib=
@@ -16076,7 +16149,7 @@
;;
esac
fi
-@@ -11210,8 +13186,8 @@
+@@ -11210,8 +13191,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16087,7 +16160,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11224,40 +13200,52 @@
+@@ -11224,40 +13205,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16152,15 +16225,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11266,14 +13254,15 @@
+@@ -11266,14 +13259,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16171,7 +16245,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11287,8 +13276,8 @@
+@@ -11287,8 +13281,8 @@
;;
*)
@@ -16182,7 +16256,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11315,53 +13304,59 @@
+@@ -11315,53 +13309,59 @@
#undef shl_load
@@ -16261,15 +16335,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11370,18 +13365,19 @@
+@@ -11370,18 +13370,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16286,7 +16361,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11394,40 +13390,52 @@
+@@ -11394,40 +13395,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16351,15 +16426,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11436,19 +13444,20 @@
+@@ -11436,19 +13449,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16377,7 +16453,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11475,53 +13484,59 @@
+@@ -11475,53 +13489,59 @@
#undef dlopen
@@ -16456,15 +16532,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11530,18 +13545,19 @@
+@@ -11530,18 +13550,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16481,7 +16558,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11554,40 +13570,52 @@
+@@ -11554,40 +13575,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16546,15 +16623,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11596,19 +13624,20 @@
+@@ -11596,19 +13629,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16572,7 +16650,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11621,40 +13650,52 @@
+@@ -11621,40 +13655,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16637,15 +16715,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11663,19 +13704,20 @@
+@@ -11663,19 +13709,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16663,7 +16742,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11688,40 +13730,52 @@
+@@ -11688,40 +13735,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16728,15 +16807,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11730,14 +13784,15 @@
+@@ -11730,14 +13789,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16747,7 +16827,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11772,13 +13827,13 @@
+@@ -11772,13 +13832,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16764,16 +16844,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11788,7 +13843,7 @@
+@@ -11788,7 +13848,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11791 "configure"
-+#line 13846 "configure"
++#line 13851 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11845,6 +13900,8 @@
+@@ -11845,6 +13905,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16782,7 +16862,7 @@
exit (status);
}
-@@ -11854,12 +13911,12 @@
+@@ -11854,12 +13916,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16797,7 +16877,7 @@
esac
else :
# compilation failed
-@@ -11870,13 +13927,13 @@
+@@ -11870,13 +13932,13 @@
fi
@@ -16816,16 +16896,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11886,7 +13943,7 @@
+@@ -11886,7 +13948,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11889 "configure"
-+#line 13946 "configure"
++#line 13951 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11943,6 +14000,8 @@
+@@ -11943,6 +14005,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16834,7 +16914,7 @@
exit (status);
}
-@@ -11952,12 +14011,12 @@
+@@ -11952,12 +14016,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16849,7 +16929,7 @@
esac
else :
# compilation failed
-@@ -11968,8 +14027,8 @@
+@@ -11968,8 +14032,8 @@
fi
@@ -16860,7 +16940,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11990,19 +14049,19 @@
+@@ -11990,19 +14054,19 @@
fi
@@ -16888,7 +16968,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12011,58 +14070,21 @@
+@@ -12011,58 +14075,21 @@
fi
;;
@@ -16954,7 +17034,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12077,7 +14099,8 @@
+@@ -12077,7 +14104,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.
@@ -16964,7 +17044,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12191,11 +14214,11 @@
+@@ -12191,11 +14219,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16978,7 +17058,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12225,6 +14248,12 @@
+@@ -12225,6 +14253,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16991,7 +17071,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12236,6 +14265,9 @@
+@@ -12236,6 +14270,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17001,7 +17081,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12255,7 +14287,7 @@
+@@ -12255,7 +14292,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17010,7 +17090,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12286,7 +14318,7 @@
+@@ -12286,7 +14323,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17019,7 +17099,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12301,7 +14333,7 @@
+@@ -12301,7 +14338,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17028,7 +17108,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12528,7 +14560,10 @@
+@@ -12528,7 +14565,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.
@@ -17040,7 +17120,7 @@
fi
-@@ -12541,11 +14576,11 @@
+@@ -12541,11 +14581,11 @@
CC="$lt_save_CC"
@@ -17056,7 +17136,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12563,6 +14598,9 @@
+@@ -12563,6 +14603,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17066,7 +17146,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12593,8 +14631,10 @@
+@@ -12593,8 +14636,10 @@
case $tagname in
CXX)
@@ -17079,7 +17159,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12613,6 +14653,7 @@
+@@ -12613,6 +14658,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17087,7 +17167,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12630,7 +14671,7 @@
+@@ -12630,7 +14676,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17096,7 +17176,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12640,17 +14681,34 @@
+@@ -12640,17 +14686,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17132,7 +17212,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12661,18 +14719,27 @@
+@@ -12661,18 +14724,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17163,7 +17243,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12686,18 +14753,18 @@
+@@ -12686,18 +14758,18 @@
# Set up default GNU C++ configuration
@@ -17188,7 +17268,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12726,11 +14793,11 @@
+@@ -12726,11 +14798,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17204,7 +17284,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12743,7 +14810,7 @@
+@@ -12743,7 +14815,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,
@@ -17213,7 +17293,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12763,21 +14830,21 @@
+@@ -12763,21 +14835,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17242,7 +17322,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12787,8 +14854,8 @@
+@@ -12787,8 +14859,8 @@
;;
esac
fi
@@ -17253,7 +17333,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12796,8 +14863,8 @@
+@@ -12796,8 +14868,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
@@ -17264,7 +17344,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12823,7 +14890,7 @@
+@@ -12823,7 +14895,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.
@@ -17273,7 +17353,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12838,8 +14905,8 @@
+@@ -12838,8 +14910,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17284,7 +17364,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12854,8 +14921,23 @@
+@@ -12854,8 +14926,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17310,7 +17390,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12872,7 +14954,7 @@
+@@ -12872,7 +14959,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17319,7 +17399,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12891,8 +14973,12 @@
+@@ -12891,8 +14978,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17332,7 +17412,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12901,15 +14987,16 @@
+@@ -12901,15 +14992,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17353,7 +17433,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12931,24 +15018,36 @@
+@@ -12931,24 +15023,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17398,14 +17478,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12962,20 +15061,21 @@
+@@ -12962,20 +15066,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17423,7 +17504,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12994,24 +15094,36 @@
+@@ -12994,24 +15099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17468,17 +17549,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13025,7 +15137,9 @@
+@@ -13025,8 +15142,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13035,16 +15149,26 @@
+
+@@ -13035,16 +15154,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17510,7 +17593,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13058,12 +15182,12 @@
+@@ -13058,12 +15187,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'
@@ -17525,7 +17608,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13072,70 +15196,81 @@
+@@ -13072,70 +15201,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17659,7 +17742,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13146,14 +15281,14 @@
+@@ -13146,14 +15286,14 @@
;;
esac
;;
@@ -17676,7 +17759,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13170,12 +15305,12 @@
+@@ -13170,12 +15310,12 @@
# location of the library.
case $cc_basename in
@@ -17692,7 +17775,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13184,11 +15319,11 @@
+@@ -13184,11 +15324,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.
@@ -17706,7 +17789,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13198,33 +15333,22 @@
+@@ -13198,33 +15338,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17747,7 +17830,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13235,17 +15359,20 @@
+@@ -13235,17 +15364,20 @@
esac
case $cc_basename in
@@ -17774,7 +17857,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13261,12 +15388,15 @@
+@@ -13261,12 +15393,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17794,7 +17877,7 @@
;;
esac
fi
-@@ -13277,11 +15407,25 @@
+@@ -13277,11 +15412,25 @@
;;
esac
;;
@@ -17822,7 +17905,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13292,9 +15436,9 @@
+@@ -13292,9 +15441,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17834,7 +17917,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13303,16 +15447,16 @@
+@@ -13303,16 +15452,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17855,7 +17938,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13330,20 +15474,44 @@
+@@ -13330,20 +15479,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17906,7 +17989,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13371,7 +15539,7 @@
+@@ -13371,7 +15544,7 @@
;;
mvs*)
case $cc_basename in
@@ -17915,7 +17998,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13381,7 +15549,7 @@
+@@ -13381,7 +15554,7 @@
;;
esac
;;
@@ -17924,7 +18007,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13392,15 +15560,31 @@
+@@ -13392,15 +15565,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::"'
;;
@@ -17958,7 +18041,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13410,14 +15594,14 @@
+@@ -13410,14 +15599,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17976,7 +18059,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13435,7 +15619,7 @@
+@@ -13435,7 +15624,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17985,7 +18068,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13454,13 +15638,13 @@
+@@ -13454,13 +15643,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18001,7 +18084,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13469,17 +15653,17 @@
+@@ -13469,17 +15658,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18023,7 +18106,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13498,7 +15682,7 @@
+@@ -13498,7 +15687,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18032,7 +18115,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13519,27 +15703,14 @@
+@@ -13519,27 +15708,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18062,7 +18145,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13552,36 +15723,33 @@
+@@ -13552,36 +15728,33 @@
;;
solaris*)
case $cc_basename in
@@ -18111,7 +18194,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13589,9 +15757,9 @@
+@@ -13589,9 +15762,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18123,7 +18206,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13601,9 +15769,9 @@
+@@ -13601,9 +15774,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
@@ -18135,7 +18218,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13612,9 +15780,9 @@
+@@ -13612,9 +15785,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18147,7 +18230,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13627,12 +15795,63 @@
+@@ -13627,12 +15800,63 @@
;;
esac
;;
@@ -18213,7 +18296,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13652,8 +15871,8 @@
+@@ -13652,8 +15876,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18224,7 +18307,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13689,7 +15908,7 @@
+@@ -13689,7 +15913,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.
@@ -18233,7 +18316,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13729,7 +15948,7 @@
+@@ -13729,7 +15953,7 @@
fi
;;
@@ -18242,7 +18325,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13765,6 +15984,29 @@
+@@ -13765,6 +15989,29 @@
$rm -f confest.$objext
@@ -18272,7 +18355,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13773,8 +16015,8 @@
+@@ -13773,8 +16020,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18283,7 +18366,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13812,6 +16054,10 @@
+@@ -13812,6 +16059,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18294,7 +18377,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13820,7 +16066,7 @@
+@@ -13820,7 +16071,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18303,7 +18386,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13845,18 +16091,28 @@
+@@ -13845,18 +16096,28 @@
;;
chorus*)
case $cc_basename in
@@ -18335,7 +18418,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13864,22 +16120,22 @@
+@@ -13864,22 +16125,22 @@
;;
esac
;;
@@ -18364,7 +18447,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13892,9 +16148,13 @@
+@@ -13892,9 +16153,13 @@
;;
esac
;;
@@ -18379,7 +18462,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13903,20 +16163,26 @@
+@@ -13903,20 +16168,26 @@
;;
esac
;;
@@ -18410,7 +18493,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13933,25 +16199,25 @@
+@@ -13933,25 +16204,25 @@
;;
mvs*)
case $cc_basename in
@@ -18441,7 +18524,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13965,24 +16231,15 @@
+@@ -13965,24 +16236,15 @@
;;
psos*)
;;
@@ -18468,7 +18551,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13992,12 +16249,12 @@
+@@ -13992,12 +16254,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18483,7 +18566,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14007,7 +16264,7 @@
+@@ -14007,7 +16269,7 @@
;;
tandem*)
case $cc_basename in
@@ -18492,7 +18575,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14015,7 +16272,14 @@
+@@ -14015,7 +16277,14 @@
;;
esac
;;
@@ -18508,7 +18591,7 @@
;;
vxworks*)
;;
-@@ -14025,16 +16289,16 @@
+@@ -14025,16 +16294,16 @@
esac
fi
@@ -18529,7 +18612,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14048,26 +16312,28 @@
+@@ -14048,26 +16317,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 \
@@ -18538,12 +18621,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14054: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16318: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14058: \$? = $ac_status" >&5
-+ echo "$as_me:16322: \$? = $ac_status" >&5
++ echo "$as_me:16327: \$? = $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
@@ -18565,7 +18648,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14080,7 +16346,7 @@
+@@ -14080,7 +16351,7 @@
fi
fi
@@ -18574,7 +18657,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14090,8 +16356,50 @@
+@@ -14090,8 +16361,50 @@
;;
esac
@@ -18627,7 +18710,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14102,60 +16410,58 @@
+@@ -14102,60 +16415,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18649,12 +18732,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16422: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16427: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14125: \$? = $ac_status" >&5
-+ echo "$as_me:16426: \$? = $ac_status" >&5
++ echo "$as_me:16431: \$? = $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
@@ -18706,7 +18789,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14165,8 +16471,8 @@
+@@ -14165,8 +16476,8 @@
need_locks=no
fi
@@ -18717,7 +18800,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14183,22 +16489,20 @@
+@@ -14183,22 +16494,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18746,7 +18829,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14216,8 +16520,8 @@
+@@ -14216,8 +16525,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.
@@ -18757,7 +18840,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14231,6 +16535,7 @@
+@@ -14231,6 +16540,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18765,7 +18848,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14253,20 +16558,20 @@
+@@ -14253,20 +16563,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18791,7 +18874,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14276,7 +16581,20 @@
+@@ -14276,7 +16586,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18813,7 +18896,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14341,7 +16659,7 @@
+@@ -14341,7 +16664,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18822,7 +18905,7 @@
;;
beos*)
-@@ -14350,7 +16668,7 @@
+@@ -14350,7 +16673,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18831,7 +18914,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14366,7 +16684,7 @@
+@@ -14366,7 +16689,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18840,7 +18923,7 @@
need_version=no
need_lib_prefix=no
-@@ -14378,7 +16696,8 @@
+@@ -14378,7 +16701,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18850,7 +18933,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14408,7 +16727,7 @@
+@@ -14408,7 +16732,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18859,7 +18942,7 @@
;;
esac
;;
-@@ -14431,7 +16750,7 @@
+@@ -14431,7 +16755,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18868,7 +18951,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14454,20 +16773,17 @@
+@@ -14454,20 +16778,17 @@
dynamic_linker=no
;;
@@ -18900,7 +18983,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14485,14 +16801,19 @@
+@@ -14485,14 +16806,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18922,7 +19005,7 @@
esac
;;
-@@ -14512,9 +16833,9 @@
+@@ -14512,9 +16838,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18934,7 +19017,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14529,7 +16850,7 @@
+@@ -14529,7 +16855,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18943,7 +19026,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14540,7 +16861,7 @@
+@@ -14540,7 +16866,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18952,7 +19035,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14552,6 +16873,18 @@
+@@ -14552,6 +16878,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18971,7 +19054,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14595,29 +16928,26 @@
+@@ -14595,29 +16933,26 @@
;;
# This must be Linux ELF.
@@ -19008,14 +19091,22 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14627,6 +16957,18 @@
+@@ -14627,16 +16962,28 @@
dynamic_linker='GNU/Linux ld.so'
;;
+-netbsd*)
+- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
+ need_lib_prefix=no
+ need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
@@ -19024,19 +19115,20 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -14636,7 +16978,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}'
++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
-@@ -14664,8 +17006,13 @@
+@@ -14664,8 +17011,13 @@
openbsd*)
version_type=sunos
@@ -19051,7 +19143,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14685,7 +17032,7 @@
+@@ -14685,7 +17037,7 @@
os2*)
libname_spec='$name'
@@ -19060,7 +19152,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14703,13 +17050,6 @@
+@@ -14703,13 +17055,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19074,7 +19166,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14735,7 +17075,7 @@
+@@ -14735,7 +17080,7 @@
need_version=yes
;;
@@ -19083,7 +19175,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14768,6 +17108,29 @@
+@@ -14768,6 +17113,29 @@
fi
;;
@@ -19113,7 +19205,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14779,16 +17142,21 @@
+@@ -14779,16 +17147,21 @@
dynamic_linker=no
;;
esac
@@ -19141,7 +19233,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14808,8 +17176,8 @@
+@@ -14808,8 +17181,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19152,7 +19244,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14820,998 +17188,173 @@
+@@ -14820,998 +17193,173 @@
enable_fast_install=needless
fi
@@ -20290,7 +20382,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -15830,7 +17373,7 @@
+@@ -15830,7 +17378,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20299,7 +20391,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15845,7 +17388,7 @@
+@@ -15845,7 +17393,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -20308,7 +20400,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16047,7 +17590,10 @@
+@@ -16047,7 +17595,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.
@@ -20320,7 +20412,7 @@
fi
-@@ -16119,29 +17665,55 @@
+@@ -16119,29 +17670,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20360,19 +20452,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-+
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -20384,18 +20476,17 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16149,21 +17721,21 @@
+@@ -16149,21 +17726,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
- test "$enable_shared" = yes && enable_static=no
-- ;;
+aix4* | aix5*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
-+ ;;
+ ;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
@@ -20417,7 +20508,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16172,8 +17744,8 @@
+@@ -16172,8 +17749,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20428,7 +20519,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16211,6 +17783,11 @@
+@@ -16211,6 +17788,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20440,7 +20531,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16227,7 +17804,7 @@
+@@ -16227,7 +17809,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20449,7 +20540,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16253,6 +17830,16 @@
+@@ -16253,6 +17835,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20466,7 +20557,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16264,7 +17851,7 @@
+@@ -16264,7 +17856,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.
@@ -20475,7 +20566,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16287,13 +17874,20 @@
+@@ -16287,13 +17879,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20498,7 +20589,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16308,15 +17902,15 @@
+@@ -16308,15 +17907,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20520,7 +20611,7 @@
;;
sunos4*)
-@@ -16325,7 +17919,7 @@
+@@ -16325,7 +17924,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20529,7 +20620,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16338,6 +17932,17 @@
+@@ -16338,6 +17937,17 @@
fi
;;
@@ -20547,7 +20638,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16349,16 +17954,16 @@
+@@ -16349,16 +17959,16 @@
esac
fi
@@ -20568,7 +20659,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16372,26 +17977,28 @@
+@@ -16372,26 +17982,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 \
@@ -20577,12 +20668,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16378: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17983: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17988: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16382: \$? = $ac_status" >&5
-+ echo "$as_me:17987: \$? = $ac_status" >&5
++ echo "$as_me:17992: \$? = $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
@@ -20604,7 +20695,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16404,7 +18011,7 @@
+@@ -16404,7 +18016,7 @@
fi
fi
@@ -20613,7 +20704,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16414,8 +18021,50 @@
+@@ -16414,8 +18026,50 @@
;;
esac
@@ -20666,7 +20757,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16426,60 +18075,58 @@
+@@ -16426,60 +18080,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20688,12 +20779,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16445: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18087: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18092: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16449: \$? = $ac_status" >&5
-+ echo "$as_me:18091: \$? = $ac_status" >&5
++ echo "$as_me:18096: \$? = $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
@@ -20745,7 +20836,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16489,8 +18136,8 @@
+@@ -16489,8 +18141,8 @@
need_locks=no
fi
@@ -20756,7 +20847,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16528,6 +18175,16 @@
+@@ -16528,6 +18180,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20773,7 +20864,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16538,6 +18195,10 @@
+@@ -16538,6 +18200,10 @@
with_gnu_ld=no
fi
;;
@@ -20784,7 +20875,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16548,6 +18209,27 @@
+@@ -16548,6 +18214,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20812,7 +20903,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16585,7 +18267,7 @@
+@@ -16585,7 +18272,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20821,7 +20912,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16595,13 +18277,13 @@
+@@ -16595,13 +18282,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'
@@ -20838,7 +20929,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16610,23 +18292,70 @@
+@@ -16610,23 +18297,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20915,7 +21006,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16640,13 +18369,40 @@
+@@ -16640,13 +18374,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20958,7 +21049,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16656,24 +18412,19 @@
+@@ -16656,24 +18417,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20990,7 +21081,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16685,7 +18436,7 @@
+@@ -16685,7 +18441,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -20999,7 +21090,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16707,9 +18458,21 @@
+@@ -16707,9 +18463,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
@@ -21023,7 +21114,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16726,7 +18489,7 @@
+@@ -16726,7 +18494,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21032,7 +21123,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16745,8 +18508,12 @@
+@@ -16745,8 +18513,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21045,7 +21136,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16754,45 +18521,58 @@
+@@ -16754,45 +18526,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21119,14 +21210,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16806,19 +18586,20 @@
+@@ -16806,19 +18591,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -21144,7 +21236,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16827,24 +18608,36 @@
+@@ -16827,24 +18613,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21189,17 +21281,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16858,7 +18651,9 @@
+@@ -16858,8 +18656,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16868,13 +18663,11 @@
+
+@@ -16868,13 +18668,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21216,7 +21310,7 @@
fi
fi
;;
-@@ -16887,7 +18680,7 @@
+@@ -16887,7 +18685,7 @@
ld_shlibs_F77=no
;;
@@ -21225,7 +21319,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16897,68 +18690,68 @@
+@@ -16897,68 +18695,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21338,7 +21432,7 @@
fi
;;
-@@ -16992,8 +18785,8 @@
+@@ -16992,8 +18790,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21349,7 +21443,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17001,7 +18794,7 @@
+@@ -17001,7 +18799,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21358,7 +21452,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -17015,47 +18808,62 @@
+@@ -17015,47 +18813,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21445,7 +21539,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17069,7 +18877,7 @@
+@@ -17069,7 +18882,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21454,7 +21548,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17079,7 +18887,7 @@
+@@ -17079,7 +18892,7 @@
link_all_deplibs_F77=yes
;;
@@ -21463,7 +21557,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17102,7 +18910,8 @@
+@@ -17102,7 +18915,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
@@ -21473,7 +21567,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17112,7 +18921,7 @@
+@@ -17112,7 +18926,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21482,7 +21576,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17123,14 +18932,14 @@
+@@ -17123,14 +18937,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21499,7 +21593,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17142,13 +18951,13 @@
+@@ -17142,13 +18956,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21515,7 +21609,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17156,21 +18965,15 @@
+@@ -17156,21 +18970,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21541,7 +21635,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17179,8 +18982,18 @@
+@@ -17179,8 +18987,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21562,7 +21656,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17189,7 +19002,7 @@
+@@ -17189,7 +19007,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.
@@ -21571,7 +21665,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17237,36 +19050,45 @@
+@@ -17237,36 +19055,45 @@
fi
;;
@@ -21638,7 +21732,7 @@
;;
uts4*)
-@@ -17281,15 +19103,10 @@
+@@ -17281,15 +19108,10 @@
esac
fi
@@ -21656,7 +21750,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17307,8 +19124,8 @@
+@@ -17307,8 +19129,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.
@@ -21667,7 +21761,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17322,6 +19139,7 @@
+@@ -17322,6 +19144,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21675,7 +21769,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17344,20 +19162,20 @@
+@@ -17344,20 +19167,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21701,7 +21795,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17367,7 +19185,20 @@
+@@ -17367,7 +19190,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21723,7 +21817,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17432,7 +19263,7 @@
+@@ -17432,7 +19268,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21732,7 +21826,7 @@
;;
beos*)
-@@ -17441,7 +19272,7 @@
+@@ -17441,7 +19277,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21741,7 +21835,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17457,7 +19288,7 @@
+@@ -17457,7 +19293,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21750,7 +21844,7 @@
need_version=no
need_lib_prefix=no
-@@ -17469,7 +19300,8 @@
+@@ -17469,7 +19305,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21760,7 +21854,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17499,7 +19331,7 @@
+@@ -17499,7 +19336,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21769,7 +21863,7 @@
;;
esac
;;
-@@ -17522,7 +19354,7 @@
+@@ -17522,7 +19359,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21778,7 +21872,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17545,20 +19377,17 @@
+@@ -17545,20 +19382,17 @@
dynamic_linker=no
;;
@@ -21810,7 +21904,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17576,14 +19405,19 @@
+@@ -17576,14 +19410,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21832,7 +21926,7 @@
esac
;;
-@@ -17603,9 +19437,9 @@
+@@ -17603,9 +19442,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21844,7 +21938,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17620,7 +19454,7 @@
+@@ -17620,7 +19459,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21853,7 +21947,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17631,7 +19465,7 @@
+@@ -17631,7 +19470,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21862,7 +21956,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17643,6 +19477,18 @@
+@@ -17643,6 +19482,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21881,7 +21975,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17686,29 +19532,26 @@
+@@ -17686,29 +19537,26 @@
;;
# This must be Linux ELF.
@@ -21918,7 +22012,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17718,6 +19561,18 @@
+@@ -17718,6 +19566,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21937,7 +22031,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17727,7 +19582,7 @@
+@@ -17727,7 +19587,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21946,7 +22040,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17755,8 +19610,13 @@
+@@ -17755,8 +19615,13 @@
openbsd*)
version_type=sunos
@@ -21961,7 +22055,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17776,7 +19636,7 @@
+@@ -17776,7 +19641,7 @@
os2*)
libname_spec='$name'
@@ -21970,7 +22064,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17794,13 +19654,6 @@
+@@ -17794,13 +19659,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21984,7 +22078,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17826,7 +19679,7 @@
+@@ -17826,7 +19684,7 @@
need_version=yes
;;
@@ -21993,7 +22087,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17859,6 +19712,29 @@
+@@ -17859,6 +19717,29 @@
fi
;;
@@ -22023,7 +22117,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17870,16 +19746,21 @@
+@@ -17870,16 +19751,21 @@
dynamic_linker=no
;;
esac
@@ -22051,7 +22145,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17899,8 +19780,8 @@
+@@ -17899,8 +19785,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22062,7 +22156,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17911,36 +19792,6 @@
+@@ -17911,36 +19797,6 @@
enable_fast_install=needless
fi
@@ -22099,7 +22193,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17955,7 +19806,8 @@
+@@ -17955,7 +19811,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.
@@ -22109,7 +22203,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18055,6 +19907,12 @@
+@@ -18055,6 +19912,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22122,7 +22216,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18066,6 +19924,9 @@
+@@ -18066,6 +19929,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22132,7 +22226,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18085,7 +19946,7 @@
+@@ -18085,7 +19951,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22141,7 +22235,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18116,7 +19977,7 @@
+@@ -18116,7 +19982,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22150,7 +22244,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18131,7 +19992,7 @@
+@@ -18131,7 +19997,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22159,7 +22253,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18333,7 +20194,10 @@
+@@ -18333,7 +20199,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.
@@ -22171,7 +22265,7 @@
fi
-@@ -18354,7 +20218,6 @@
+@@ -18354,7 +20223,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22179,7 +22273,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18366,26 +20229,55 @@
+@@ -18366,26 +20234,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22236,7 +22330,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18397,8 +20289,8 @@
+@@ -18397,8 +20294,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22247,7 +22341,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18412,26 +20304,28 @@
+@@ -18412,26 +20309,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 \
@@ -22256,12 +22350,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20310: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18422: \$? = $ac_status" >&5
-+ echo "$as_me:20314: \$? = $ac_status" >&5
++ echo "$as_me:20319: \$? = $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
@@ -22283,7 +22377,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18445,8 +20339,8 @@
+@@ -18445,8 +20344,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22294,7 +22388,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18484,6 +20378,11 @@
+@@ -18484,6 +20383,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22306,7 +22400,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18500,7 +20399,7 @@
+@@ -18500,7 +20404,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22315,7 +22409,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18526,6 +20425,16 @@
+@@ -18526,6 +20430,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22332,7 +22426,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18537,7 +20446,7 @@
+@@ -18537,7 +20451,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.
@@ -22341,7 +22435,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18560,13 +20469,20 @@
+@@ -18560,13 +20474,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22364,7 +22458,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18581,15 +20497,15 @@
+@@ -18581,15 +20502,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22386,7 +22480,7 @@
;;
sunos4*)
-@@ -18598,7 +20514,7 @@
+@@ -18598,7 +20519,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22395,7 +22489,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18611,6 +20527,17 @@
+@@ -18611,6 +20532,17 @@
fi
;;
@@ -22413,7 +22507,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18622,16 +20549,16 @@
+@@ -18622,16 +20554,16 @@
esac
fi
@@ -22434,7 +22528,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18645,26 +20572,28 @@
+@@ -18645,26 +20577,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 \
@@ -22443,12 +22537,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18651: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20578: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20583: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18655: \$? = $ac_status" >&5
-+ echo "$as_me:20582: \$? = $ac_status" >&5
++ echo "$as_me:20587: \$? = $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
@@ -22470,7 +22564,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18677,7 +20606,7 @@
+@@ -18677,7 +20611,7 @@
fi
fi
@@ -22479,7 +22573,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18687,8 +20616,50 @@
+@@ -18687,8 +20621,50 @@
;;
esac
@@ -22532,7 +22626,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18699,60 +20670,58 @@
+@@ -18699,60 +20675,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22554,12 +22648,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18718: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20682: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20687: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18722: \$? = $ac_status" >&5
-+ echo "$as_me:20686: \$? = $ac_status" >&5
++ echo "$as_me:20691: \$? = $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
@@ -22611,7 +22705,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18762,8 +20731,8 @@
+@@ -18762,8 +20736,8 @@
need_locks=no
fi
@@ -22622,7 +22716,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18801,6 +20770,16 @@
+@@ -18801,6 +20775,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22639,7 +22733,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18811,6 +20790,10 @@
+@@ -18811,6 +20795,10 @@
with_gnu_ld=no
fi
;;
@@ -22650,7 +22744,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18821,6 +20804,27 @@
+@@ -18821,6 +20809,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22678,7 +22772,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18858,7 +20862,7 @@
+@@ -18858,7 +20867,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22687,7 +22781,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18868,13 +20872,13 @@
+@@ -18868,13 +20877,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'
@@ -22704,7 +22798,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18883,23 +20887,70 @@
+@@ -18883,23 +20892,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22781,7 +22875,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18913,13 +20964,40 @@
+@@ -18913,13 +20969,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22824,7 +22918,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18929,24 +21007,19 @@
+@@ -18929,24 +21012,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22856,7 +22950,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18958,7 +21031,7 @@
+@@ -18958,7 +21036,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22865,7 +22959,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18980,9 +21053,21 @@
+@@ -18980,9 +21058,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
@@ -22889,7 +22983,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18999,7 +21084,7 @@
+@@ -18999,7 +21089,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22898,7 +22992,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -19018,8 +21103,12 @@
+@@ -19018,8 +21108,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22911,7 +23005,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19027,22 +21116,23 @@
+@@ -19027,22 +21121,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22942,7 +23036,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19058,24 +21148,36 @@
+@@ -19058,24 +21153,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22987,14 +23081,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19089,19 +21191,20 @@
+@@ -19089,19 +21196,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23012,7 +23107,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19120,24 +21223,36 @@
+@@ -19120,24 +21228,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23057,17 +23152,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19151,7 +21266,9 @@
+@@ -19151,8 +21271,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19161,13 +21278,11 @@
+
+@@ -19161,13 +21283,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23084,7 +23181,7 @@
fi
fi
;;
-@@ -19180,7 +21295,7 @@
+@@ -19180,7 +21300,7 @@
ld_shlibs_GCJ=no
;;
@@ -23093,7 +23190,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19190,68 +21305,68 @@
+@@ -19190,68 +21310,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23206,7 +23303,7 @@
fi
;;
-@@ -19285,8 +21400,8 @@
+@@ -19285,8 +21405,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23217,7 +23314,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19294,7 +21409,7 @@
+@@ -19294,7 +21414,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23226,7 +23323,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19308,47 +21423,62 @@
+@@ -19308,47 +21428,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23295,25 +23392,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- ;;
+- ;;
*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19362,7 +21492,7 @@
+@@ -19362,7 +21497,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23322,7 +23419,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19372,7 +21502,7 @@
+@@ -19372,7 +21507,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23331,7 +23428,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19395,7 +21525,8 @@
+@@ -19395,7 +21530,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
@@ -23341,7 +23438,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19405,7 +21536,7 @@
+@@ -19405,7 +21541,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23350,7 +23447,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19416,14 +21547,14 @@
+@@ -19416,14 +21552,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23367,7 +23464,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19435,13 +21566,13 @@
+@@ -19435,13 +21571,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23383,7 +23480,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19449,21 +21580,15 @@
+@@ -19449,21 +21585,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23409,7 +23506,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19472,8 +21597,18 @@
+@@ -19472,8 +21602,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23430,7 +23527,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19482,7 +21617,7 @@
+@@ -19482,7 +21622,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.
@@ -23439,7 +23536,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19530,36 +21665,45 @@
+@@ -19530,36 +21670,45 @@
fi
;;
@@ -23506,7 +23603,7 @@
;;
uts4*)
-@@ -19574,15 +21718,10 @@
+@@ -19574,15 +21723,10 @@
esac
fi
@@ -23524,7 +23621,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19600,8 +21739,8 @@
+@@ -19600,8 +21744,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.
@@ -23535,7 +23632,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19615,6 +21754,7 @@
+@@ -19615,6 +21759,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23543,7 +23640,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19637,20 +21777,20 @@
+@@ -19637,20 +21782,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23569,7 +23666,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19660,7 +21800,20 @@
+@@ -19660,7 +21805,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23591,7 +23688,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19725,7 +21878,7 @@
+@@ -19725,7 +21883,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23600,7 +23697,7 @@
;;
beos*)
-@@ -19734,7 +21887,7 @@
+@@ -19734,7 +21892,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23609,7 +23706,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19750,7 +21903,7 @@
+@@ -19750,7 +21908,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23618,7 +23715,7 @@
need_version=no
need_lib_prefix=no
-@@ -19762,7 +21915,8 @@
+@@ -19762,7 +21920,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23628,7 +23725,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19792,7 +21946,7 @@
+@@ -19792,7 +21951,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23637,7 +23734,7 @@
;;
esac
;;
-@@ -19815,7 +21969,7 @@
+@@ -19815,7 +21974,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23646,7 +23743,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19838,20 +21992,17 @@
+@@ -19838,20 +21997,17 @@
dynamic_linker=no
;;
@@ -23678,7 +23775,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19869,14 +22020,19 @@
+@@ -19869,14 +22025,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23700,7 +23797,7 @@
esac
;;
-@@ -19896,9 +22052,9 @@
+@@ -19896,9 +22057,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23712,7 +23809,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19913,7 +22069,7 @@
+@@ -19913,7 +22074,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -23721,7 +23818,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19924,7 +22080,7 @@
+@@ -19924,7 +22085,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -23730,7 +23827,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19936,6 +22092,18 @@
+@@ -19936,6 +22097,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -23749,7 +23846,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -19979,29 +22147,26 @@
+@@ -19979,29 +22152,26 @@
;;
# This must be Linux ELF.
@@ -23786,7 +23883,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,
-@@ -20011,6 +22176,18 @@
+@@ -20011,6 +22181,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -23805,7 +23902,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20020,7 +22197,7 @@
+@@ -20020,7 +22202,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -23814,7 +23911,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -20048,8 +22225,13 @@
+@@ -20048,8 +22230,13 @@
openbsd*)
version_type=sunos
@@ -23829,7 +23926,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
-@@ -20069,7 +22251,7 @@
+@@ -20069,7 +22256,7 @@
os2*)
libname_spec='$name'
@@ -23838,7 +23935,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20087,13 +22269,6 @@
+@@ -20087,13 +22274,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -23852,7 +23949,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20119,7 +22294,7 @@
+@@ -20119,7 +22299,7 @@
need_version=yes
;;
@@ -23861,7 +23958,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'
-@@ -20152,6 +22327,29 @@
+@@ -20152,6 +22332,29 @@
fi
;;
@@ -23891,7 +23988,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -20163,16 +22361,21 @@
+@@ -20163,16 +22366,21 @@
dynamic_linker=no
;;
esac
@@ -23919,18 +24016,17 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20189,854 +22392,19 @@
- fi
- else
- # We cannot hardcode anything, or else we can only hardcode existing
-- # directories.
-- hardcode_action_GCJ=unsupported
--fi
+@@ -20192,851 +22400,16 @@
+ # directories.
+ hardcode_action_GCJ=unsupported
+ fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
--
--if test "$hardcode_action_GCJ" = relink; then
-- # Fast installation is not supported
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+
+ if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
@@ -24766,18 +24862,11 @@
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+ # directories.
-+ hardcode_action_GCJ=unsupported
-+fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
+-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-+if test "$hardcode_action_GCJ" = relink; then
-+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
@@ -24786,7 +24875,7 @@
fi
-@@ -21053,7 +22421,8 @@
+@@ -21053,7 +22426,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.
@@ -24796,7 +24885,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21153,6 +22522,12 @@
+@@ -21153,6 +22527,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24809,7 +24898,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21164,6 +22539,9 @@
+@@ -21164,6 +22544,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24819,7 +24908,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21183,7 +22561,7 @@
+@@ -21183,7 +22566,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24828,7 +24917,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21214,7 +22592,7 @@
+@@ -21214,7 +22597,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24837,7 +24926,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21229,7 +22607,7 @@
+@@ -21229,7 +22612,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24846,7 +24935,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21431,7 +22809,10 @@
+@@ -21431,7 +22814,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.
@@ -24858,7 +24947,7 @@
fi
-@@ -21451,7 +22832,6 @@
+@@ -21451,7 +22837,6 @@
RC)
@@ -24866,7 +24955,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21470,15 +22850,42 @@
+@@ -21470,15 +22855,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -24909,7 +24998,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21494,7 +22901,8 @@
+@@ -21494,7 +22906,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.
@@ -24919,7 +25008,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21594,6 +23002,12 @@
+@@ -21594,6 +23007,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24932,7 +25021,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21605,6 +23019,9 @@
+@@ -21605,6 +23024,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24942,7 +25031,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21624,7 +23041,7 @@
+@@ -21624,7 +23046,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24951,7 +25040,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21655,7 +23072,7 @@
+@@ -21655,7 +23077,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24960,7 +25049,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21670,7 +23087,7 @@
+@@ -21670,7 +23092,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -24969,7 +25058,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21872,7 +23289,10 @@
+@@ -21872,7 +23294,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.
@@ -24981,7 +25070,7 @@
fi
-@@ -21919,7 +23339,7 @@
+@@ -21919,7 +23344,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -24990,7 +25079,7 @@
# Prevent multiple expansion
-@@ -21974,8 +23394,8 @@
+@@ -21974,8 +23399,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25001,7 +25090,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22001,17 +23421,17 @@
+@@ -22001,17 +23426,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -25025,7 +25114,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22026,32 +23446,33 @@
+@@ -22026,32 +23451,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25067,7 +25156,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22060,8 +23481,8 @@
+@@ -22060,8 +23486,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -25078,7 +25167,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22087,11 +23508,11 @@
+@@ -22087,11 +23513,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -25094,7 +25183,7 @@
fi
-@@ -22099,8 +23520,8 @@
+@@ -22099,8 +23525,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25105,7 +25194,7 @@
XGETTEXT=":"
fi
fi
-@@ -22110,8 +23531,7 @@
+@@ -22110,8 +23536,7 @@
@@ -25115,7 +25204,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22123,8 +23543,8 @@
+@@ -22123,8 +23548,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25126,7 +25215,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22152,24 +23572,36 @@
+@@ -22152,24 +23577,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25171,15 +25260,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22178,15 +23610,16 @@
+@@ -22178,15 +23615,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_stl_works=no
+ kde_cv_stl_works=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -25191,7 +25281,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22215,15 +23648,14 @@
+@@ -22215,15 +23653,14 @@
@@ -25210,7 +25300,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22235,9 +23667,6 @@
+@@ -22235,9 +23672,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25220,7 +25310,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22263,24 +23692,36 @@
+@@ -22263,24 +23697,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25265,18 +25355,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22289,8 +23730,9 @@
+@@ -22289,9 +23735,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcat=no
+ kde_cv_func_strlcat=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22304,11 +23746,11 @@
+ ac_ext=c
+@@ -22304,11 +23751,11 @@
fi
@@ -25292,7 +25384,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22329,8 +23771,7 @@
+@@ -22329,8 +23776,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -25302,7 +25394,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22368,24 +23809,36 @@
+@@ -22368,24 +23814,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25347,7 +25439,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22395,9 +23848,10 @@
+@@ -22395,10 +23853,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25355,11 +25447,13 @@
+ kde_cv_proto_strlcat="strlcat unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22411,8 +23865,8 @@
+ ac_ext=c
+@@ -22411,8 +23870,8 @@
fi
@@ -25370,7 +25464,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22436,15 +23890,14 @@
+@@ -22436,15 +23895,14 @@
@@ -25389,7 +25483,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22456,9 +23909,6 @@
+@@ -22456,9 +23914,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25399,7 +25493,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22483,24 +23933,36 @@
+@@ -22483,24 +23938,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25444,18 +25538,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22509,8 +23971,9 @@
+@@ -22509,9 +23976,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcpy=no
+ kde_cv_func_strlcpy=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22524,11 +23987,11 @@
+ ac_ext=c
+@@ -22524,11 +23992,11 @@
fi
@@ -25471,7 +25567,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22549,8 +24012,7 @@
+@@ -22549,8 +24017,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -25481,7 +25577,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22587,24 +24049,36 @@
+@@ -22587,24 +24054,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25526,7 +25622,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22614,9 +24088,10 @@
+@@ -22614,10 +24093,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25534,11 +25630,13 @@
+ kde_cv_proto_strlcpy="strlcpy unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22630,8 +24105,8 @@
+ ac_ext=c
+@@ -22630,8 +24110,8 @@
fi
@@ -25549,7 +25647,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22654,8 +24129,8 @@
+@@ -22654,8 +24134,8 @@
@@ -25560,7 +25658,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22672,30 +24147,42 @@
+@@ -22672,30 +24152,42 @@
int
main ()
{
@@ -25612,15 +25710,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22704,20 +24191,21 @@
+@@ -22704,20 +24196,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_util_main=no
+ ac_cv_lib_util_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25639,7 +25738,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22734,30 +24222,42 @@
+@@ -22734,30 +24227,42 @@
int
main ()
{
@@ -25691,15 +25790,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22766,21 +24266,22 @@
+@@ -22766,21 +24271,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
+ ac_cv_lib_compat_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25719,7 +25819,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22793,40 +24294,52 @@
+@@ -22793,40 +24299,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25784,15 +25884,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22835,19 +24348,20 @@
+@@ -22835,19 +24353,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
+ ac_cv_lib_crypt_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25810,7 +25911,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22860,40 +24374,52 @@
+@@ -22860,40 +24379,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25875,15 +25976,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22902,14 +24428,15 @@
+@@ -22902,14 +24433,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_crypt=no
+ ac_cv_lib_c_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25894,7 +25996,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22935,13 +24462,13 @@
+@@ -22935,13 +24467,13 @@
fi
@@ -25911,7 +26013,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22970,24 +24497,36 @@
+@@ -22970,24 +24502,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25956,17 +26058,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22999,7 +24538,9 @@
+@@ -22999,8 +24543,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23010,17 +24551,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23010,17 +24556,17 @@
fi
@@ -25989,7 +26093,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23049,24 +24590,36 @@
+@@ -23049,24 +24595,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26034,17 +26138,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23078,7 +24631,9 @@
+@@ -23078,8 +24636,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -23090,8 +24645,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23090,8 +24650,8 @@
fi
@@ -26055,7 +26161,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23104,8 +24659,8 @@
+@@ -23104,8 +24664,8 @@
_ACEOF
@@ -26066,7 +26172,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23118,40 +24673,52 @@
+@@ -23118,40 +24678,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26131,15 +26237,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23160,21 +24727,22 @@
+@@ -23160,21 +24732,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26159,7 +26266,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23187,40 +24755,52 @@
+@@ -23187,40 +24760,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26224,15 +26331,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23229,21 +24809,22 @@
+@@ -23229,21 +24814,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26252,7 +26360,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23270,53 +24851,59 @@
+@@ -23270,53 +24856,59 @@
#undef inet_ntoa
@@ -26331,15 +26439,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23325,17 +24912,18 @@
+@@ -23325,17 +24917,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_inet_ntoa=no
+ ac_cv_func_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -26355,7 +26464,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23348,40 +24936,52 @@
+@@ -23348,40 +24941,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26420,15 +26529,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23390,21 +24990,22 @@
+@@ -23390,21 +24995,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_inet_ntoa=no
+ ac_cv_lib_nsl_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26448,7 +26558,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23431,53 +25032,59 @@
+@@ -23431,53 +25037,59 @@
#undef connect
@@ -26527,15 +26637,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23486,17 +25093,18 @@
+@@ -23486,17 +25098,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
+ ac_cv_func_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -26551,7 +26662,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23509,40 +25117,52 @@
+@@ -23509,40 +25122,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26616,15 +26727,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23551,22 +25171,23 @@
+@@ -23551,22 +25176,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26645,7 +26757,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23593,53 +25214,59 @@
+@@ -23593,53 +25219,59 @@
#undef remove
@@ -26724,15 +26836,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23648,17 +25275,18 @@
+@@ -23648,17 +25280,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
+ ac_cv_func_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -26748,7 +26861,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23671,40 +25299,52 @@
+@@ -23671,40 +25304,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26813,15 +26926,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23713,14 +25353,15 @@
+@@ -23713,14 +25358,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26832,7 +26946,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23728,8 +25369,8 @@
+@@ -23728,8 +25374,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -26843,7 +26957,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23756,53 +25397,59 @@
+@@ -23756,53 +25402,59 @@
#undef shmat
@@ -26922,15 +27036,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23811,18 +25458,19 @@
+@@ -23811,18 +25463,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
+ ac_cv_func_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -26947,7 +27062,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23835,40 +25483,52 @@
+@@ -23835,40 +25488,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27012,15 +27127,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23877,14 +25537,15 @@
+@@ -23877,14 +25542,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27031,7 +27147,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23898,18 +25559,19 @@
+@@ -23898,18 +25564,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27059,7 +27175,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23920,24 +25582,36 @@
+@@ -23920,24 +25587,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27104,17 +27220,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23946,15 +25620,16 @@
+@@ -23946,15 +25625,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -27126,7 +27243,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23963,8 +25638,13 @@
+@@ -23963,8 +25643,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27142,7 +27259,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23988,9 +25668,10 @@
+@@ -23988,9 +25673,10 @@
ac_header_preproc=no
fi
@@ -27155,7 +27272,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24014,25 +25695,19 @@
+@@ -24014,25 +25700,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;}
@@ -27188,7 +27305,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24050,18 +25725,19 @@
+@@ -24050,18 +25730,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27216,7 +27333,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24072,24 +25748,36 @@
+@@ -24072,24 +25753,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27261,17 +27378,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24098,15 +25786,16 @@
+@@ -24098,15 +25791,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -27283,7 +27401,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24115,8 +25804,13 @@
+@@ -24115,8 +25809,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27299,7 +27417,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24140,9 +25834,10 @@
+@@ -24140,9 +25839,10 @@
ac_header_preproc=no
fi
@@ -27312,7 +27430,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24166,25 +25861,19 @@
+@@ -24166,25 +25866,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;}
@@ -27345,7 +27463,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24198,8 +25887,8 @@
+@@ -24198,8 +25892,8 @@
# darwin requires a poll emulation library
@@ -27356,7 +27474,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24212,40 +25901,52 @@
+@@ -24212,40 +25906,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27421,15 +27539,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24254,14 +25955,15 @@
+@@ -24254,14 +25960,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_poll_poll=no
+ ac_cv_lib_poll_poll=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27440,7 +27559,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24272,18 +25974,19 @@
+@@ -24272,18 +25979,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27468,7 +27587,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24294,24 +25997,36 @@
+@@ -24294,24 +26002,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27513,17 +27632,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24320,15 +26035,16 @@
+@@ -24320,15 +26040,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -27535,7 +27655,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24337,8 +26053,13 @@
+@@ -24337,8 +26058,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27551,7 +27671,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24362,9 +26083,10 @@
+@@ -24362,9 +26088,10 @@
ac_header_preproc=no
fi
@@ -27564,7 +27684,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24388,25 +26110,19 @@
+@@ -24388,25 +26115,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;}
@@ -27597,7 +27717,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24421,17 +26137,17 @@
+@@ -24421,17 +26142,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27621,7 +27741,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24442,24 +26158,36 @@
+@@ -24442,24 +26163,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -27666,17 +27786,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24468,15 +26196,16 @@
+@@ -24468,15 +26201,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -27688,7 +27809,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24485,8 +26214,13 @@
+@@ -24485,8 +26219,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -27704,7 +27825,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24510,9 +26244,10 @@
+@@ -24510,9 +26249,10 @@
ac_header_preproc=no
fi
@@ -27717,7 +27838,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24536,25 +26271,18 @@
+@@ -24536,25 +26276,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;}
@@ -27748,7 +27869,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24571,8 +26299,8 @@
+@@ -24571,8 +26304,8 @@
@@ -27759,7 +27880,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24598,31 +26326,43 @@
+@@ -24598,31 +26331,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27813,7 +27934,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24633,25 +26373,25 @@
+@@ -24633,25 +26378,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27823,8 +27944,9 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -27845,7 +27967,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24663,9 +26403,6 @@
+@@ -24663,9 +26408,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27855,7 +27977,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24691,24 +26428,36 @@
+@@ -24691,24 +26433,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27900,18 +28022,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24717,8 +26466,9 @@
+@@ -24717,9 +26471,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_res_init=no
+ kde_cv_func_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -24732,11 +26482,11 @@
+ ac_ext=c
+@@ -24732,11 +26487,11 @@
fi
@@ -27927,7 +28051,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24757,8 +26507,7 @@
+@@ -24757,8 +26512,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -27937,7 +28061,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24796,24 +26545,36 @@
+@@ -24796,24 +26550,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27982,7 +28106,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24823,9 +26584,10 @@
+@@ -24823,10 +26589,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27990,11 +28114,13 @@
+ kde_cv_proto_res_init="res_init unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -24839,8 +26601,8 @@
+ ac_ext=c
+@@ -24839,8 +26606,8 @@
fi
@@ -28005,7 +28131,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24867,8 +26629,8 @@
+@@ -24867,8 +26634,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -28016,7 +28142,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24881,40 +26643,52 @@
+@@ -24881,40 +26648,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28081,15 +28207,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24923,27 +26697,28 @@
+@@ -24923,27 +26702,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ucb_killpg=no
+ ac_cv_lib_ucb_killpg=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28119,7 +28246,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24956,40 +26731,52 @@
+@@ -24956,40 +26736,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28184,15 +28311,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24998,22 +26785,23 @@
+@@ -24998,22 +26790,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28213,7 +28341,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25024,36 +26812,49 @@
+@@ -25024,36 +26817,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28273,15 +28401,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25062,20 +26863,21 @@
+@@ -25062,20 +26868,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
+ ac_cv_type_int=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -28301,7 +28430,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.
-@@ -25088,10 +26890,11 @@
+@@ -25088,10 +26895,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28314,7 +28443,7 @@
test_array [0] = 0
;
-@@ -25099,24 +26902,36 @@
+@@ -25099,24 +26907,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28359,7 +28488,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25129,10 +26944,11 @@
+@@ -25129,10 +26949,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28372,7 +28501,7 @@
test_array [0] = 0
;
-@@ -25140,24 +26956,36 @@
+@@ -25140,24 +26961,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28417,7 +28546,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25166,30 +26994,32 @@
+@@ -25166,30 +26999,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28434,8 +28563,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -28458,7 +28588,7 @@
test_array [0] = 0
;
-@@ -25197,24 +27027,36 @@
+@@ -25197,24 +27032,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28503,7 +28633,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25227,10 +27069,11 @@
+@@ -25227,10 +27074,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28516,7 +28646,7 @@
test_array [0] = 0
;
-@@ -25238,24 +27081,36 @@
+@@ -25238,24 +27086,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28561,7 +28691,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25264,23 +27119,26 @@
+@@ -25264,24 +27124,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28578,8 +28708,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -28588,14 +28719,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25292,10 +27150,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25292,10 +27155,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28608,7 +28742,7 @@
test_array [0] = 0
;
-@@ -25303,24 +27162,36 @@
+@@ -25303,24 +27167,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28653,15 +28787,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25329,26 +27200,20 @@
+@@ -25329,26 +27205,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -28685,7 +28820,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25356,8 +27221,9 @@
+@@ -25356,8 +27226,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28697,7 +28832,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25366,35 +27232,44 @@
+@@ -25366,35 +27237,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28755,7 +28890,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25405,28 +27280,27 @@
+@@ -25405,28 +27285,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -28792,7 +28927,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25437,36 +27311,49 @@
+@@ -25437,36 +27316,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28852,15 +28987,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25475,20 +27362,21 @@
+@@ -25475,20 +27367,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
+ ac_cv_type_short=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -28880,7 +29016,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.
-@@ -25501,10 +27389,11 @@
+@@ -25501,10 +27394,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28893,7 +29029,7 @@
test_array [0] = 0
;
-@@ -25512,24 +27401,36 @@
+@@ -25512,24 +27406,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28938,7 +29074,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25542,10 +27443,11 @@
+@@ -25542,10 +27448,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28951,7 +29087,7 @@
test_array [0] = 0
;
-@@ -25553,24 +27455,36 @@
+@@ -25553,24 +27460,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28996,7 +29132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25579,30 +27493,32 @@
+@@ -25579,30 +27498,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29013,8 +29149,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -29037,7 +29174,7 @@
test_array [0] = 0
;
-@@ -25610,24 +27526,36 @@
+@@ -25610,24 +27531,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29082,7 +29219,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25640,10 +27568,11 @@
+@@ -25640,10 +27573,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29095,7 +29232,7 @@
test_array [0] = 0
;
-@@ -25651,24 +27580,36 @@
+@@ -25651,24 +27585,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29140,7 +29277,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25677,23 +27618,26 @@
+@@ -25677,24 +27623,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29157,8 +29294,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -29167,14 +29305,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25705,10 +27649,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25705,10 +27654,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29187,7 +29328,7 @@
test_array [0] = 0
;
-@@ -25716,24 +27661,36 @@
+@@ -25716,24 +27666,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29232,15 +29373,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25742,26 +27699,20 @@
+@@ -25742,26 +27704,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -29264,7 +29406,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25769,8 +27720,9 @@
+@@ -25769,8 +27725,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29276,7 +29418,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25779,35 +27731,44 @@
+@@ -25779,35 +27736,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29334,7 +29476,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25818,28 +27779,27 @@
+@@ -25818,28 +27784,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29371,7 +29513,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25850,36 +27810,49 @@
+@@ -25850,36 +27815,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29431,15 +29573,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25888,20 +27861,21 @@
+@@ -25888,20 +27866,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -29459,7 +29602,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.
-@@ -25914,10 +27888,11 @@
+@@ -25914,10 +27893,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29472,7 +29615,7 @@
test_array [0] = 0
;
-@@ -25925,24 +27900,36 @@
+@@ -25925,24 +27905,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29517,7 +29660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25955,10 +27942,11 @@
+@@ -25955,10 +27947,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29530,7 +29673,7 @@
test_array [0] = 0
;
-@@ -25966,24 +27954,36 @@
+@@ -25966,24 +27959,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29575,7 +29718,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25992,30 +27992,32 @@
+@@ -25992,30 +27997,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29592,8 +29735,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -29616,7 +29760,7 @@
test_array [0] = 0
;
-@@ -26023,24 +28025,36 @@
+@@ -26023,24 +28030,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29661,7 +29805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26053,10 +28067,11 @@
+@@ -26053,10 +28072,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29674,7 +29818,7 @@
test_array [0] = 0
;
-@@ -26064,24 +28079,36 @@
+@@ -26064,24 +28084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29719,7 +29863,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26090,23 +28117,26 @@
+@@ -26090,24 +28122,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29736,8 +29880,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -29746,14 +29891,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26118,10 +28148,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26118,10 +28153,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29766,7 +29914,7 @@
test_array [0] = 0
;
-@@ -26129,24 +28160,36 @@
+@@ -26129,24 +28165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29811,15 +29959,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26155,26 +28198,20 @@
+@@ -26155,26 +28203,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -29843,7 +29992,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26182,8 +28219,9 @@
+@@ -26182,8 +28224,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29855,7 +30004,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26192,35 +28230,44 @@
+@@ -26192,35 +28235,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29913,7 +30062,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26231,28 +28278,27 @@
+@@ -26231,28 +28283,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29950,7 +30099,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26263,36 +28309,49 @@
+@@ -26263,36 +28314,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30010,15 +30159,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26301,20 +28360,21 @@
+@@ -26301,20 +28365,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_char_p=no
+ ac_cv_type_char_p=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -30038,7 +30188,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.
-@@ -26327,10 +28387,11 @@
+@@ -26327,10 +28392,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30051,7 +30201,7 @@
test_array [0] = 0
;
-@@ -26338,24 +28399,36 @@
+@@ -26338,24 +28404,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30096,7 +30246,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26368,10 +28441,11 @@
+@@ -26368,10 +28446,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30109,7 +30259,7 @@
test_array [0] = 0
;
-@@ -26379,24 +28453,36 @@
+@@ -26379,24 +28458,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30154,7 +30304,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26405,30 +28491,32 @@
+@@ -26405,30 +28496,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30171,8 +30321,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30195,7 +30346,7 @@
test_array [0] = 0
;
-@@ -26436,24 +28524,36 @@
+@@ -26436,24 +28529,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30240,7 +30391,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26466,10 +28566,11 @@
+@@ -26466,10 +28571,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30253,7 +30404,7 @@
test_array [0] = 0
;
-@@ -26477,24 +28578,36 @@
+@@ -26477,24 +28583,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30298,7 +30449,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26503,23 +28616,26 @@
+@@ -26503,24 +28621,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30315,8 +30466,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30325,14 +30477,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26531,10 +28647,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26531,10 +28652,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30345,7 +30500,7 @@
test_array [0] = 0
;
-@@ -26542,24 +28659,36 @@
+@@ -26542,24 +28664,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30390,15 +30545,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26568,26 +28697,20 @@
+@@ -26568,26 +28702,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -30422,7 +30578,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26595,8 +28718,9 @@
+@@ -26595,8 +28723,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30434,7 +30590,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26605,35 +28729,44 @@
+@@ -26605,35 +28734,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30492,7 +30648,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26644,30 +28777,29 @@
+@@ -26644,30 +28782,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30531,7 +30687,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26680,40 +28812,52 @@
+@@ -26680,40 +28817,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30596,15 +30752,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26722,14 +28866,15 @@
+@@ -26722,14 +28871,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30615,7 +30772,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26738,8 +28883,8 @@
+@@ -26738,8 +28888,8 @@
fi
@@ -30626,7 +30783,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26752,40 +28897,52 @@
+@@ -26752,40 +28902,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30691,15 +30848,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26794,14 +28951,15 @@
+@@ -26794,14 +28956,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_unload=no
+ ac_cv_lib_dld_shl_unload=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30710,7 +30868,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26815,8 +28973,8 @@
+@@ -26815,8 +28978,8 @@
@@ -30721,7 +30879,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26827,36 +28985,49 @@
+@@ -26827,36 +28990,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30781,15 +30939,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26865,20 +29036,21 @@
+@@ -26865,20 +29041,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ ac_cv_type_size_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -30809,7 +30968,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.
-@@ -26891,10 +29063,11 @@
+@@ -26891,10 +29068,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30822,7 +30981,7 @@
test_array [0] = 0
;
-@@ -26902,24 +29075,36 @@
+@@ -26902,24 +29080,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30867,7 +31026,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26932,10 +29117,11 @@
+@@ -26932,10 +29122,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30880,7 +31039,7 @@
test_array [0] = 0
;
-@@ -26943,24 +29129,36 @@
+@@ -26943,24 +29134,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30925,7 +31084,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26969,30 +29167,32 @@
+@@ -26969,30 +29172,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30942,8 +31101,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -30966,7 +31126,7 @@
test_array [0] = 0
;
-@@ -27000,24 +29200,36 @@
+@@ -27000,24 +29205,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31011,7 +31171,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27030,10 +29242,11 @@
+@@ -27030,10 +29247,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31024,7 +31184,7 @@
test_array [0] = 0
;
-@@ -27041,24 +29254,36 @@
+@@ -27041,24 +29259,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31069,7 +31229,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27067,23 +29292,26 @@
+@@ -27067,24 +29297,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31086,8 +31246,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31096,14 +31257,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27095,10 +29323,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27095,10 +29328,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31116,7 +31280,7 @@
test_array [0] = 0
;
-@@ -27106,24 +29335,36 @@
+@@ -27106,24 +29340,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31161,15 +31325,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27132,26 +29373,20 @@
+@@ -27132,26 +29378,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -31193,7 +31358,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27159,8 +29394,9 @@
+@@ -27159,8 +29399,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31205,7 +31370,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27169,35 +29405,44 @@
+@@ -27169,35 +29410,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31263,7 +31428,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27208,29 +29453,28 @@
+@@ -27208,29 +29458,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31301,7 +31466,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27241,36 +29485,49 @@
+@@ -27241,36 +29490,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31361,15 +31526,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27279,20 +29536,21 @@
+@@ -27279,20 +29541,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
+ ac_cv_type_unsigned_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
@@ -31389,7 +31555,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.
-@@ -27305,10 +29563,11 @@
+@@ -27305,10 +29568,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31402,7 +31568,7 @@
test_array [0] = 0
;
-@@ -27316,24 +29575,36 @@
+@@ -27316,24 +29580,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31447,7 +31613,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27346,10 +29617,11 @@
+@@ -27346,10 +29622,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31460,7 +31626,7 @@
test_array [0] = 0
;
-@@ -27357,24 +29629,36 @@
+@@ -27357,24 +29634,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31505,7 +31671,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27383,30 +29667,32 @@
+@@ -27383,30 +29672,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31522,8 +31688,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31546,7 +31713,7 @@
test_array [0] = 0
;
-@@ -27414,24 +29700,36 @@
+@@ -27414,24 +29705,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31591,7 +31758,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27444,10 +29742,11 @@
+@@ -27444,10 +29747,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31604,7 +31771,7 @@
test_array [0] = 0
;
-@@ -27455,24 +29754,36 @@
+@@ -27455,24 +29759,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31649,7 +31816,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27481,23 +29792,26 @@
+@@ -27481,24 +29797,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31666,8 +31833,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31676,14 +31844,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27509,10 +29823,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27509,10 +29828,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31696,7 +31867,7 @@
test_array [0] = 0
;
-@@ -27520,24 +29835,36 @@
+@@ -27520,24 +29840,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31741,15 +31912,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27546,26 +29873,20 @@
+@@ -27546,26 +29878,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
@@ -31773,7 +31945,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27573,8 +29894,9 @@
+@@ -27573,8 +29899,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31785,7 +31957,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27583,35 +29905,44 @@
+@@ -27583,35 +29910,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31843,7 +32015,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27622,30 +29953,29 @@
+@@ -27622,30 +29958,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31882,7 +32054,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27666,36 +29996,48 @@
+@@ -27666,36 +30001,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31943,12 +32115,13 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27707,18 +30049,18 @@
+@@ -27707,18 +30054,18 @@
{ (exit 1); exit 1; }; }
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for PIE support" >&5
@@ -31966,7 +32139,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27748,24 +30090,36 @@
+@@ -27748,24 +30095,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32011,18 +32184,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27774,8 +30128,9 @@
+@@ -27774,9 +30133,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_pie_support=no
+ kde_cv_val_pie_support=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -27789,26 +30144,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27789,26 +30149,26 @@
fi
@@ -32059,7 +32234,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27827,18 +30182,19 @@
+@@ -27827,18 +30187,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32087,7 +32262,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27849,24 +30205,36 @@
+@@ -27849,24 +30210,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32132,17 +32307,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27875,15 +30243,16 @@
+@@ -27875,15 +30248,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -32154,7 +32330,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27892,8 +30261,13 @@
+@@ -27892,8 +30266,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -32170,7 +32346,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27917,9 +30291,10 @@
+@@ -27917,9 +30296,10 @@
ac_header_preproc=no
fi
@@ -32183,7 +32359,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27943,25 +30318,19 @@
+@@ -27943,25 +30323,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;}
@@ -32216,7 +32392,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27973,8 +30342,8 @@
+@@ -27973,8 +30347,8 @@
done
@@ -32227,7 +32403,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28001,53 +30370,59 @@
+@@ -28001,53 +30375,59 @@
#undef _NSGetEnviron
@@ -32306,15 +32482,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28056,13 +30431,14 @@
+@@ -28056,13 +30436,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__NSGetEnviron=no
+ ac_cv_func__NSGetEnviron=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -32324,7 +32501,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28083,9 +30459,9 @@
+@@ -28083,9 +30464,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32337,7 +32514,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28111,53 +30487,59 @@
+@@ -28111,53 +30492,59 @@
#undef $ac_func
@@ -32416,15 +32593,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28166,13 +30548,15 @@
+@@ -28166,13 +30553,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32435,7 +32613,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28189,32 +30573,32 @@
+@@ -28189,32 +30578,32 @@
@@ -32480,7 +32658,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28230,8 +30614,8 @@
+@@ -28230,8 +30619,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -32491,7 +32669,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28268,8 +30652,13 @@
+@@ -28268,8 +30657,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -32507,7 +32685,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28336,6 +30725,7 @@
+@@ -28336,6 +30730,7 @@
fi
done
fi
@@ -32515,7 +32693,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28365,24 +30755,36 @@
+@@ -28365,24 +30760,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32560,7 +32738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28393,7 +30795,7 @@
+@@ -28393,7 +30800,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32569,15 +32747,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28441,6 +30843,7 @@
+@@ -28441,7 +30848,8 @@
done
done
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28451,21 +30854,26 @@
+
+@@ -28451,21 +30859,26 @@
*-*-solaris*)
;;
*)
@@ -32612,7 +32792,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28473,7 +30881,7 @@
+@@ -28473,7 +30886,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
@@ -32621,7 +32801,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28482,7 +30890,7 @@
+@@ -28482,7 +30895,7 @@
esac
fi
cd ..
@@ -32630,7 +32810,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28526,12 +30934,12 @@
+@@ -28526,12 +30939,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -32647,7 +32827,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28559,8 +30967,8 @@
+@@ -28559,8 +30972,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.
@@ -32658,7 +32838,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28573,40 +30981,52 @@
+@@ -28573,40 +30986,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32723,15 +32903,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28615,14 +31035,15 @@
+@@ -28615,14 +31040,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32742,7 +32923,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28631,8 +31052,8 @@
+@@ -28631,8 +31057,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -32753,7 +32934,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28666,24 +31087,36 @@
+@@ -28666,24 +31092,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32798,7 +32979,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28692,9 +31125,10 @@
+@@ -28692,10 +31130,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32806,11 +32987,13 @@
+ kde_cv_have_libXext=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -28704,8 +31138,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28704,8 +31143,8 @@
fi
@@ -32821,7 +33004,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28851,8 +31285,8 @@
+@@ -28851,8 +31290,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -32832,7 +33015,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28863,9 +31297,9 @@
+@@ -28863,9 +31302,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -32845,7 +33028,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28877,40 +31311,52 @@
+@@ -28877,40 +31316,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32910,15 +33093,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28919,14 +31365,16 @@
+@@ -28919,14 +31370,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ eval "$as_ac_Lib=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32930,7 +33114,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28939,8 +31387,8 @@
+@@ -28939,8 +31392,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -32941,7 +33125,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28953,40 +31401,52 @@
+@@ -28953,40 +31406,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33006,15 +33190,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28995,14 +31455,15 @@
+@@ -28995,14 +31460,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33025,7 +33210,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29010,8 +31471,8 @@
+@@ -29010,8 +31476,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -33036,7 +33221,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29030,39 +31491,52 @@
+@@ -29030,40 +31496,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33097,11 +33282,13 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29078,16 +31552,15 @@
+ fi
+@@ -29078,16 +31557,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33122,7 +33309,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29114,24 +31587,36 @@
+@@ -29114,24 +31592,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33167,17 +33354,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29140,7 +31625,9 @@
+@@ -29140,8 +31630,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29154,13 +31641,13 @@
+ ac_ext=c
+@@ -29154,13 +31646,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33195,7 +33384,7 @@
:
fi
-@@ -29172,16 +31659,15 @@
+@@ -29172,16 +31664,15 @@
case $host_os in
solaris*)
@@ -33216,7 +33405,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29208,24 +31694,36 @@
+@@ -29208,24 +31699,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33261,17 +33450,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29234,7 +31732,9 @@
+@@ -29234,8 +31737,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29248,13 +31748,13 @@
+ ac_ext=c
+@@ -29248,13 +31753,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33289,7 +33480,7 @@
:
fi
-@@ -29281,17 +31781,17 @@
+@@ -29281,17 +31786,17 @@
@@ -33313,7 +33504,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29309,21 +31809,21 @@
+@@ -29309,21 +31814,21 @@
fi
@@ -33343,7 +33534,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29342,14 +31842,14 @@
+@@ -29342,14 +31847,14 @@
@@ -33362,7 +33553,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29383,24 +31883,36 @@
+@@ -29383,24 +31888,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33407,18 +33598,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29409,8 +31921,9 @@
+@@ -29409,9 +31926,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_z=no"
+ eval "ac_cv_lib_z=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29424,8 +31937,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29424,8 +31942,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -33429,7 +33622,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29445,8 +31958,8 @@
+@@ -29445,8 +31963,8 @@
@@ -33440,7 +33633,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29482,24 +31995,36 @@
+@@ -29482,24 +32000,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33485,7 +33678,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29508,9 +32033,10 @@
+@@ -29508,10 +32038,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33493,11 +33686,13 @@
+ eval "ac_cv_lib_png=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29525,19 +32051,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29525,19 +32056,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -33523,7 +33718,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29570,24 +32096,36 @@
+@@ -29570,24 +32101,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33568,18 +33763,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29596,8 +32134,9 @@
+@@ -29596,9 +32139,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_6b=no"
+ eval "ac_cv_lib_jpeg_6b=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29608,14 +32147,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29608,14 +32152,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33600,7 +33797,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29648,24 +32187,36 @@
+@@ -29648,24 +32192,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33645,18 +33842,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29674,8 +32225,9 @@
+@@ -29674,9 +32230,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_normal=no"
+ eval "ac_cv_lib_jpeg_normal=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29686,11 +32238,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29686,11 +32243,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -33672,16 +33871,16 @@
LIBJPEG=
-@@ -29710,7 +32262,7 @@
+@@ -29710,7 +32267,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29713: $i/$j" >&5
-+ echo "configure: 32265: $i/$j" >&5
++ echo "configure: 32270: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29757,14 +32309,14 @@
+@@ -29757,14 +32314,14 @@
@@ -33699,7 +33898,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29807,8 +32359,8 @@
+@@ -29807,8 +32364,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33710,7 +33909,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29817,8 +32369,8 @@
+@@ -29817,8 +32374,8 @@
{ (exit 1); exit 1; }; }
else
@@ -33721,7 +33920,7 @@
PERL=$kde_cv_path
fi
-@@ -29832,10 +32384,9 @@
+@@ -29832,10 +32389,9 @@
@@ -33734,7 +33933,7 @@
else
if test $kde_qtver = 3; then
-@@ -29845,7 +32396,8 @@
+@@ -29845,7 +32401,8 @@
fi
@@ -33744,7 +33943,7 @@
USING_QT_MT=""
-@@ -29865,13 +32417,13 @@
+@@ -29865,13 +32422,13 @@
else
kde_check_threading_default=yes
fi
@@ -33762,7 +33961,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29943,8 +32495,8 @@
+@@ -29943,8 +32500,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -33773,7 +33972,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29953,34 +32505,34 @@
+@@ -29953,34 +32510,34 @@
qt_libraries=""
qt_includes=""
@@ -33788,14 +33987,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"
@@ -33820,16 +34019,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30008,7 +32560,7 @@
+@@ -30008,7 +32565,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30011: $i/$j" >&5
-+ echo "configure: 32563: $i/$j" >&5
++ echo "configure: 32568: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30045,8 +32597,7 @@
+@@ -30045,8 +32602,7 @@
ac_qt_libraries="$qt_libdir"
@@ -33839,7 +34038,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30183,13 +32734,13 @@
+@@ -30183,13 +32739,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -33857,7 +34056,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30198,15 +32749,14 @@
+@@ -30198,15 +32754,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -33876,7 +34075,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30327,12 +32877,12 @@
+@@ -30327,12 +32882,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -33893,7 +34092,7 @@
fi
-@@ -30370,14 +32920,14 @@
+@@ -30370,14 +32925,14 @@
fi
@@ -33911,7 +34110,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30420,8 +32970,8 @@
+@@ -30420,8 +32975,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33922,7 +34121,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30442,22 +32992,22 @@
+@@ -30442,22 +32997,22 @@
{ (exit 1); exit 1; }; }
else
@@ -33950,7 +34149,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30500,12 +33050,12 @@
+@@ -30500,12 +33055,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33967,7 +34166,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30535,10 +33085,10 @@
+@@ -30535,10 +33090,10 @@
if test $kde_qtver = 3; then
@@ -33981,7 +34180,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30561,22 +33111,22 @@
+@@ -30561,22 +33116,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34011,7 +34210,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30599,13 +33149,13 @@
+@@ -30599,13 +33154,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34029,7 +34228,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30636,15 +33186,14 @@
+@@ -30636,15 +33191,14 @@
if test -n "$LIBJPEG"; then
@@ -34048,7 +34247,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30677,24 +33226,36 @@
+@@ -30677,24 +33231,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34093,18 +34292,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30703,8 +33264,9 @@
+@@ -30703,9 +33269,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "kde_cv_qt_jpeg=yes"
+ eval "kde_cv_qt_jpeg=yes"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -30721,12 +33283,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30721,12 +33288,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34121,7 +34322,7 @@
LIBJPEG_QT=
fi
-@@ -30757,15 +33319,15 @@
+@@ -30757,15 +33324,15 @@
@@ -34143,7 +34344,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30789,11 +33351,11 @@
+@@ -30789,11 +33356,11 @@
@@ -34159,34 +34360,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30845,7 +33407,7 @@
+@@ -30845,7 +33412,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30848: $i/$j" >&5
-+ echo "configure: 33410: $i/$j" >&5
++ echo "configure: 33415: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30875,7 +33437,7 @@
+@@ -30875,7 +33442,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30878: $i/$j" >&5
-+ echo "configure: 33440: $i/$j" >&5
++ echo "configure: 33445: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30893,7 +33455,7 @@
+@@ -30893,7 +33460,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30896: $i/$j" >&5
-+ echo "configure: 33458: $i/$j" >&5
++ echo "configure: 33463: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30952,12 +33514,12 @@
+@@ -30952,12 +33519,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34203,7 +34404,7 @@
fi
kde_libraries="${libdir}"
-@@ -30966,8 +33528,8 @@
+@@ -30966,8 +33533,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34214,7 +34415,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31005,8 +33567,8 @@
+@@ -31005,8 +33572,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -34225,7 +34426,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31049,8 +33611,8 @@
+@@ -31049,8 +33616,8 @@
fi
@@ -34236,7 +34437,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31082,10 +33644,9 @@
+@@ -31082,10 +33649,9 @@
@@ -34249,7 +34450,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31099,13 +33660,14 @@
+@@ -31099,13 +33665,14 @@
fi
@@ -34267,28 +34468,28 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31216,15 +33778,14 @@
+@@ -31216,15 +33783,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31276,8 +33837,8 @@
+@@ -31276,8 +33842,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34299,7 +34500,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31316,8 +33877,8 @@
+@@ -31316,8 +33882,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34310,7 +34511,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31325,8 +33886,8 @@
+@@ -31325,8 +33891,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34321,28 +34522,28 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31519,15 +34080,14 @@
+@@ -31519,15 +34085,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31579,8 +34139,8 @@
+@@ -31579,8 +34144,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34353,7 +34554,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31619,8 +34179,8 @@
+@@ -31619,8 +34184,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34364,7 +34565,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31628,8 +34188,8 @@
+@@ -31628,8 +34193,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34375,7 +34576,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31721,22 +34281,22 @@
+@@ -31721,22 +34286,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -34404,7 +34605,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31769,14 +34329,14 @@
+@@ -31769,14 +34334,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -34422,7 +34623,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31819,8 +34379,8 @@
+@@ -31819,8 +34384,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34433,7 +34634,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31831,21 +34391,21 @@
+@@ -31831,21 +34396,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34460,7 +34661,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31888,8 +34448,8 @@
+@@ -31888,8 +34453,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34471,7 +34672,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31900,22 +34460,22 @@
+@@ -31900,22 +34465,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34499,7 +34700,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31958,8 +34518,8 @@
+@@ -31958,8 +34523,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34510,7 +34711,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31972,21 +34532,21 @@
+@@ -31972,21 +34537,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34537,7 +34738,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32029,8 +34589,8 @@
+@@ -32029,8 +34594,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34548,7 +34749,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32043,22 +34603,22 @@
+@@ -32043,22 +34608,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34576,7 +34777,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32101,12 +34661,12 @@
+@@ -32101,12 +34666,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34593,7 +34794,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32135,14 +34695,14 @@
+@@ -32135,14 +34700,14 @@
if test -n "$kde32ornewer"; then
@@ -34611,7 +34812,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32185,8 +34745,8 @@
+@@ -32185,8 +34750,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34622,7 +34823,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32197,21 +34757,21 @@
+@@ -32197,21 +34762,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34649,7 +34850,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32254,8 +34814,8 @@
+@@ -32254,8 +34819,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34660,7 +34861,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32266,8 +34826,8 @@
+@@ -32266,8 +34831,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34671,7 +34872,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32275,14 +34835,14 @@
+@@ -32275,14 +34840,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -34689,7 +34890,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32325,8 +34885,8 @@
+@@ -32325,8 +34890,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34700,7 +34901,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32337,8 +34897,8 @@
+@@ -32337,8 +34902,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34711,7 +34912,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32346,14 +34906,14 @@
+@@ -32346,14 +34911,14 @@
fi
@@ -34729,7 +34930,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32396,12 +34956,12 @@
+@@ -32396,12 +34961,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34746,16 +34947,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32416,7 +34976,7 @@
+@@ -32416,7 +34981,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32419: $i/$j" >&5
-+ echo "configure: 34979: $i/$j" >&5
++ echo "configure: 34984: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32577,13 +35137,12 @@
+@@ -32577,13 +35142,12 @@
@@ -34772,7 +34973,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32604,13 +35163,13 @@
+@@ -32604,13 +35168,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -34790,7 +34991,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32630,16 +35189,15 @@
+@@ -32630,16 +35194,15 @@
kde_have_gcc_visibility=no
@@ -34811,7 +35012,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32666,24 +35224,36 @@
+@@ -32666,24 +35229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34856,17 +35057,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32692,7 +35262,9 @@
+@@ -32692,8 +35267,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -32706,28 +35278,27 @@
+ ac_ext=c
+@@ -32706,28 +35283,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34887,10 +35090,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
@@ -34904,7 +35107,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32762,24 +35333,36 @@
+@@ -32762,24 +35338,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34949,18 +35152,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32788,8 +35371,9 @@
+@@ -32788,9 +35376,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_qt_gcc_visibility_patched=yes
+ kde_cv_val_qt_gcc_visibility_patched=yes
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32802,21 +35386,20 @@
+ ac_ext=c
+@@ -32802,21 +35391,20 @@
fi
@@ -34987,7 +35192,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32856,24 +35439,36 @@
+@@ -32856,24 +35444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35032,18 +35237,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32882,8 +35477,9 @@
+@@ -32882,9 +35482,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_gcc_visibility_bug=yes
+ kde_cv_val_gcc_visibility_bug=yes
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -32898,8 +35494,8 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -32898,8 +35499,8 @@
fi
@@ -35054,7 +35261,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32915,8 +35511,8 @@
+@@ -32915,8 +35516,8 @@
fi
else
@@ -35065,7 +35272,7 @@
:
fi
-@@ -32924,8 +35520,8 @@
+@@ -32924,8 +35525,8 @@
fi
@@ -35076,16 +35283,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -32937,7 +35533,7 @@
+@@ -32937,7 +35538,7 @@
do
for j in qsql.html;
do
- echo "configure: 32940: $i/$j" >&5
-+ echo "configure: 35536: $i/$j" >&5
++ echo "configure: 35541: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32946,20 +35542,20 @@
+@@ -32946,20 +35547,20 @@
done
done
@@ -35111,7 +35318,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33002,12 +35598,12 @@
+@@ -33002,12 +35603,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35128,7 +35335,7 @@
DOT=$kde_cv_path
fi
-@@ -33019,14 +35615,14 @@
+@@ -33019,14 +35620,14 @@
fi
@@ -35146,7 +35353,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33069,12 +35665,12 @@
+@@ -33069,12 +35670,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35163,14 +35370,24 @@
DOXYGEN=$kde_cv_path
fi
-@@ -33095,214 +35691,100 @@
+@@ -33085,224 +35686,110 @@
+ DOXYGEN_PROJECT_NUMBER="Version $VERSION"
-
-
+-KDE_HAS_DOXYGEN=no
+-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
+- KDE_HAS_DOXYGEN=yes
+-fi
-
-
-
+-
+-
+-
+-
+-
+-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -35297,7 +35514,11 @@
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
++
++KDE_HAS_DOXYGEN=no
++if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
++ KDE_HAS_DOXYGEN=yes
+ fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
@@ -35308,6 +35529,11 @@
+
+
+
++
++
++
++
++
+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`
@@ -35401,7 +35627,7 @@
-fi
-LIBS=$ac_func_search_save_LIBS
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
@@ -35434,7 +35660,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33310,122 +35792,196 @@
+@@ -33310,122 +35797,196 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35515,13 +35741,14 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-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
++
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -35635,10 +35862,11 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
++
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -35673,7 +35901,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33449,24 +36005,36 @@
+@@ -33449,24 +36010,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35718,18 +35946,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33475,8 +36043,9 @@
+@@ -33475,9 +36048,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -33533,6 +36102,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -33533,6 +36107,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -35737,7 +35967,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33552,18 +36122,27 @@
+@@ -33552,18 +36127,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -35771,7 +36001,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33576,12 +36155,14 @@
+@@ -33576,12 +36160,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -35789,7 +36019,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33603,18 +36184,19 @@
+@@ -33603,18 +36189,19 @@
for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h sys/user.h sys/vmmeter.h sys/resource.h vm/vmparam.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35817,7 +36047,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33625,24 +36207,36 @@
+@@ -33625,24 +36212,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35862,17 +36092,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33651,15 +36245,16 @@
+@@ -33651,15 +36250,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -35884,7 +36115,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33668,8 +36263,13 @@
+@@ -33668,8 +36268,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35900,7 +36131,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33693,9 +36293,10 @@
+@@ -33693,9 +36298,10 @@
ac_header_preproc=no
fi
@@ -35913,7 +36144,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33719,25 +36320,19 @@
+@@ -33719,25 +36325,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;}
@@ -35946,7 +36177,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33752,15 +36347,14 @@
+@@ -33752,15 +36352,14 @@
@@ -35965,7 +36196,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33772,9 +36366,6 @@
+@@ -33772,9 +36371,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -35975,7 +36206,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33797,24 +36388,36 @@
+@@ -33797,24 +36393,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36020,18 +36251,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33823,8 +36426,9 @@
+@@ -33823,9 +36431,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_setenv=no
+ kde_cv_func_setenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -33838,11 +36442,11 @@
+ ac_ext=c
+@@ -33838,11 +36447,11 @@
fi
@@ -36047,7 +36280,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33863,8 +36467,7 @@
+@@ -33863,8 +36472,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -36057,7 +36290,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33899,24 +36502,36 @@
+@@ -33899,24 +36507,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36102,7 +36335,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33926,9 +36541,10 @@
+@@ -33926,10 +36546,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36110,11 +36343,13 @@
+ kde_cv_proto_setenv="setenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -33942,8 +36558,8 @@
+ ac_ext=c
+@@ -33942,8 +36563,8 @@
fi
@@ -36125,7 +36360,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -33967,15 +36583,14 @@
+@@ -33967,15 +36588,14 @@
@@ -36144,7 +36379,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33987,9 +36602,6 @@
+@@ -33987,9 +36607,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36154,7 +36389,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34012,24 +36624,36 @@
+@@ -34012,24 +36629,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36199,18 +36434,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34038,8 +36662,9 @@
+@@ -34038,9 +36667,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_unsetenv=no
+ kde_cv_func_unsetenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -34053,11 +36678,11 @@
+ ac_ext=c
+@@ -34053,11 +36683,11 @@
fi
@@ -36226,7 +36463,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34078,8 +36703,7 @@
+@@ -34078,8 +36708,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -36236,7 +36473,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34114,24 +36738,36 @@
+@@ -34114,24 +36743,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36281,7 +36518,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34141,9 +36777,10 @@
+@@ -34141,10 +36782,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36289,11 +36526,13 @@
+ kde_cv_proto_unsetenv="unsetenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -34157,8 +36794,8 @@
+ ac_ext=c
+@@ -34157,8 +36799,8 @@
fi
@@ -36304,7 +36543,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -34184,8 +36821,8 @@
+@@ -34184,8 +36826,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -36315,7 +36554,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34221,8 +36858,8 @@
+@@ -34221,8 +36863,8 @@
fi
@@ -36326,7 +36565,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34231,15 +36868,14 @@
+@@ -34231,15 +36873,14 @@
@@ -36345,7 +36584,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34251,9 +36887,6 @@
+@@ -34251,9 +36892,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36355,7 +36594,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34280,24 +36913,36 @@
+@@ -34280,24 +36918,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36400,18 +36639,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34306,8 +36951,9 @@
+@@ -34306,9 +36956,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_statfs=no
+ kde_cv_func_statfs=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -34321,11 +36967,11 @@
+ ac_ext=c
+@@ -34321,11 +36972,11 @@
fi
@@ -36427,7 +36668,7 @@
if test "${kde_cv_proto_statfs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34346,8 +36992,7 @@
+@@ -34346,8 +36997,7 @@
if test "x$kde_cv_proto_statfs" = xunknown; then
@@ -36437,7 +36678,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34388,24 +37033,36 @@
+@@ -34388,24 +37038,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36482,7 +36723,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34415,9 +37072,10 @@
+@@ -34415,10 +37077,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36490,11 +36731,13 @@
+ kde_cv_proto_statfs="statfs unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -34431,8 +37089,8 @@
+ ac_ext=c
+@@ -34431,8 +37094,8 @@
fi
@@ -36505,7 +36748,7 @@
if test "x$kde_cv_func_statfs" = xyes; then
-@@ -34458,18 +37116,19 @@
+@@ -34458,18 +37121,19 @@
for ac_header in ieeefp.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36533,7 +36776,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34480,24 +37139,36 @@
+@@ -34480,24 +37144,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36578,17 +36821,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34506,15 +37177,16 @@
+@@ -34506,15 +37182,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -36600,7 +36844,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34523,8 +37195,13 @@
+@@ -34523,8 +37200,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36616,7 +36860,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34548,9 +37225,10 @@
+@@ -34548,9 +37230,10 @@
ac_header_preproc=no
fi
@@ -36629,7 +36873,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34574,25 +37252,19 @@
+@@ -34574,25 +37257,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;}
@@ -36662,7 +36906,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34609,9 +37281,9 @@
+@@ -34609,9 +37286,9 @@
for ac_func in fabsl
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36675,7 +36919,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34637,53 +37309,59 @@
+@@ -34637,53 +37314,59 @@
#undef $ac_func
@@ -36754,15 +36998,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34692,13 +37370,15 @@
+@@ -34692,13 +37375,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -36773,7 +37018,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34710,8 +37390,8 @@
+@@ -34710,8 +37395,8 @@
@@ -36784,7 +37029,7 @@
if test "${ac_cv_c_long_double+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34754,13 +37434,22 @@
+@@ -34754,13 +37439,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -36811,7 +37056,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34773,13 +37462,15 @@
+@@ -34773,13 +37467,15 @@
( exit $ac_status )
ac_cv_c_long_double=no
fi
@@ -36830,7 +37075,7 @@
if test $ac_cv_c_long_double = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34791,8 +37482,8 @@
+@@ -34791,8 +37487,8 @@
have_l_funcs=yes
@@ -36841,7 +37086,7 @@
if test "${ac_cv_lib_m_asinl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34805,40 +37496,52 @@
+@@ -34805,40 +37501,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36906,15 +37151,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34847,14 +37550,15 @@
+@@ -34847,14 +37555,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_asinl=no
+ ac_cv_lib_m_asinl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -36925,7 +37171,7 @@
if test $ac_cv_lib_m_asinl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -34867,8 +37571,8 @@
+@@ -34867,8 +37576,8 @@
fi
@@ -36936,7 +37182,7 @@
if test "${ac_cv_lib_m_sqrtl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34881,40 +37585,52 @@
+@@ -34881,40 +37590,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37001,15 +37247,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34923,14 +37639,15 @@
+@@ -34923,14 +37644,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_sqrtl=no
+ ac_cv_lib_m_sqrtl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37020,7 +37267,7 @@
if test $ac_cv_lib_m_sqrtl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -34957,8 +37674,8 @@
+@@ -34957,8 +37679,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -37031,7 +37278,7 @@
if test "${ac_cv_lib_m_isinf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34971,40 +37688,52 @@
+@@ -34971,40 +37693,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37096,15 +37343,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35013,14 +37742,15 @@
+@@ -35013,14 +37747,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_isinf=no
+ ac_cv_lib_m_isinf=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37115,7 +37363,7 @@
if test $ac_cv_lib_m_isinf = yes; then
-@@ -35031,8 +37761,8 @@
+@@ -35031,8 +37766,8 @@
fi
@@ -37126,7 +37374,7 @@
if test "${ac_cv_lib_m_round+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35045,40 +37775,52 @@
+@@ -35045,40 +37780,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37191,15 +37439,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35087,14 +37829,15 @@
+@@ -35087,14 +37834,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_round=no
+ ac_cv_lib_m_round=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37210,7 +37459,7 @@
if test $ac_cv_lib_m_round = yes; then
-@@ -35105,8 +37848,8 @@
+@@ -35105,8 +37853,8 @@
fi
@@ -37221,7 +37470,7 @@
if test "${ac_cv_lib_m_roundl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35119,40 +37862,52 @@
+@@ -35119,40 +37867,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37286,15 +37535,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35161,14 +37916,15 @@
+@@ -35161,14 +37921,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_roundl=no
+ ac_cv_lib_m_roundl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37305,7 +37555,7 @@
if test $ac_cv_lib_m_roundl = yes; then
-@@ -35186,8 +37942,7 @@
+@@ -35186,8 +37947,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37315,7 +37565,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35197,17 +37952,17 @@
+@@ -35197,17 +37957,17 @@
if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -37339,7 +37589,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35218,24 +37973,36 @@
+@@ -35218,24 +37978,36 @@
#include <gmp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37384,17 +37634,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35244,15 +38011,16 @@
+@@ -35244,15 +38016,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -37406,7 +37657,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35261,8 +38029,13 @@
+@@ -35261,8 +38034,13 @@
/* end confdefs.h. */
#include <gmp.h>
_ACEOF
@@ -37422,7 +37673,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35286,9 +38059,10 @@
+@@ -35286,9 +38064,10 @@
ac_header_preproc=no
fi
@@ -37435,7 +37686,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35312,25 +38086,18 @@
+@@ -35312,25 +38091,18 @@
echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -37466,7 +37717,7 @@
fi
if test $ac_cv_header_gmp_h = yes; then
-@@ -35344,8 +38111,8 @@
+@@ -35344,8 +38116,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -37477,7 +37728,7 @@
if test "${ac_cv_lib_gmp_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35362,30 +38129,42 @@
+@@ -35362,30 +38134,42 @@
int
main ()
{
@@ -37529,15 +37780,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35394,14 +38173,15 @@
+@@ -35394,14 +38178,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_gmp_main=no
+ ac_cv_lib_gmp_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37548,7 +37800,7 @@
if test $ac_cv_lib_gmp_main = yes; then
LIBGMP="-lgmp"
-@@ -35437,8 +38217,8 @@
+@@ -35437,8 +38222,8 @@
@@ -37559,7 +37811,7 @@
if test "${ac_cv_c_long_double+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35481,13 +38261,22 @@
+@@ -35481,13 +38266,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -37586,7 +37838,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35500,13 +38289,15 @@
+@@ -35500,13 +38294,15 @@
( exit $ac_status )
ac_cv_c_long_double=no
fi
@@ -37605,7 +37857,7 @@
if test $ac_cv_c_long_double = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35518,8 +38309,8 @@
+@@ -35518,8 +38314,8 @@
have_l_funcs=yes
@@ -37616,7 +37868,7 @@
if test "${ac_cv_lib_m_sqrtl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35532,40 +38323,52 @@
+@@ -35532,40 +38328,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37681,15 +37933,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35574,14 +38377,15 @@
+@@ -35574,14 +38382,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_m_sqrtl=no
+ ac_cv_lib_m_sqrtl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37700,7 +37953,7 @@
if test $ac_cv_lib_m_sqrtl = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
-@@ -35607,8 +38411,7 @@
+@@ -35607,8 +38416,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37710,7 +37963,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35618,17 +38421,17 @@
+@@ -35618,17 +38426,17 @@
if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -37734,7 +37987,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35639,24 +38442,36 @@
+@@ -35639,24 +38447,36 @@
#include <gmp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37779,17 +38032,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35665,15 +38480,16 @@
+@@ -35665,15 +38485,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -37801,7 +38055,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35682,8 +38498,13 @@
+@@ -35682,8 +38503,13 @@
/* end confdefs.h. */
#include <gmp.h>
_ACEOF
@@ -37817,7 +38071,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35707,9 +38528,10 @@
+@@ -35707,9 +38533,10 @@
ac_header_preproc=no
fi
@@ -37830,7 +38084,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35733,32 +38555,24 @@
+@@ -35733,32 +38560,24 @@
echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -37869,7 +38123,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35791,24 +38605,36 @@
+@@ -35791,24 +38610,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37914,12 +38168,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35821,10 +38647,11 @@
+@@ -35821,10 +38652,11 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE kcalc"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_save_LIBS
- ac_ext=cc
@@ -37927,7 +38182,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35847,15 +38674,14 @@
+@@ -35847,15 +38679,14 @@
# kossebau: copied from kdelibs/configure.in.in for khexedit
@@ -37945,7 +38200,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35881,24 +38707,36 @@
+@@ -35881,24 +38712,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37990,7 +38245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35924,24 +38762,36 @@
+@@ -35924,24 +38767,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38035,15 +38290,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35950,14 +38800,15 @@
+@@ -35950,14 +38805,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38053,7 +38309,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -35967,11 +38818,11 @@
+@@ -35967,11 +38823,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38069,7 +38325,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -35982,24 +38833,36 @@
+@@ -35982,24 +38838,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38114,17 +38370,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36018,7 +38881,9 @@
+@@ -36018,8 +38886,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36027,27 +38892,41 @@
+ /* confdefs.h. */
+@@ -36027,27 +38897,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38173,7 +38431,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36060,13 +38939,16 @@
+@@ -36060,13 +38944,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -38183,8 +38441,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -38193,7 +38452,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -36093,14 +38975,14 @@
+@@ -36093,14 +38980,14 @@
# kossebau end
@@ -38211,7 +38470,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36143,12 +39025,12 @@
+@@ -36143,12 +39030,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38228,7 +38487,7 @@
TPCTL=$kde_cv_path
fi
-@@ -36163,18 +39045,19 @@
+@@ -36163,18 +39050,19 @@
for ac_header in machine/apm_bios.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38256,7 +38515,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36185,24 +39068,36 @@
+@@ -36185,24 +39073,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38301,17 +38560,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36211,15 +39106,16 @@
+@@ -36211,15 +39111,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -38323,7 +38583,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36228,8 +39124,13 @@
+@@ -36228,8 +39129,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38339,7 +38599,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36253,9 +39154,10 @@
+@@ -36253,9 +39159,10 @@
ac_header_preproc=no
fi
@@ -38352,7 +38612,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36279,25 +39181,19 @@
+@@ -36279,25 +39186,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;}
@@ -38385,7 +38645,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36324,13 +39220,13 @@
+@@ -36324,13 +39225,13 @@
@@ -38403,7 +38663,7 @@
have_pbbipc=""
have_pbb=""
-@@ -36345,8 +39241,8 @@
+@@ -36345,8 +39246,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38414,7 +38674,7 @@
if test "${ac_cv_lib_pbbipc_create_msgport+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36359,40 +39255,52 @@
+@@ -36359,40 +39260,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38479,15 +38739,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36401,14 +39309,15 @@
+@@ -36401,14 +39314,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pbbipc_create_msgport=no
+ ac_cv_lib_pbbipc_create_msgport=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38498,7 +38759,7 @@
if test $ac_cv_lib_pbbipc_create_msgport = yes; then
KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
-@@ -36433,8 +39342,8 @@
+@@ -36433,8 +39347,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38509,7 +38770,7 @@
if test "${ac_cv_lib_pbb_init_libpbb+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36447,40 +39356,52 @@
+@@ -36447,40 +39361,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38574,15 +38835,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36489,14 +39410,15 @@
+@@ -36489,14 +39415,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pbb_init_libpbb=no
+ ac_cv_lib_pbb_init_libpbb=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38593,7 +38855,7 @@
if test $ac_cv_lib_pbb_init_libpbb = yes; then
KEYBOARD_LIBS="-lpbb $KEYBOARD_LIBS"
-@@ -36540,15 +39462,15 @@
+@@ -36540,15 +39467,15 @@
fi
@@ -38613,7 +38875,7 @@
if test x$kmilo_delli8k_compile = xyes; then
-@@ -36563,17 +39485,17 @@
+@@ -36563,17 +39490,17 @@
if test "${ac_cv_header_linux_sonypi_h+set}" = set; then
@@ -38637,7 +38899,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36584,24 +39506,36 @@
+@@ -36584,24 +39511,36 @@
#include <linux/sonypi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38682,17 +38944,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36610,15 +39544,16 @@
+@@ -36610,15 +39549,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -38704,7 +38967,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36627,8 +39562,13 @@
+@@ -36627,8 +39567,13 @@
/* end confdefs.h. */
#include <linux/sonypi.h>
_ACEOF
@@ -38720,7 +38983,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36652,9 +39592,10 @@
+@@ -36652,9 +39597,10 @@
ac_header_preproc=no
fi
@@ -38733,7 +38996,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36678,25 +39619,18 @@
+@@ -36678,25 +39624,18 @@
echo "$as_me: WARNING: linux/sonypi.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&2;}
@@ -38764,7 +39027,7 @@
fi
if test $ac_cv_header_linux_sonypi_h = yes; then
-@@ -36721,9 +39655,9 @@
+@@ -36721,9 +39660,9 @@
for ac_func in getloadavg
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38777,7 +39040,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -36749,53 +39683,59 @@
+@@ -36749,53 +39688,59 @@
#undef $ac_func
@@ -38856,15 +39119,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36804,13 +39744,15 @@
+@@ -36804,13 +39749,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -38875,7 +39139,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -36829,8 +39771,8 @@
+@@ -36829,8 +39776,8 @@
if test x$sysinfo_check = xyes; then
sysinfo_ok=no
@@ -38886,7 +39150,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36856,24 +39798,36 @@
+@@ -36856,24 +39803,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38931,23 +39195,24 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36889,11 +39843,13 @@
+@@ -36889,11 +39848,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $sysinfo_ok" >&5
-echo "${ECHO_T}$sysinfo_ok" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: result: $sysinfo_ok" >&5
+echo "${ECHO_T}$sysinfo_ok" >&6; }
fi
-@@ -36911,8 +39867,7 @@
+@@ -36911,8 +39872,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38957,7 +39222,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36922,17 +39877,17 @@
+@@ -36922,17 +39882,17 @@
if test "${ac_cv_header_X11_extensions_extutil_h+set}" = set; then
@@ -38981,7 +39246,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36943,24 +39898,36 @@
+@@ -36943,24 +39903,36 @@
#include <X11/extensions/extutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -39026,17 +39291,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36969,15 +39936,16 @@
+@@ -36969,15 +39941,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -39048,7 +39314,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36986,8 +39954,13 @@
+@@ -36986,8 +39959,13 @@
/* end confdefs.h. */
#include <X11/extensions/extutil.h>
_ACEOF
@@ -39064,7 +39330,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37011,9 +39984,10 @@
+@@ -37011,9 +39989,10 @@
ac_header_preproc=no
fi
@@ -39077,7 +39343,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37037,25 +40011,18 @@
+@@ -37037,25 +40016,18 @@
echo "$as_me: WARNING: X11/extensions/extutil.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&2;}
@@ -39108,7 +39374,7 @@
fi
if test $ac_cv_header_X11_extensions_extutil_h = yes; then
-@@ -37086,8 +40053,8 @@
+@@ -37086,8 +40058,8 @@
fi
@@ -39119,7 +39385,7 @@
if test "${ac_cv_lib_devstat_selectdevs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37100,40 +40067,52 @@
+@@ -37100,40 +40072,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39184,15 +39450,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37142,22 +40121,23 @@
+@@ -37142,22 +40126,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_devstat_selectdevs=no
+ ac_cv_lib_devstat_selectdevs=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39213,7 +39480,7 @@
if test "${ac_cv_lib_devstat_devstat_selectdevs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37170,40 +40150,52 @@
+@@ -37170,40 +40155,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39278,15 +39545,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37212,14 +40204,15 @@
+@@ -37212,14 +40209,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_devstat_devstat_selectdevs=no
+ ac_cv_lib_devstat_devstat_selectdevs=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39297,7 +39565,7 @@
if test $ac_cv_lib_devstat_devstat_selectdevs = yes; then
LIB_DEVSTAT="-ldevstat"
-@@ -37244,18 +40237,19 @@
+@@ -37244,18 +40242,19 @@
for ac_header in sys/mnttab.h mntent.h sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h sys/ucred.h sys/loadavg.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39325,7 +39593,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37266,24 +40260,36 @@
+@@ -37266,24 +40265,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39370,17 +39638,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37292,15 +40298,16 @@
+@@ -37292,15 +40303,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -39392,7 +39661,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37309,8 +40316,13 @@
+@@ -37309,8 +40321,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39408,7 +39677,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37334,9 +40346,10 @@
+@@ -37334,9 +40351,10 @@
ac_header_preproc=no
fi
@@ -39421,7 +39690,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37360,25 +40373,19 @@
+@@ -37360,25 +40378,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;}
@@ -39454,7 +39723,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -37394,9 +40401,9 @@
+@@ -37394,9 +40406,9 @@
for ac_func in statvfs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39467,7 +39736,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37422,53 +40429,59 @@
+@@ -37422,53 +40434,59 @@
#undef $ac_func
@@ -39546,15 +39815,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37477,13 +40490,15 @@
+@@ -37477,13 +40495,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -39565,7 +39835,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37494,13 +40509,13 @@
+@@ -37494,13 +40514,13 @@
@@ -39583,7 +39853,7 @@
enable_snmp=no
if test "x$with_snmp" != xno; then
-@@ -37508,8 +40523,7 @@
+@@ -37508,8 +40528,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -39593,31 +39863,18 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37519,17 +40533,17 @@
+@@ -37518,8 +40537,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- if test "${ac_cv_header_net_snmp_library_snmp_api_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
+- echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
-echo $ECHO_N "checking for net-snmp/library/snmp_api.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
++ { echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
+echo $ECHO_N "checking for net-snmp/library/snmp_api.h... $ECHO_C" >&6; }
if test "${ac_cv_header_net_snmp_library_snmp_api_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_net_snmp_library_snmp_api_h" >&5
--echo "${ECHO_T}$ac_cv_header_net_snmp_library_snmp_api_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_net_snmp_library_snmp_api_h" >&5
-+echo "${ECHO_T}$ac_cv_header_net_snmp_library_snmp_api_h" >&6; }
else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking net-snmp/library/snmp_api.h usability" >&5
--echo $ECHO_N "checking net-snmp/library/snmp_api.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking net-snmp/library/snmp_api.h usability" >&5
-+echo $ECHO_N "checking net-snmp/library/snmp_api.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -37540,24 +40554,36 @@
+@@ -37537,24 +40556,36 @@
#include <net-snmp/library/snmp_api.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -39662,89 +39919,25 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37566,15 +40592,16 @@
+@@ -37563,12 +40594,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--ac_header_compiler=no
-+ ac_header_compiler=no
+-ac_cv_header_net_snmp_library_snmp_api_h=no
++ ac_cv_header_net_snmp_library_snmp_api_h=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking net-snmp/library/snmp_api.h presence" >&5
--echo $ECHO_N "checking net-snmp/library/snmp_api.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking net-snmp/library/snmp_api.h presence" >&5
-+echo $ECHO_N "checking net-snmp/library/snmp_api.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -37583,8 +40610,13 @@
- /* end confdefs.h. */
- #include <net-snmp/library/snmp_api.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -37608,9 +40640,10 @@
-
- ac_header_preproc=no
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37634,25 +40667,18 @@
- echo "$as_me: WARNING: net-snmp/library/snmp_api.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: net-snmp/library/snmp_api.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: net-snmp/library/snmp_api.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
--echo $ECHO_N "checking for net-snmp/library/snmp_api.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for net-snmp/library/snmp_api.h" >&5
-+echo $ECHO_N "checking for net-snmp/library/snmp_api.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_net_snmp_library_snmp_api_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_net_snmp_library_snmp_api_h=$ac_header_preproc
- fi
-echo "$as_me:$LINENO: result: $ac_cv_header_net_snmp_library_snmp_api_h" >&5
-echo "${ECHO_T}$ac_cv_header_net_snmp_library_snmp_api_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_net_snmp_library_snmp_api_h" >&5
+echo "${ECHO_T}$ac_cv_header_net_snmp_library_snmp_api_h" >&6; }
-
- fi
if test $ac_cv_header_net_snmp_library_snmp_api_h = yes; then
-@@ -37681,8 +40707,8 @@
+ have_netsnmp_h=yes
+ else
+@@ -37595,8 +40627,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39755,7 +39948,7 @@
if test "${ac_cv_lib_netsnmp_snmp_sess_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37695,40 +40721,52 @@
+@@ -37609,40 +40641,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39820,15 +40013,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37737,14 +40775,15 @@
+@@ -37651,14 +40695,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_netsnmp_snmp_sess_init=no
+ ac_cv_lib_netsnmp_snmp_sess_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39839,7 +40033,7 @@
if test $ac_cv_lib_netsnmp_snmp_sess_init = yes; then
LIBSNMP="-lnetsnmp"
-@@ -37758,8 +40797,8 @@
+@@ -37672,8 +40717,8 @@
fi
if test "$enable_snmp" != yes; then
@@ -39850,7 +40044,7 @@
kde_save_LDFLAGS="$LDFLAGS"
-@@ -37770,8 +40809,8 @@
+@@ -37684,8 +40729,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39861,7 +40055,7 @@
if test "${ac_cv_lib_netsnmp_snmp_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37784,40 +40823,52 @@
+@@ -37698,40 +40743,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39926,15 +40120,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37826,24 +40877,25 @@
+@@ -37740,24 +40797,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_netsnmp_snmp_open=no
+ ac_cv_lib_netsnmp_snmp_open=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39959,7 +40154,7 @@
fi
-@@ -37872,8 +40924,8 @@
+@@ -37786,8 +40844,8 @@
#MIN_CONFIG
@@ -39970,7 +40165,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37899,24 +40951,36 @@
+@@ -37813,24 +40871,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40015,7 +40210,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37942,24 +41006,36 @@
+@@ -37856,24 +40926,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40060,15 +40255,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37968,14 +41044,15 @@
+@@ -37882,14 +40964,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40078,7 +40274,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -37985,11 +41062,11 @@
+@@ -37899,11 +40982,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40094,7 +40290,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -38000,24 +41077,36 @@
+@@ -37914,24 +40997,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40139,17 +40335,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38036,7 +41125,9 @@
+@@ -37950,8 +41045,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38045,27 +41136,41 @@
+ /* confdefs.h. */
+@@ -37959,27 +41056,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40198,7 +40396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38078,13 +41183,16 @@
+@@ -37992,13 +41103,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -40208,8 +40406,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -40218,7 +40417,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -38103,8 +41211,8 @@
+@@ -38017,8 +41131,8 @@
esac
@@ -40229,7 +40428,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38140,8 +41248,8 @@
+@@ -38054,8 +41168,8 @@
fi
@@ -40240,7 +40439,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -38151,8 +41259,8 @@
+@@ -38065,8 +41179,8 @@
@@ -40251,7 +40450,7 @@
if test "${kde_cv_pythondir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -38168,19 +41276,19 @@
+@@ -38082,19 +41196,19 @@
@@ -40277,7 +40476,7 @@
-@@ -38194,8 +41302,8 @@
+@@ -38108,8 +41222,8 @@
version=""2.4""
fi
@@ -40288,61 +40487,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38204,7 +41312,7 @@
+@@ -38118,7 +41232,7 @@
do
for j in Python.h;
do
-- echo "configure: 38207: $i/$j" >&5
-+ echo "configure: 41315: $i/$j" >&5
+- echo "configure: 38121: $i/$j" >&5
++ echo "configure: 41235: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38220,7 +41328,7 @@
+@@ -38134,7 +41248,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38223: $i/$j" >&5
-+ echo "configure: 41331: $i/$j" >&5
+- echo "configure: 38137: $i/$j" >&5
++ echo "configure: 41251: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38244,7 +41352,7 @@
+@@ -38158,7 +41272,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38247: $i/$j" >&5
-+ echo "configure: 41355: $i/$j" >&5
+- echo "configure: 38161: $i/$j" >&5
++ echo "configure: 41275: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38260,7 +41368,7 @@
+@@ -38174,7 +41288,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38263: $i/$j" >&5
-+ echo "configure: 41371: $i/$j" >&5
+- echo "configure: 38177: $i/$j" >&5
++ echo "configure: 41291: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38276,7 +41384,7 @@
+@@ -38190,7 +41304,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38279: $i/$j" >&5
-+ echo "configure: 41387: $i/$j" >&5
+- echo "configure: 38193: $i/$j" >&5
++ echo "configure: 41307: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38304,7 +41412,7 @@
+@@ -38218,7 +41332,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38307: $i/$j" >&5
-+ echo "configure: 41415: $i/$j" >&5
+- echo "configure: 38221: $i/$j" >&5
++ echo "configure: 41335: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38320,8 +41428,8 @@
+@@ -38234,8 +41348,8 @@
PYTHONMODDIR=$python_moddir
@@ -40353,7 +40552,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38338,8 +41446,8 @@
+@@ -38252,8 +41366,8 @@
version=""2.3""
fi
@@ -40364,61 +40563,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38348,7 +41456,7 @@
+@@ -38262,7 +41376,7 @@
do
for j in Python.h;
do
-- echo "configure: 38351: $i/$j" >&5
-+ echo "configure: 41459: $i/$j" >&5
+- echo "configure: 38265: $i/$j" >&5
++ echo "configure: 41379: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38364,7 +41472,7 @@
+@@ -38278,7 +41392,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38367: $i/$j" >&5
-+ echo "configure: 41475: $i/$j" >&5
+- echo "configure: 38281: $i/$j" >&5
++ echo "configure: 41395: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38388,7 +41496,7 @@
+@@ -38302,7 +41416,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38391: $i/$j" >&5
-+ echo "configure: 41499: $i/$j" >&5
+- echo "configure: 38305: $i/$j" >&5
++ echo "configure: 41419: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38404,7 +41512,7 @@
+@@ -38318,7 +41432,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38407: $i/$j" >&5
-+ echo "configure: 41515: $i/$j" >&5
+- echo "configure: 38321: $i/$j" >&5
++ echo "configure: 41435: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38420,7 +41528,7 @@
+@@ -38334,7 +41448,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38423: $i/$j" >&5
-+ echo "configure: 41531: $i/$j" >&5
+- echo "configure: 38337: $i/$j" >&5
++ echo "configure: 41451: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38448,7 +41556,7 @@
+@@ -38362,7 +41476,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38451: $i/$j" >&5
-+ echo "configure: 41559: $i/$j" >&5
+- echo "configure: 38365: $i/$j" >&5
++ echo "configure: 41479: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38464,8 +41572,8 @@
+@@ -38378,8 +41492,8 @@
PYTHONMODDIR=$python_moddir
@@ -40429,7 +40628,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38482,8 +41590,8 @@
+@@ -38396,8 +41510,8 @@
version=""2.2""
fi
@@ -40440,61 +40639,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38492,7 +41600,7 @@
+@@ -38406,7 +41520,7 @@
do
for j in Python.h;
do
-- echo "configure: 38495: $i/$j" >&5
-+ echo "configure: 41603: $i/$j" >&5
+- echo "configure: 38409: $i/$j" >&5
++ echo "configure: 41523: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38508,7 +41616,7 @@
+@@ -38422,7 +41536,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38511: $i/$j" >&5
-+ echo "configure: 41619: $i/$j" >&5
+- echo "configure: 38425: $i/$j" >&5
++ echo "configure: 41539: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38532,7 +41640,7 @@
+@@ -38446,7 +41560,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38535: $i/$j" >&5
-+ echo "configure: 41643: $i/$j" >&5
+- echo "configure: 38449: $i/$j" >&5
++ echo "configure: 41563: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38548,7 +41656,7 @@
+@@ -38462,7 +41576,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38551: $i/$j" >&5
-+ echo "configure: 41659: $i/$j" >&5
+- echo "configure: 38465: $i/$j" >&5
++ echo "configure: 41579: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38564,7 +41672,7 @@
+@@ -38478,7 +41592,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38567: $i/$j" >&5
-+ echo "configure: 41675: $i/$j" >&5
+- echo "configure: 38481: $i/$j" >&5
++ echo "configure: 41595: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38592,7 +41700,7 @@
+@@ -38506,7 +41620,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38595: $i/$j" >&5
-+ echo "configure: 41703: $i/$j" >&5
+- echo "configure: 38509: $i/$j" >&5
++ echo "configure: 41623: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38608,8 +41716,8 @@
+@@ -38522,8 +41636,8 @@
PYTHONMODDIR=$python_moddir
@@ -40505,7 +40704,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38626,8 +41734,8 @@
+@@ -38540,8 +41654,8 @@
version=""2.1""
fi
@@ -40516,61 +40715,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38636,7 +41744,7 @@
+@@ -38550,7 +41664,7 @@
do
for j in Python.h;
do
-- echo "configure: 38639: $i/$j" >&5
-+ echo "configure: 41747: $i/$j" >&5
+- echo "configure: 38553: $i/$j" >&5
++ echo "configure: 41667: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38652,7 +41760,7 @@
+@@ -38566,7 +41680,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38655: $i/$j" >&5
-+ echo "configure: 41763: $i/$j" >&5
+- echo "configure: 38569: $i/$j" >&5
++ echo "configure: 41683: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38676,7 +41784,7 @@
+@@ -38590,7 +41704,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38679: $i/$j" >&5
-+ echo "configure: 41787: $i/$j" >&5
+- echo "configure: 38593: $i/$j" >&5
++ echo "configure: 41707: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38692,7 +41800,7 @@
+@@ -38606,7 +41720,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38695: $i/$j" >&5
-+ echo "configure: 41803: $i/$j" >&5
+- echo "configure: 38609: $i/$j" >&5
++ echo "configure: 41723: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38708,7 +41816,7 @@
+@@ -38622,7 +41736,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38711: $i/$j" >&5
-+ echo "configure: 41819: $i/$j" >&5
+- echo "configure: 38625: $i/$j" >&5
++ echo "configure: 41739: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38736,7 +41844,7 @@
+@@ -38650,7 +41764,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38739: $i/$j" >&5
-+ echo "configure: 41847: $i/$j" >&5
+- echo "configure: 38653: $i/$j" >&5
++ echo "configure: 41767: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38752,8 +41860,8 @@
+@@ -38666,8 +41780,8 @@
PYTHONMODDIR=$python_moddir
@@ -40581,7 +40780,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38770,8 +41878,8 @@
+@@ -38684,8 +41798,8 @@
version=""2.0""
fi
@@ -40592,61 +40791,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38780,7 +41888,7 @@
+@@ -38694,7 +41808,7 @@
do
for j in Python.h;
do
-- echo "configure: 38783: $i/$j" >&5
-+ echo "configure: 41891: $i/$j" >&5
+- echo "configure: 38697: $i/$j" >&5
++ echo "configure: 41811: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38796,7 +41904,7 @@
+@@ -38710,7 +41824,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38799: $i/$j" >&5
-+ echo "configure: 41907: $i/$j" >&5
+- echo "configure: 38713: $i/$j" >&5
++ echo "configure: 41827: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38820,7 +41928,7 @@
+@@ -38734,7 +41848,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38823: $i/$j" >&5
-+ echo "configure: 41931: $i/$j" >&5
+- echo "configure: 38737: $i/$j" >&5
++ echo "configure: 41851: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38836,7 +41944,7 @@
+@@ -38750,7 +41864,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38839: $i/$j" >&5
-+ echo "configure: 41947: $i/$j" >&5
+- echo "configure: 38753: $i/$j" >&5
++ echo "configure: 41867: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38852,7 +41960,7 @@
+@@ -38766,7 +41880,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38855: $i/$j" >&5
-+ echo "configure: 41963: $i/$j" >&5
+- echo "configure: 38769: $i/$j" >&5
++ echo "configure: 41883: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38880,7 +41988,7 @@
+@@ -38794,7 +41908,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38883: $i/$j" >&5
-+ echo "configure: 41991: $i/$j" >&5
+- echo "configure: 38797: $i/$j" >&5
++ echo "configure: 41911: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38896,8 +42004,8 @@
+@@ -38810,8 +41924,8 @@
PYTHONMODDIR=$python_moddir
@@ -40657,7 +40856,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38914,8 +42022,8 @@
+@@ -38828,8 +41942,8 @@
version=""
fi
@@ -40668,61 +40867,61 @@
python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-@@ -38924,7 +42032,7 @@
+@@ -38838,7 +41952,7 @@
do
for j in Python.h;
do
-- echo "configure: 38927: $i/$j" >&5
-+ echo "configure: 42035: $i/$j" >&5
+- echo "configure: 38841: $i/$j" >&5
++ echo "configure: 41955: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38940,7 +42048,7 @@
+@@ -38854,7 +41968,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38943: $i/$j" >&5
-+ echo "configure: 42051: $i/$j" >&5
+- echo "configure: 38857: $i/$j" >&5
++ echo "configure: 41971: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38964,7 +42072,7 @@
+@@ -38878,7 +41992,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38967: $i/$j" >&5
-+ echo "configure: 42075: $i/$j" >&5
+- echo "configure: 38881: $i/$j" >&5
++ echo "configure: 41995: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38980,7 +42088,7 @@
+@@ -38894,7 +42008,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38983: $i/$j" >&5
-+ echo "configure: 42091: $i/$j" >&5
+- echo "configure: 38897: $i/$j" >&5
++ echo "configure: 42011: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38996,7 +42104,7 @@
+@@ -38910,7 +42024,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38999: $i/$j" >&5
-+ echo "configure: 42107: $i/$j" >&5
+- echo "configure: 38913: $i/$j" >&5
++ echo "configure: 42027: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -39024,7 +42132,7 @@
+@@ -38938,7 +42052,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 39027: $i/$j" >&5
-+ echo "configure: 42135: $i/$j" >&5
+- echo "configure: 38941: $i/$j" >&5
++ echo "configure: 42055: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -39040,8 +42148,8 @@
+@@ -38954,8 +42068,8 @@
PYTHONMODDIR=$python_moddir
@@ -40733,7 +40932,7 @@
if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then
LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -39054,11 +42162,11 @@
+@@ -38968,11 +42082,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -40749,7 +40948,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -39092,24 +42200,36 @@
+@@ -39006,24 +42120,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40794,7 +40993,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39118,9 +42238,10 @@
+@@ -39032,10 +42158,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40802,11 +41001,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39131,16 +42252,16 @@
+ LIBS="$kde_save_libs"
+@@ -39045,16 +42172,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -40827,7 +41028,7 @@
fi
-@@ -39151,11 +42272,11 @@
+@@ -39065,11 +42192,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -40843,7 +41044,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -39189,24 +42310,36 @@
+@@ -39103,24 +42230,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40888,7 +41089,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39215,9 +42348,10 @@
+@@ -39129,10 +42268,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40896,11 +41097,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39228,16 +42362,16 @@
+ LIBS="$kde_save_libs"
+@@ -39142,16 +42282,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -40921,7 +41124,7 @@
fi
-@@ -39248,11 +42382,11 @@
+@@ -39162,11 +42302,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -40937,7 +41140,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -39286,24 +42420,36 @@
+@@ -39200,24 +42340,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -40982,7 +41185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39312,9 +42458,10 @@
+@@ -39226,10 +42378,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40990,11 +41193,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39325,16 +42472,16 @@
+ LIBS="$kde_save_libs"
+@@ -39239,16 +42392,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -41015,7 +41220,7 @@
fi
-@@ -39345,11 +42492,11 @@
+@@ -39259,11 +42412,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -41031,7 +41236,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -39383,24 +42530,36 @@
+@@ -39297,24 +42450,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41076,7 +41281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39409,9 +42568,10 @@
+@@ -39323,10 +42488,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41084,11 +41289,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39422,16 +42582,16 @@
+ LIBS="$kde_save_libs"
+@@ -39336,16 +42502,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -41109,7 +41316,7 @@
fi
-@@ -39442,11 +42602,11 @@
+@@ -39356,11 +42522,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -41125,7 +41332,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -39480,24 +42640,36 @@
+@@ -39394,24 +42560,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41170,7 +41377,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39506,9 +42678,10 @@
+@@ -39420,10 +42598,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41178,11 +41385,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39519,16 +42692,16 @@
+ LIBS="$kde_save_libs"
+@@ -39433,16 +42612,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -41203,7 +41412,7 @@
fi
-@@ -39539,11 +42712,11 @@
+@@ -39453,11 +42632,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -41219,7 +41428,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -39577,24 +42750,36 @@
+@@ -39491,24 +42670,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41264,7 +41473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39603,9 +42788,10 @@
+@@ -39517,10 +42708,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41272,11 +41481,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39616,16 +42802,16 @@
+ LIBS="$kde_save_libs"
+@@ -39530,16 +42722,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -41297,7 +41508,7 @@
fi
-@@ -39636,11 +42822,11 @@
+@@ -39550,11 +42742,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -41313,7 +41524,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -39674,24 +42860,36 @@
+@@ -39588,24 +42780,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41358,7 +41569,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39700,9 +42898,10 @@
+@@ -39614,10 +42818,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41366,11 +41577,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39713,16 +42912,16 @@
+ LIBS="$kde_save_libs"
+@@ -39627,16 +42832,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -41391,7 +41604,7 @@
fi
-@@ -39733,11 +42932,11 @@
+@@ -39647,11 +42852,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -41407,7 +41620,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -39771,24 +42970,36 @@
+@@ -39685,24 +42890,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41452,7 +41665,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39797,9 +43008,10 @@
+@@ -39711,10 +42928,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41460,11 +41673,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39810,16 +43022,16 @@
+ LIBS="$kde_save_libs"
+@@ -39724,16 +42942,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -41485,7 +41700,7 @@
fi
-@@ -39830,11 +43042,11 @@
+@@ -39744,11 +42962,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -41501,7 +41716,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -39868,24 +43080,36 @@
+@@ -39782,24 +43000,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41546,7 +41761,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39894,9 +43118,10 @@
+@@ -39808,10 +43038,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41554,11 +41769,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -39907,16 +43132,16 @@
+ LIBS="$kde_save_libs"
+@@ -39821,16 +43052,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -41579,7 +41796,7 @@
fi
-@@ -39927,11 +43152,11 @@
+@@ -39841,11 +43072,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -41595,7 +41812,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -39965,24 +43190,36 @@
+@@ -39879,24 +43110,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41640,7 +41857,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39991,9 +43228,10 @@
+@@ -39905,10 +43148,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41648,11 +41865,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40004,16 +43242,16 @@
+ LIBS="$kde_save_libs"
+@@ -39918,16 +43162,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -41673,7 +41892,7 @@
fi
-@@ -40024,11 +43262,11 @@
+@@ -39938,11 +43182,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -41689,7 +41908,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -40062,24 +43300,36 @@
+@@ -39976,24 +43220,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41734,7 +41953,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40088,9 +43338,10 @@
+@@ -40002,10 +43258,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41742,11 +41961,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40101,16 +43352,16 @@
+ LIBS="$kde_save_libs"
+@@ -40015,16 +43272,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -41767,7 +41988,7 @@
fi
-@@ -40121,11 +43372,11 @@
+@@ -40035,11 +43292,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -41783,7 +42004,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -40159,24 +43410,36 @@
+@@ -40073,24 +43330,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41828,7 +42049,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40185,9 +43448,10 @@
+@@ -40099,10 +43368,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41836,11 +42057,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40198,16 +43462,16 @@
+ LIBS="$kde_save_libs"
+@@ -40112,16 +43382,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -41861,7 +42084,7 @@
fi
-@@ -40218,11 +43482,11 @@
+@@ -40132,11 +43402,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -41877,7 +42100,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -40256,24 +43520,36 @@
+@@ -40170,24 +43440,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41922,7 +42145,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40282,9 +43558,10 @@
+@@ -40196,10 +43478,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41930,11 +42153,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40295,16 +43572,16 @@
+ LIBS="$kde_save_libs"
+@@ -40209,16 +43492,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -41955,7 +42180,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -40337,11 +43614,11 @@
+@@ -40251,11 +43534,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -41971,7 +42196,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -40375,24 +43652,36 @@
+@@ -40289,24 +43572,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42016,7 +42241,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40401,9 +43690,10 @@
+@@ -40315,10 +43610,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42024,11 +42249,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40414,16 +43704,16 @@
+ LIBS="$kde_save_libs"
+@@ -40328,16 +43624,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -42049,7 +42276,7 @@
fi
-@@ -40434,11 +43724,11 @@
+@@ -40348,11 +43644,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -42065,7 +42292,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -40472,24 +43762,36 @@
+@@ -40386,24 +43682,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42110,7 +42337,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40498,9 +43800,10 @@
+@@ -40412,10 +43720,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42118,11 +42345,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40511,16 +43814,16 @@
+ LIBS="$kde_save_libs"
+@@ -40425,16 +43734,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -42143,7 +42372,7 @@
fi
-@@ -40531,11 +43834,11 @@
+@@ -40445,11 +43754,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -42159,7 +42388,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -40569,24 +43872,36 @@
+@@ -40483,24 +43792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42204,7 +42433,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40595,9 +43910,10 @@
+@@ -40509,10 +43830,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42212,11 +42441,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40608,16 +43924,16 @@
+ LIBS="$kde_save_libs"
+@@ -40522,16 +43844,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -42237,7 +42468,7 @@
fi
-@@ -40628,11 +43944,11 @@
+@@ -40542,11 +43864,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -42253,7 +42484,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -40666,24 +43982,36 @@
+@@ -40580,24 +43902,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42298,7 +42529,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40692,9 +44020,10 @@
+@@ -40606,10 +43940,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42306,11 +42537,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40705,16 +44034,16 @@
+ LIBS="$kde_save_libs"
+@@ -40619,16 +43954,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -42331,7 +42564,7 @@
fi
-@@ -40725,11 +44054,11 @@
+@@ -40639,11 +43974,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -42347,7 +42580,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -40763,24 +44092,36 @@
+@@ -40677,24 +44012,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42392,7 +42625,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40789,9 +44130,10 @@
+@@ -40703,10 +44050,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42400,11 +42633,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40802,16 +44144,16 @@
+ LIBS="$kde_save_libs"
+@@ -40716,16 +44064,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -42425,7 +42660,7 @@
fi
-@@ -40822,11 +44164,11 @@
+@@ -40736,11 +44084,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -42441,7 +42676,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -40860,24 +44202,36 @@
+@@ -40774,24 +44122,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42486,7 +42721,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40886,9 +44240,10 @@
+@@ -40800,10 +44160,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42494,11 +42729,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40899,16 +44254,16 @@
+ LIBS="$kde_save_libs"
+@@ -40813,16 +44174,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -42519,7 +42756,7 @@
fi
-@@ -40919,11 +44274,11 @@
+@@ -40833,11 +44194,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -42535,7 +42772,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -40957,24 +44312,36 @@
+@@ -40871,24 +44232,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42580,7 +42817,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40983,9 +44350,10 @@
+@@ -40897,10 +44270,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42588,11 +42825,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -40996,16 +44364,16 @@
+ LIBS="$kde_save_libs"
+@@ -40910,16 +44284,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -42613,7 +42852,7 @@
fi
-@@ -41016,11 +44384,11 @@
+@@ -40930,11 +44304,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -42629,7 +42868,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -41054,24 +44422,36 @@
+@@ -40968,24 +44342,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42674,7 +42913,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41080,9 +44460,10 @@
+@@ -40994,10 +44380,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42682,11 +42921,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41093,16 +44474,16 @@
+ LIBS="$kde_save_libs"
+@@ -41007,16 +44394,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -42707,7 +42948,7 @@
fi
-@@ -41113,11 +44494,11 @@
+@@ -41027,11 +44414,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -42723,7 +42964,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -41151,24 +44532,36 @@
+@@ -41065,24 +44452,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42768,7 +43009,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41177,9 +44570,10 @@
+@@ -41091,10 +44490,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42776,11 +43017,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41190,16 +44584,16 @@
+ LIBS="$kde_save_libs"
+@@ -41104,16 +44504,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -42801,7 +43044,7 @@
fi
-@@ -41210,11 +44604,11 @@
+@@ -41124,11 +44524,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -42817,7 +43060,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -41248,24 +44642,36 @@
+@@ -41162,24 +44562,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42862,7 +43105,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41274,9 +44680,10 @@
+@@ -41188,10 +44600,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42870,11 +43113,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41287,16 +44694,16 @@
+ LIBS="$kde_save_libs"
+@@ -41201,16 +44614,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -42895,7 +43140,7 @@
fi
-@@ -41307,11 +44714,11 @@
+@@ -41221,11 +44634,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -42911,7 +43156,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -41345,24 +44752,36 @@
+@@ -41259,24 +44672,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42956,7 +43201,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41371,9 +44790,10 @@
+@@ -41285,10 +44710,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42964,11 +43209,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41384,16 +44804,16 @@
+ LIBS="$kde_save_libs"
+@@ -41298,16 +44724,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -42989,7 +43236,7 @@
fi
-@@ -41404,11 +44824,11 @@
+@@ -41318,11 +44744,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -43005,7 +43252,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -41442,24 +44862,36 @@
+@@ -41356,24 +44782,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43050,7 +43297,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41468,9 +44900,10 @@
+@@ -41382,10 +44820,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43058,11 +43305,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41481,16 +44914,16 @@
+ LIBS="$kde_save_libs"
+@@ -41395,16 +44834,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -43083,7 +43332,7 @@
fi
-@@ -41501,11 +44934,11 @@
+@@ -41415,11 +44854,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -43099,7 +43348,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -41539,24 +44972,36 @@
+@@ -41453,24 +44892,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43144,7 +43393,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41565,9 +45010,10 @@
+@@ -41479,10 +44930,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43152,11 +43401,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41578,16 +45024,16 @@
+ LIBS="$kde_save_libs"
+@@ -41492,16 +44944,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -43177,7 +43428,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -41621,11 +45067,11 @@
+@@ -41535,11 +44987,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -43193,7 +43444,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -41659,24 +45105,36 @@
+@@ -41573,24 +45025,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43238,7 +43489,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41685,9 +45143,10 @@
+@@ -41599,10 +45063,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43246,11 +43497,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41698,16 +45157,16 @@
+ LIBS="$kde_save_libs"
+@@ -41612,16 +45077,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -43271,7 +43524,7 @@
fi
-@@ -41718,11 +45177,11 @@
+@@ -41632,11 +45097,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -43287,7 +43540,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -41756,24 +45215,36 @@
+@@ -41670,24 +45135,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43332,7 +43585,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41782,9 +45253,10 @@
+@@ -41696,10 +45173,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43340,11 +43593,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41795,16 +45267,16 @@
+ LIBS="$kde_save_libs"
+@@ -41709,16 +45187,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -43365,7 +43620,7 @@
fi
-@@ -41815,11 +45287,11 @@
+@@ -41729,11 +45207,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -43381,7 +43636,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -41853,24 +45325,36 @@
+@@ -41767,24 +45245,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43426,7 +43681,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41879,9 +45363,10 @@
+@@ -41793,10 +45283,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43434,11 +43689,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41892,16 +45377,16 @@
+ LIBS="$kde_save_libs"
+@@ -41806,16 +45297,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -43459,7 +43716,7 @@
fi
-@@ -41912,11 +45397,11 @@
+@@ -41826,11 +45317,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -43475,7 +43732,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -41950,24 +45435,36 @@
+@@ -41864,24 +45355,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43520,7 +43777,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41976,9 +45473,10 @@
+@@ -41890,10 +45393,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43528,11 +43785,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -41989,16 +45487,16 @@
+ LIBS="$kde_save_libs"
+@@ -41903,16 +45407,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -43553,7 +43812,7 @@
fi
-@@ -42009,11 +45507,11 @@
+@@ -41923,11 +45427,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -43569,7 +43828,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -42047,24 +45545,36 @@
+@@ -41961,24 +45465,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43614,7 +43873,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42073,9 +45583,10 @@
+@@ -41987,10 +45503,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43622,11 +43881,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42086,16 +45597,16 @@
+ LIBS="$kde_save_libs"
+@@ -42000,16 +45517,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -43647,7 +43908,7 @@
fi
-@@ -42106,11 +45617,11 @@
+@@ -42020,11 +45537,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -43663,7 +43924,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -42144,24 +45655,36 @@
+@@ -42058,24 +45575,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43708,7 +43969,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42170,9 +45693,10 @@
+@@ -42084,10 +45613,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43716,11 +43977,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42183,16 +45707,16 @@
+ LIBS="$kde_save_libs"
+@@ -42097,16 +45627,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -43741,7 +44004,7 @@
fi
-@@ -42203,11 +45727,11 @@
+@@ -42117,11 +45647,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -43757,7 +44020,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -42241,24 +45765,36 @@
+@@ -42155,24 +45685,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43802,7 +44065,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42267,9 +45803,10 @@
+@@ -42181,10 +45723,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43810,11 +44073,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42280,16 +45817,16 @@
+ LIBS="$kde_save_libs"
+@@ -42194,16 +45737,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -43835,7 +44100,7 @@
fi
-@@ -42300,11 +45837,11 @@
+@@ -42214,11 +45757,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -43851,7 +44116,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -42338,24 +45875,36 @@
+@@ -42252,24 +45795,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43896,7 +44161,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42364,9 +45913,10 @@
+@@ -42278,10 +45833,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43904,11 +44169,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42377,16 +45927,16 @@
+ LIBS="$kde_save_libs"
+@@ -42291,16 +45847,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -43929,7 +44196,7 @@
fi
-@@ -42397,11 +45947,11 @@
+@@ -42311,11 +45867,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -43945,7 +44212,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -42435,24 +45985,36 @@
+@@ -42349,24 +45905,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43990,7 +44257,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42461,9 +46023,10 @@
+@@ -42375,10 +45943,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43998,11 +44265,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42474,16 +46037,16 @@
+ LIBS="$kde_save_libs"
+@@ -42388,16 +45957,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -44023,7 +44292,7 @@
fi
-@@ -42494,11 +46057,11 @@
+@@ -42408,11 +45977,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -44039,7 +44308,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -42532,24 +46095,36 @@
+@@ -42446,24 +46015,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44084,7 +44353,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42558,9 +46133,10 @@
+@@ -42472,10 +46053,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44092,11 +44361,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42571,16 +46147,16 @@
+ LIBS="$kde_save_libs"
+@@ -42485,16 +46067,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -44117,7 +44388,7 @@
fi
-@@ -42591,11 +46167,11 @@
+@@ -42505,11 +46087,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -44133,7 +44404,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -42629,24 +46205,36 @@
+@@ -42543,24 +46125,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44178,7 +44449,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42655,9 +46243,10 @@
+@@ -42569,10 +46163,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44186,11 +44457,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42668,16 +46257,16 @@
+ LIBS="$kde_save_libs"
+@@ -42582,16 +46177,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -44211,7 +44484,7 @@
fi
-@@ -42688,11 +46277,11 @@
+@@ -42602,11 +46197,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -44227,7 +44500,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -42726,24 +46315,36 @@
+@@ -42640,24 +46235,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44272,7 +44545,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42752,9 +46353,10 @@
+@@ -42666,10 +46273,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44280,11 +44553,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42765,16 +46367,16 @@
+ LIBS="$kde_save_libs"
+@@ -42679,16 +46287,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -44305,7 +44580,7 @@
fi
-@@ -42785,11 +46387,11 @@
+@@ -42699,11 +46307,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -44321,7 +44596,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -42823,24 +46425,36 @@
+@@ -42737,24 +46345,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44366,7 +44641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42849,9 +46463,10 @@
+@@ -42763,10 +46383,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44374,11 +44649,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42862,16 +46477,16 @@
+ LIBS="$kde_save_libs"
+@@ -42776,16 +46397,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -44399,7 +44676,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -42905,11 +46520,11 @@
+@@ -42819,11 +46440,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -44415,7 +44692,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -42943,24 +46558,36 @@
+@@ -42857,24 +46478,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44460,7 +44737,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42969,9 +46596,10 @@
+@@ -42883,10 +46516,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44468,11 +44745,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -42982,16 +46610,16 @@
+ LIBS="$kde_save_libs"
+@@ -42896,16 +46530,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -44493,7 +44772,7 @@
fi
-@@ -43002,11 +46630,11 @@
+@@ -42916,11 +46550,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -44509,7 +44788,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -43040,24 +46668,36 @@
+@@ -42954,24 +46588,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44554,7 +44833,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43066,9 +46706,10 @@
+@@ -42980,10 +46626,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44562,11 +44841,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43079,16 +46720,16 @@
+ LIBS="$kde_save_libs"
+@@ -42993,16 +46640,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -44587,7 +44868,7 @@
fi
-@@ -43099,11 +46740,11 @@
+@@ -43013,11 +46660,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -44603,7 +44884,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -43137,24 +46778,36 @@
+@@ -43051,24 +46698,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44648,7 +44929,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43163,9 +46816,10 @@
+@@ -43077,10 +46736,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44656,11 +44937,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43176,16 +46830,16 @@
+ LIBS="$kde_save_libs"
+@@ -43090,16 +46750,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -44681,7 +44964,7 @@
fi
-@@ -43196,11 +46850,11 @@
+@@ -43110,11 +46770,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -44697,7 +44980,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -43234,24 +46888,36 @@
+@@ -43148,24 +46808,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44742,7 +45025,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43260,9 +46926,10 @@
+@@ -43174,10 +46846,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44750,11 +45033,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43273,16 +46940,16 @@
+ LIBS="$kde_save_libs"
+@@ -43187,16 +46860,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -44775,7 +45060,7 @@
fi
-@@ -43293,11 +46960,11 @@
+@@ -43207,11 +46880,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -44791,7 +45076,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -43331,24 +46998,36 @@
+@@ -43245,24 +46918,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44836,7 +45121,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43357,9 +47036,10 @@
+@@ -43271,10 +46956,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44844,11 +45129,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43370,16 +47050,16 @@
+ LIBS="$kde_save_libs"
+@@ -43284,16 +46970,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -44869,7 +45156,7 @@
fi
-@@ -43390,11 +47070,11 @@
+@@ -43304,11 +46990,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -44885,7 +45172,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -43428,24 +47108,36 @@
+@@ -43342,24 +47028,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44930,7 +45217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43454,9 +47146,10 @@
+@@ -43368,10 +47066,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44938,11 +45225,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43467,16 +47160,16 @@
+ LIBS="$kde_save_libs"
+@@ -43381,16 +47080,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -44963,7 +45252,7 @@
fi
-@@ -43487,11 +47180,11 @@
+@@ -43401,11 +47100,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -44979,7 +45268,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -43525,24 +47218,36 @@
+@@ -43439,24 +47138,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45024,7 +45313,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43551,9 +47256,10 @@
+@@ -43465,10 +47176,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45032,11 +45321,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43564,16 +47270,16 @@
+ LIBS="$kde_save_libs"
+@@ -43478,16 +47190,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -45057,7 +45348,7 @@
fi
-@@ -43584,11 +47290,11 @@
+@@ -43498,11 +47210,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -45073,7 +45364,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -43622,24 +47328,36 @@
+@@ -43536,24 +47248,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45118,7 +45409,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43648,9 +47366,10 @@
+@@ -43562,10 +47286,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45126,11 +45417,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43661,16 +47380,16 @@
+ LIBS="$kde_save_libs"
+@@ -43575,16 +47300,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -45151,7 +45444,7 @@
fi
-@@ -43681,11 +47400,11 @@
+@@ -43595,11 +47320,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -45167,7 +45460,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -43719,24 +47438,36 @@
+@@ -43633,24 +47358,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45212,7 +45505,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43745,9 +47476,10 @@
+@@ -43659,10 +47396,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45220,11 +45513,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43758,16 +47490,16 @@
+ LIBS="$kde_save_libs"
+@@ -43672,16 +47410,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -45245,7 +45540,7 @@
fi
-@@ -43778,11 +47510,11 @@
+@@ -43692,11 +47430,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -45261,7 +45556,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -43816,24 +47548,36 @@
+@@ -43730,24 +47468,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45306,7 +45601,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43842,9 +47586,10 @@
+@@ -43756,10 +47506,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45314,11 +45609,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43855,16 +47600,16 @@
+ LIBS="$kde_save_libs"
+@@ -43769,16 +47520,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -45339,7 +45636,7 @@
fi
-@@ -43875,11 +47620,11 @@
+@@ -43789,11 +47540,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -45355,7 +45652,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -43913,24 +47658,36 @@
+@@ -43827,24 +47578,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45400,7 +45697,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43939,9 +47696,10 @@
+@@ -43853,10 +47616,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45408,11 +45705,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -43952,16 +47710,16 @@
+ LIBS="$kde_save_libs"
+@@ -43866,16 +47630,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -45433,7 +45732,7 @@
fi
-@@ -43972,11 +47730,11 @@
+@@ -43886,11 +47650,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -45449,7 +45748,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -44010,24 +47768,36 @@
+@@ -43924,24 +47688,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45494,7 +45793,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44036,9 +47806,10 @@
+@@ -43950,10 +47726,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45502,11 +45801,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44049,16 +47820,16 @@
+ LIBS="$kde_save_libs"
+@@ -43963,16 +47740,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -45527,7 +45828,7 @@
fi
-@@ -44069,11 +47840,11 @@
+@@ -43983,11 +47760,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -45543,7 +45844,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -44107,24 +47878,36 @@
+@@ -44021,24 +47798,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45588,7 +45889,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44133,9 +47916,10 @@
+@@ -44047,10 +47836,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45596,11 +45897,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44146,16 +47930,16 @@
+ LIBS="$kde_save_libs"
+@@ -44060,16 +47850,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -45621,7 +45924,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -44189,11 +47973,11 @@
+@@ -44103,11 +47893,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -45637,7 +45940,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -44227,24 +48011,36 @@
+@@ -44141,24 +47931,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45682,7 +45985,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44253,9 +48049,10 @@
+@@ -44167,10 +47969,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45690,11 +45993,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44266,16 +48063,16 @@
+ LIBS="$kde_save_libs"
+@@ -44180,16 +47983,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -45715,7 +46020,7 @@
fi
-@@ -44286,11 +48083,11 @@
+@@ -44200,11 +48003,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -45731,7 +46036,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -44324,24 +48121,36 @@
+@@ -44238,24 +48041,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45776,7 +46081,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44350,9 +48159,10 @@
+@@ -44264,10 +48079,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45784,11 +46089,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44363,16 +48173,16 @@
+ LIBS="$kde_save_libs"
+@@ -44277,16 +48093,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -45809,7 +46116,7 @@
fi
-@@ -44383,11 +48193,11 @@
+@@ -44297,11 +48113,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -45825,7 +46132,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -44421,24 +48231,36 @@
+@@ -44335,24 +48151,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45870,7 +46177,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44447,9 +48269,10 @@
+@@ -44361,10 +48189,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45878,11 +46185,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44460,16 +48283,16 @@
+ LIBS="$kde_save_libs"
+@@ -44374,16 +48203,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -45903,7 +46212,7 @@
fi
-@@ -44480,11 +48303,11 @@
+@@ -44394,11 +48223,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -45919,7 +46228,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -44518,24 +48341,36 @@
+@@ -44432,24 +48261,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45964,7 +46273,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44544,9 +48379,10 @@
+@@ -44458,10 +48299,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45972,11 +46281,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44557,16 +48393,16 @@
+ LIBS="$kde_save_libs"
+@@ -44471,16 +48313,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -45997,7 +46308,7 @@
fi
-@@ -44577,11 +48413,11 @@
+@@ -44491,11 +48333,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -46013,7 +46324,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -44615,24 +48451,36 @@
+@@ -44529,24 +48371,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46058,7 +46369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44641,9 +48489,10 @@
+@@ -44555,10 +48409,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46066,11 +46377,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44654,16 +48503,16 @@
+ LIBS="$kde_save_libs"
+@@ -44568,16 +48423,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -46091,7 +46404,7 @@
fi
-@@ -44674,11 +48523,11 @@
+@@ -44588,11 +48443,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -46107,7 +46420,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -44712,24 +48561,36 @@
+@@ -44626,24 +48481,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46152,7 +46465,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44738,9 +48599,10 @@
+@@ -44652,10 +48519,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46160,11 +46473,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44751,16 +48613,16 @@
+ LIBS="$kde_save_libs"
+@@ -44665,16 +48533,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -46185,7 +46500,7 @@
fi
-@@ -44771,11 +48633,11 @@
+@@ -44685,11 +48553,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -46201,7 +46516,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -44809,24 +48671,36 @@
+@@ -44723,24 +48591,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46246,7 +46561,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44835,9 +48709,10 @@
+@@ -44749,10 +48629,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46254,11 +46569,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44848,16 +48723,16 @@
+ LIBS="$kde_save_libs"
+@@ -44762,16 +48643,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -46279,7 +46596,7 @@
fi
-@@ -44868,11 +48743,11 @@
+@@ -44782,11 +48663,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -46295,7 +46612,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -44906,24 +48781,36 @@
+@@ -44820,24 +48701,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46340,7 +46657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44932,9 +48819,10 @@
+@@ -44846,10 +48739,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46348,11 +46665,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -44945,16 +48833,16 @@
+ LIBS="$kde_save_libs"
+@@ -44859,16 +48753,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -46373,7 +46692,7 @@
fi
-@@ -44965,11 +48853,11 @@
+@@ -44879,11 +48773,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -46389,7 +46708,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -45003,24 +48891,36 @@
+@@ -44917,24 +48811,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46434,7 +46753,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45029,9 +48929,10 @@
+@@ -44943,10 +48849,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46442,11 +46761,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45042,16 +48943,16 @@
+ LIBS="$kde_save_libs"
+@@ -44956,16 +48863,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -46467,7 +46788,7 @@
fi
-@@ -45062,11 +48963,11 @@
+@@ -44976,11 +48883,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -46483,7 +46804,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -45100,24 +49001,36 @@
+@@ -45014,24 +48921,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46528,7 +46849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45126,9 +49039,10 @@
+@@ -45040,10 +48959,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46536,11 +46857,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45139,16 +49053,16 @@
+ LIBS="$kde_save_libs"
+@@ -45053,16 +48973,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -46561,7 +46884,7 @@
fi
-@@ -45159,11 +49073,11 @@
+@@ -45073,11 +48993,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -46577,7 +46900,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -45197,24 +49111,36 @@
+@@ -45111,24 +49031,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46622,7 +46945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45223,9 +49149,10 @@
+@@ -45137,10 +49069,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46630,11 +46953,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45236,16 +49163,16 @@
+ LIBS="$kde_save_libs"
+@@ -45150,16 +49083,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -46655,7 +46980,7 @@
fi
-@@ -45256,11 +49183,11 @@
+@@ -45170,11 +49103,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -46671,7 +46996,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -45294,24 +49221,36 @@
+@@ -45208,24 +49141,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46716,7 +47041,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45320,9 +49259,10 @@
+@@ -45234,10 +49179,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46724,11 +47049,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45333,16 +49273,16 @@
+ LIBS="$kde_save_libs"
+@@ -45247,16 +49193,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -46749,7 +47076,7 @@
fi
-@@ -45353,11 +49293,11 @@
+@@ -45267,11 +49213,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -46765,7 +47092,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -45391,24 +49331,36 @@
+@@ -45305,24 +49251,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46810,7 +47137,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45417,9 +49369,10 @@
+@@ -45331,10 +49289,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46818,11 +47145,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45430,16 +49383,16 @@
+ LIBS="$kde_save_libs"
+@@ -45344,16 +49303,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -46843,7 +47172,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -45473,11 +49426,11 @@
+@@ -45387,11 +49346,11 @@
if test "$kde_python_link_found" = no; then
if test "normal" = normal; then
@@ -46859,7 +47188,7 @@
fi
if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -45511,24 +49464,36 @@
+@@ -45425,24 +49384,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46904,7 +47233,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45537,9 +49502,10 @@
+@@ -45451,10 +49422,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46912,11 +47241,13 @@
+ kde_cv_try_link_python_normal=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45550,16 +49516,16 @@
+ LIBS="$kde_save_libs"
+@@ -45464,16 +49436,16 @@
if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -46937,7 +47268,7 @@
fi
-@@ -45570,11 +49536,11 @@
+@@ -45484,11 +49456,11 @@
if test "$kde_python_link_found" = no; then
if test "m" = normal; then
@@ -46953,7 +47284,7 @@
fi
if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -45608,24 +49574,36 @@
+@@ -45522,24 +49494,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46998,7 +47329,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45634,9 +49612,10 @@
+@@ -45548,10 +49532,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47006,11 +47337,13 @@
+ kde_cv_try_link_python_m=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45647,16 +49626,16 @@
+ LIBS="$kde_save_libs"
+@@ -45561,16 +49546,16 @@
if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -47031,7 +47364,7 @@
fi
-@@ -45667,11 +49646,11 @@
+@@ -45581,11 +49566,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread" = normal; then
@@ -47047,7 +47380,7 @@
fi
if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -45705,24 +49684,36 @@
+@@ -45619,24 +49604,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47092,7 +47425,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45731,9 +49722,10 @@
+@@ -45645,10 +49642,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47100,11 +47433,13 @@
+ kde_cv_try_link_python_pthread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45744,16 +49736,16 @@
+ LIBS="$kde_save_libs"
+@@ -45658,16 +49656,16 @@
if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -47125,7 +47460,7 @@
fi
-@@ -45764,11 +49756,11 @@
+@@ -45678,11 +49676,11 @@
if test "$kde_python_link_found" = no; then
if test "tcl" = normal; then
@@ -47141,7 +47476,7 @@
fi
if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -45802,24 +49794,36 @@
+@@ -45716,24 +49714,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47186,7 +47521,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45828,9 +49832,10 @@
+@@ -45742,10 +49752,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47194,11 +47529,13 @@
+ kde_cv_try_link_python_tcl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45841,16 +49846,16 @@
+ LIBS="$kde_save_libs"
+@@ -45755,16 +49766,16 @@
if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -47219,7 +47556,7 @@
fi
-@@ -45861,11 +49866,11 @@
+@@ -45775,11 +49786,11 @@
if test "$kde_python_link_found" = no; then
if test "db2" = normal; then
@@ -47235,7 +47572,7 @@
fi
if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -45899,24 +49904,36 @@
+@@ -45813,24 +49824,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47280,7 +47617,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45925,9 +49942,10 @@
+@@ -45839,10 +49862,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47288,11 +47625,13 @@
+ kde_cv_try_link_python_db2=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -45938,16 +49956,16 @@
+ LIBS="$kde_save_libs"
+@@ -45852,16 +49876,16 @@
if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -47313,7 +47652,7 @@
fi
-@@ -45958,11 +49976,11 @@
+@@ -45872,11 +49896,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread" = normal; then
@@ -47329,7 +47668,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -45996,24 +50014,36 @@
+@@ -45910,24 +49934,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47374,7 +47713,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46022,9 +50052,10 @@
+@@ -45936,10 +49972,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47382,11 +47721,13 @@
+ kde_cv_try_link_python_m_and_thread=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46035,16 +50066,16 @@
+ LIBS="$kde_save_libs"
+@@ -45949,16 +49986,16 @@
if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -47407,7 +47748,7 @@
fi
-@@ -46055,11 +50086,11 @@
+@@ -45969,11 +50006,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_util" = normal; then
@@ -47423,7 +47764,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -46093,24 +50124,36 @@
+@@ -46007,24 +50044,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47468,7 +47809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46119,9 +50162,10 @@
+@@ -46033,10 +50082,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47476,11 +47817,13 @@
+ kde_cv_try_link_python_m_and_thread_and_util=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46132,16 +50176,16 @@
+ LIBS="$kde_save_libs"
+@@ -46046,16 +50096,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -47501,7 +47844,7 @@
fi
-@@ -46152,11 +50196,11 @@
+@@ -46066,11 +50116,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db3" = normal; then
@@ -47517,7 +47860,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -46190,24 +50234,36 @@
+@@ -46104,24 +50154,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47562,7 +47905,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46216,9 +50272,10 @@
+@@ -46130,10 +50192,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47570,11 +47913,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46229,16 +50286,16 @@
+ LIBS="$kde_save_libs"
+@@ -46143,16 +50206,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -47595,7 +47940,7 @@
fi
-@@ -46249,11 +50306,11 @@
+@@ -46163,11 +50226,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_db3" = normal; then
@@ -47611,7 +47956,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -46287,24 +50344,36 @@
+@@ -46201,24 +50264,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47656,7 +48001,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46313,9 +50382,10 @@
+@@ -46227,10 +50302,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47664,11 +48009,13 @@
+ kde_cv_try_link_python_pthread_and_db3=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46326,16 +50396,16 @@
+ LIBS="$kde_save_libs"
+@@ -46240,16 +50316,16 @@
if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -47689,7 +48036,7 @@
fi
-@@ -46346,11 +50416,11 @@
+@@ -46260,11 +50336,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db" = normal; then
@@ -47705,7 +48052,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -46384,24 +50454,36 @@
+@@ -46298,24 +50374,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47750,7 +48097,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46410,9 +50492,10 @@
+@@ -46324,10 +50412,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47758,11 +48105,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46423,16 +50506,16 @@
+ LIBS="$kde_save_libs"
+@@ -46337,16 +50426,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -47783,7 +48132,7 @@
fi
-@@ -46443,11 +50526,11 @@
+@@ -46357,11 +50446,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_dl" = normal; then
@@ -47799,7 +48148,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -46481,24 +50564,36 @@
+@@ -46395,24 +50484,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47844,7 +48193,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46507,9 +50602,10 @@
+@@ -46421,10 +50522,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47852,11 +48201,13 @@
+ kde_cv_try_link_python_pthread_and_dl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46520,16 +50616,16 @@
+ LIBS="$kde_save_libs"
+@@ -46434,16 +50536,16 @@
if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -47877,7 +48228,7 @@
fi
-@@ -46540,11 +50636,11 @@
+@@ -46454,11 +50556,11 @@
if test "$kde_python_link_found" = no; then
if test "pthread_and_panel_curses" = normal; then
@@ -47893,7 +48244,7 @@
fi
if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -46578,24 +50674,36 @@
+@@ -46492,24 +50594,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47938,7 +48289,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46604,9 +50712,10 @@
+@@ -46518,10 +50632,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47946,11 +48297,13 @@
+ kde_cv_try_link_python_pthread_and_panel_curses=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46617,16 +50726,16 @@
+ LIBS="$kde_save_libs"
+@@ -46531,16 +50646,16 @@
if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -47971,7 +48324,7 @@
fi
-@@ -46637,11 +50746,11 @@
+@@ -46551,11 +50666,11 @@
if test "$kde_python_link_found" = no; then
if test "m_and_thread_and_db_special" = normal; then
@@ -47987,7 +48340,7 @@
fi
if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -46675,24 +50784,36 @@
+@@ -46589,24 +50704,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48032,7 +48385,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46701,9 +50822,10 @@
+@@ -46615,10 +50742,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48040,11 +48393,13 @@
+ kde_cv_try_link_python_m_and_thread_and_db_special=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$kde_save_cflags"
-@@ -46714,16 +50836,16 @@
+ LIBS="$kde_save_libs"
+@@ -46628,16 +50756,16 @@
if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -48065,7 +48420,7 @@
{ echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
and contact the authors to let them know about this problem" >&5
-@@ -46754,18 +50876,18 @@
+@@ -46668,18 +50796,18 @@
@@ -48090,7 +48445,7 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46792,24 +50914,36 @@
+@@ -46706,24 +50834,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48135,7 +48490,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46818,9 +50952,10 @@
+@@ -46732,10 +50872,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48143,11 +48498,13 @@
+ ac_cv_have_xmms="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
-@@ -46829,8 +50964,8 @@
+ LDFLAGS="$ac_LDFLAGS_save"
+@@ -46743,8 +50884,8 @@
fi
@@ -48158,7 +48515,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -46871,8 +51006,8 @@
+@@ -46785,8 +50926,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -48169,7 +48526,7 @@
if test "${ac_cv_lib_knewstuff_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46889,30 +51024,42 @@
+@@ -46803,30 +50944,42 @@
int
main ()
{
@@ -48221,15 +48578,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46921,14 +51068,15 @@
+@@ -46835,14 +50988,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_knewstuff_main=no
+ ac_cv_lib_knewstuff_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -48240,7 +48598,7 @@
if test $ac_cv_lib_knewstuff_main = yes; then
MY_LIBKNEWSTUFF="-lknewstuff"
else
-@@ -46947,8 +51095,8 @@
+@@ -46861,8 +51015,8 @@
fi
@@ -48251,7 +48609,7 @@
if test "${ac_cv_lib_kvm_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46965,30 +51113,42 @@
+@@ -46879,30 +51033,42 @@
int
main ()
{
@@ -48303,15 +48661,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46997,14 +51157,15 @@
+@@ -46911,14 +51077,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_kvm_main=no
+ ac_cv_lib_kvm_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -48322,7 +48681,7 @@
if test $ac_cv_lib_kvm_main = yes; then
LIBKVM="-lkvm"
fi
-@@ -47034,8 +51195,8 @@
+@@ -46948,8 +51115,8 @@
fi
for i in $ac_topsubdirs; do
@@ -48333,7 +48692,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -47046,8 +51207,8 @@
+@@ -46960,8 +51127,8 @@
else
install_it="no"
fi
@@ -48344,7 +48703,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -47259,221 +51420,221 @@
+@@ -47173,221 +51340,221 @@
superkaramba_SUBDIR_included_FALSE=
fi
@@ -48674,7 +49033,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -47493,39 +51654,58 @@
+@@ -47407,39 +51574,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -48749,7 +49108,7 @@
fi
fi
rm -f confcache
-@@ -47534,38 +51714,31 @@
+@@ -47448,38 +51634,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -48801,7 +49160,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
-@@ -47828,11 +52001,35 @@
+@@ -47742,11 +51921,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -48839,7 +49198,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -47841,8 +52038,43 @@
+@@ -47755,8 +51958,43 @@
fi
@@ -48884,7 +49243,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -47856,18 +52088,19 @@
+@@ -47770,18 +52008,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -48907,7 +49266,7 @@
as_basename=basename
else
as_basename=false
-@@ -47875,159 +52108,120 @@
+@@ -47789,159 +52028,120 @@
# Name of the executable.
@@ -49138,7 +49497,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -48036,7 +52230,19 @@
+@@ -47950,7 +52150,19 @@
as_mkdir_p=false
fi
@@ -49159,7 +49518,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'"
-@@ -48045,31 +52251,14 @@
+@@ -47959,31 +52171,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -49191,11 +49550,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59d. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -48077,30 +52266,20 @@
+@@ -47991,30 +52186,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -49234,7 +49593,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -48127,19 +52306,21 @@
+@@ -48041,19 +52226,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -49246,7 +49605,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.59d,
++configured by $0, generated by GNU Autoconf 2.60,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -49262,7 +49621,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -48150,39 +52331,24 @@
+@@ -48064,39 +52251,24 @@
do
case $1 in
--*=*)
@@ -49308,7 +49667,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -48192,18 +52358,24 @@
+@@ -48106,18 +52278,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -49338,7 +49697,7 @@
esac
shift
-@@ -48219,144 +52391,156 @@
+@@ -48133,144 +52311,156 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -49613,7 +49972,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
-@@ -48368,566 +52552,758 @@
+@@ -48282,566 +52472,758 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -50877,7 +51236,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -48935,248 +53311,129 @@
+@@ -48849,248 +53231,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -50936,6 +51295,7 @@
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -51226,7 +51586,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -49187,135 +53444,39 @@
+@@ -49101,135 +53365,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -51388,7 +51748,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.
-@@ -49325,18 +53486,29 @@
+@@ -49239,18 +53407,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
@@ -51426,7 +51786,7 @@
else
continue
fi
-@@ -49358,53 +53530,79 @@
+@@ -49272,53 +53451,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -51539,7 +51899,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeutils, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
More information about the pkg-kde-commits
mailing list