rev 4256 - trunk/packages/kdeartwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:43:16 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:43:14 +0000 (Sun, 30 Jul 2006)
New Revision: 4256
Modified:
trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeartwork/debian/patches/98_buildprep.diff 2006-07-30 01:42:03 UTC (rev 4255)
+++ trunk/packages/kdeartwork/debian/patches/98_buildprep.diff 2006-07-30 01:43:14 UTC (rev 4256)
@@ -3910,7 +3910,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,
@@ -4192,8 +4192,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
@@ -5538,7 +5538,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,
@@ -5557,7 +5557,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 $@
@@ -6191,7 +6191,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
@@ -7293,8 +7293,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
@@ -7485,18 +7486,19 @@
-ac_cv_prog_cc_g=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
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++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
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
@@ -7519,7 +7521,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3158,10 +4042,10 @@
+@@ -3158,12 +4042,17 @@
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -7531,8 +7533,15 @@
+ 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);
-@@ -3178,205 +4062,74 @@
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3178,205 +4067,74 @@
return 0;
}
_ACEOF
@@ -7599,8 +7608,9 @@
+
fi
+-rm -f conftest.err conftest.$ac_objext
+
- 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.$ac_ext conftest.$ac_objext
@@ -7776,7 +7786,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3385,8 +4138,8 @@
+@@ -3385,8 +4143,8 @@
depcc="$CC" am_compiler_list=
@@ -7787,7 +7797,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3475,8 +4228,8 @@
+@@ -3475,8 +4233,8 @@
fi
fi
@@ -7798,7 +7808,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3498,8 +4251,8 @@
+@@ -3498,8 +4256,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
@@ -7809,7 +7819,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3533,8 +4286,13 @@
+@@ -3533,8 +4291,13 @@
#endif
Syntax error
_ACEOF
@@ -7825,7 +7835,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3559,9 +4317,10 @@
+@@ -3559,9 +4322,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7837,7 +7847,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3571,8 +4330,13 @@
+@@ -3571,8 +4335,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7853,7 +7863,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3599,6 +4363,7 @@
+@@ -3599,6 +4368,7 @@
ac_preproc_ok=:
break
fi
@@ -7861,7 +7871,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3616,8 +4381,8 @@
+@@ -3616,8 +4386,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7872,7 +7882,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3640,8 +4405,13 @@
+@@ -3640,8 +4410,13 @@
#endif
Syntax error
_ACEOF
@@ -7888,7 +7898,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3666,9 +4436,10 @@
+@@ -3666,9 +4441,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7900,7 +7910,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3678,8 +4449,13 @@
+@@ -3678,8 +4454,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7916,7 +7926,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3706,6 +4482,7 @@
+@@ -3706,6 +4487,7 @@
ac_preproc_ok=:
break
fi
@@ -7924,7 +7934,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3756,18 +4533,22 @@
+@@ -3756,18 +4538,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -7952,7 +7962,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3780,36 +4561,38 @@
+@@ -3780,36 +4566,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7999,7 +8009,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3822,55 +4605,85 @@
+@@ -3822,55 +4610,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8103,7 +8113,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3893,24 +4706,36 @@
+@@ -3893,24 +4711,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8148,15 +8158,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3919,24 +4744,28 @@
+@@ -3919,24 +4749,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
@@ -8184,7 +8195,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3952,24 +4781,36 @@
+@@ -3952,24 +4786,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8229,7 +8240,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3978,70 +4819,53 @@
+@@ -3978,70 +4824,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8324,7 +8335,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4050,61 +4874,91 @@
+@@ -4050,61 +4879,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8401,20 +8412,21 @@
+
fi
-+
-+rm -f 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
-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 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
@@ -8437,7 +8449,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4113,8 +4967,8 @@
+@@ -4113,8 +4972,8 @@
depcc="$CXX" am_compiler_list=
@@ -8448,7 +8460,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4203,8 +5057,8 @@
+@@ -4203,8 +5062,8 @@
fi
fi
@@ -8459,7 +8471,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4222,8 +5076,8 @@
+@@ -4222,8 +5081,8 @@
@@ -8470,7 +8482,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4248,24 +5102,36 @@
+@@ -4248,24 +5107,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8515,7 +8527,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4274,13 +5140,14 @@
+@@ -4274,13 +5145,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8523,17 +8535,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:
-@@ -4322,17 +5189,16 @@
+@@ -4322,17 +5194,16 @@
fi
fi
@@ -8555,7 +8568,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4360,24 +5226,36 @@
+@@ -4360,24 +5231,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8600,17 +8613,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4386,7 +5264,9 @@
+@@ -4386,8 +5269,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"
-@@ -4400,29 +5280,28 @@
+ ac_ext=c
+@@ -4400,29 +5285,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8648,7 +8663,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4449,24 +5328,36 @@
+@@ -4449,24 +5333,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8693,17 +8708,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4475,7 +5366,9 @@
+@@ -4475,8 +5371,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"
-@@ -4489,13 +5382,13 @@
+ ac_ext=c
+@@ -4489,13 +5387,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8721,7 +8738,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4516,16 +5409,15 @@
+@@ -4516,16 +5414,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8742,7 +8759,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4552,24 +5444,36 @@
+@@ -4552,24 +5449,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8787,17 +8804,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4578,7 +5482,9 @@
+@@ -4578,8 +5487,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"
-@@ -4592,16 +5498,16 @@
+ ac_ext=c
+@@ -4592,16 +5503,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8818,7 +8837,7 @@
:
fi
-@@ -4616,16 +5522,15 @@
+@@ -4616,16 +5527,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"
@@ -8839,7 +8858,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4652,24 +5557,36 @@
+@@ -4652,24 +5562,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8884,17 +8903,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4678,7 +5595,9 @@
+@@ -4678,8 +5600,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"
-@@ -4692,27 +5611,26 @@
+ ac_ext=c
+@@ -4692,27 +5616,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8929,7 +8950,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4737,24 +5655,36 @@
+@@ -4737,24 +5660,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8974,17 +8995,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4763,7 +5693,9 @@
+@@ -4763,8 +5698,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"
-@@ -4777,13 +5709,13 @@
+ ac_ext=c
+@@ -4777,13 +5714,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9002,7 +9025,7 @@
:
fi
-@@ -4791,16 +5723,15 @@
+@@ -4791,16 +5728,15 @@
;;
esac
@@ -9023,7 +9046,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4827,24 +5758,36 @@
+@@ -4827,24 +5763,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9068,17 +9091,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4853,7 +5796,9 @@
+@@ -4853,8 +5801,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"
-@@ -4867,28 +5812,27 @@
+ ac_ext=c
+@@ -4867,28 +5817,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9115,7 +9140,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4915,24 +5859,36 @@
+@@ -4915,24 +5864,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9160,17 +9185,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4941,7 +5897,9 @@
+@@ -4941,8 +5902,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"
-@@ -4955,28 +5913,27 @@
+ ac_ext=c
+@@ -4955,28 +5918,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9207,7 +9234,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5003,24 +5960,36 @@
+@@ -5003,24 +5965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9252,17 +9279,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5029,7 +5998,9 @@
+@@ -5029,8 +6003,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"
-@@ -5043,13 +6014,13 @@
+ ac_ext=c
+@@ -5043,13 +6019,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9280,7 +9309,7 @@
:
fi
-@@ -5061,13 +6032,13 @@
+@@ -5061,13 +6037,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9298,7 +9327,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5075,16 +6046,15 @@
+@@ -5075,16 +6051,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9319,7 +9348,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5111,24 +6081,36 @@
+@@ -5111,24 +6086,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9364,17 +9393,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5137,7 +6119,9 @@
+@@ -5137,8 +6124,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"
-@@ -5151,13 +6135,13 @@
+ ac_ext=c
+@@ -5151,13 +6140,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9392,7 +9423,7 @@
:
fi
-@@ -5169,16 +6153,15 @@
+@@ -5169,16 +6158,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9413,7 +9444,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5205,24 +6188,36 @@
+@@ -5205,24 +6193,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9458,17 +9489,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5231,7 +6226,9 @@
+@@ -5231,8 +6231,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"
-@@ -5245,28 +6242,27 @@
+ ac_ext=c
+@@ -5245,28 +6247,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9505,7 +9538,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5293,24 +6289,36 @@
+@@ -5293,24 +6294,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9550,17 +9583,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5319,7 +6327,9 @@
+@@ -5319,8 +6332,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"
-@@ -5333,28 +6343,27 @@
+ ac_ext=c
+@@ -5333,28 +6348,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9597,7 +9632,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5381,24 +6390,36 @@
+@@ -5381,24 +6395,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9642,17 +9677,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5407,7 +6428,9 @@
+@@ -5407,8 +6433,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"
-@@ -5421,28 +6444,27 @@
+ ac_ext=c
+@@ -5421,28 +6449,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9689,7 +9726,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5469,24 +6491,36 @@
+@@ -5469,24 +6496,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9734,17 +9771,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5495,7 +6529,9 @@
+@@ -5495,8 +6534,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"
-@@ -5509,13 +6545,13 @@
+ ac_ext=c
+@@ -5509,13 +6550,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9762,7 +9801,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5523,37 +6559,37 @@
+@@ -5523,37 +6564,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -9814,7 +9853,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5585,24 +6621,36 @@
+@@ -5585,24 +6626,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9859,7 +9898,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5611,9 +6659,10 @@
+@@ -5611,18 +6664,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9867,11 +9906,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
-@@ -5621,8 +6670,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -9882,7 +9922,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5642,16 +6691,15 @@
+@@ -5642,16 +6696,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -9903,7 +9943,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5678,24 +6726,36 @@
+@@ -5678,24 +6731,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9948,17 +9988,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5704,7 +6764,9 @@
+@@ -5704,8 +6769,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"
-@@ -5718,29 +6780,28 @@
+ ac_ext=c
+@@ -5718,29 +6785,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9996,7 +10038,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5767,24 +6828,36 @@
+@@ -5767,24 +6833,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10041,17 +10083,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5793,7 +6866,9 @@
+@@ -5793,8 +6871,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"
-@@ -5807,28 +6882,27 @@
+ ac_ext=c
+@@ -5807,28 +6887,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10088,7 +10132,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5855,24 +6929,36 @@
+@@ -5855,24 +6934,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10133,17 +10177,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5881,7 +6967,9 @@
+@@ -5881,8 +6972,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"
-@@ -5895,28 +6983,27 @@
+ ac_ext=c
+@@ -5895,28 +6988,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10180,7 +10226,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5943,24 +7030,36 @@
+@@ -5943,24 +7035,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10225,17 +10271,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5969,7 +7068,9 @@
+@@ -5969,8 +7073,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"
-@@ -5983,28 +7084,27 @@
+ ac_ext=c
+@@ -5983,28 +7089,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10272,7 +10320,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6031,24 +7131,36 @@
+@@ -6031,24 +7136,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10317,17 +10365,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6057,7 +7169,9 @@
+@@ -6057,8 +7174,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"
-@@ -6071,28 +7185,27 @@
+ ac_ext=c
+@@ -6071,28 +7190,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10364,7 +10414,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6119,24 +7232,36 @@
+@@ -6119,24 +7237,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10409,17 +10459,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6145,7 +7270,9 @@
+@@ -6145,8 +7275,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"
-@@ -6159,13 +7286,13 @@
+ ac_ext=c
+@@ -6159,13 +7291,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10437,7 +10489,7 @@
:
fi
-@@ -6272,13 +7399,13 @@
+@@ -6272,13 +7404,13 @@
fi
@@ -10454,7 +10506,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6308,8 +7435,13 @@
+@@ -6308,8 +7440,13 @@
#endif
Syntax error
_ACEOF
@@ -10470,7 +10522,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6334,9 +7466,10 @@
+@@ -6334,9 +7471,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10482,7 +10534,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6346,8 +7479,13 @@
+@@ -6346,8 +7484,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10498,7 +10550,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6374,6 +7512,7 @@
+@@ -6374,6 +7517,7 @@
ac_preproc_ok=:
break
fi
@@ -10506,7 +10558,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6391,8 +7530,8 @@
+@@ -6391,8 +7535,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10517,7 +10569,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6415,8 +7554,13 @@
+@@ -6415,8 +7559,13 @@
#endif
Syntax error
_ACEOF
@@ -10533,7 +10585,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6441,9 +7585,10 @@
+@@ -6441,9 +7590,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10545,7 +10597,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6453,8 +7598,13 @@
+@@ -6453,8 +7603,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10561,7 +10613,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6481,6 +7631,7 @@
+@@ -6481,6 +7636,7 @@
ac_preproc_ok=:
break
fi
@@ -10569,7 +10621,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6507,16 +7658,15 @@
+@@ -6507,16 +7663,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -10590,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'
-@@ -6543,24 +7693,36 @@
+@@ -6543,24 +7698,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10635,17 +10687,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6569,7 +7731,9 @@
+@@ -6569,8 +7736,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"
-@@ -6583,22 +7747,21 @@
+ ac_ext=c
+@@ -6583,22 +7752,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10674,7 +10728,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6614,36 +7777,36 @@
+@@ -6614,36 +7782,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -10721,7 +10775,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6670,24 +7833,36 @@
+@@ -6670,24 +7838,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10766,17 +10820,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6696,7 +7871,9 @@
+@@ -6696,8 +7876,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"
-@@ -6710,29 +7887,28 @@
+ ac_ext=c
+@@ -6710,29 +7892,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10814,7 +10870,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6759,24 +7935,36 @@
+@@ -6759,24 +7940,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10859,17 +10915,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6785,7 +7973,9 @@
+@@ -6785,8 +7978,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"
-@@ -6799,13 +7989,13 @@
+ ac_ext=c
+@@ -6799,13 +7994,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10887,7 +10945,7 @@
:
fi
-@@ -6815,13 +8005,13 @@
+@@ -6815,13 +8010,13 @@
@@ -10905,7 +10963,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6834,13 +8024,13 @@
+@@ -6834,13 +8029,13 @@
@@ -10923,7 +10981,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6851,272 +8041,93 @@
+@@ -6851,278 +8046,99 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -10953,15 +11011,6 @@
+else
+ kde_use_nmcheck=no
+fi
-+
-+
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -10972,6 +11021,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 ()
@@ -11019,6 +11076,7 @@
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
@@ -11102,7 +11160,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -11259,10 +11317,21 @@
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
-fi;
-
- if test "$kdelibsuff" = "auto"; then
-
-@@ -7137,8 +8148,8 @@
+-
+- if test "$kdelibsuff" = "auto"; then
+-
+-cat > conftest.c << EOF
+-#include <stdio.h>
+-int main() {
++ if test "$kdelibsuff" = "auto"; then
++
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
+ return 0;
+ }
+ EOF
+@@ -7137,8 +8153,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11273,7 +11342,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7154,14 +8165,13 @@
+@@ -7154,14 +8170,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11292,7 +11361,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7180,10 +8190,11 @@
+@@ -7180,10 +8195,11 @@
esac
else
enable_fast_install=yes
@@ -11307,7 +11376,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7207,7 +8218,7 @@
+@@ -7207,7 +8223,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
@@ -11316,7 +11385,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7236,37 +8247,184 @@
+@@ -7236,37 +8252,184 @@
fi
SED=$lt_cv_path_SED
@@ -11518,7 +11587,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7295,11 +8453,11 @@
+@@ -7295,11 +8458,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11534,7 +11603,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7312,7 +8470,7 @@
+@@ -7312,7 +8475,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,
@@ -11543,7 +11612,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'*)
-@@ -7332,21 +8490,21 @@
+@@ -7332,21 +8495,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11572,7 +11641,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7356,29 +8514,38 @@
+@@ -7356,29 +8519,38 @@
;;
esac
fi
@@ -11619,7 +11688,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7386,56 +8553,63 @@
+@@ -7386,56 +8558,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -11717,7 +11786,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7462,44 +8636,36 @@
+@@ -7462,44 +8641,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -11772,7 +11841,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7515,7 +8681,7 @@
+@@ -7515,7 +8686,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -11781,7 +11850,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
-@@ -7531,43 +8697,27 @@
+@@ -7531,43 +8702,27 @@
esac
;;
@@ -11838,7 +11907,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
-@@ -7586,32 +8736,22 @@
+@@ -7586,32 +8741,22 @@
;;
openbsd*)
@@ -11874,7 +11943,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]'
-@@ -7632,17 +8772,20 @@
+@@ -7632,17 +8777,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11898,7 +11967,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
-@@ -7651,14 +8794,17 @@
+@@ -7651,14 +8799,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11919,16 +11988,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7685,7 +8831,7 @@
+@@ -7685,7 +8836,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7688 "configure"' > conftest.$ac_ext
-+ echo '#line 8834 "configure"' > conftest.$ac_ext
++ echo '#line 8839 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7728,14 +8874,13 @@
+@@ -7728,14 +8879,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -11945,7 +12014,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7747,7 +8892,6 @@
+@@ -7747,7 +8897,6 @@
esac
;;
*64-bit*)
@@ -11953,7 +12022,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7772,8 +8916,8 @@
+@@ -7772,8 +8921,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -11964,7 +12033,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7799,24 +8943,36 @@
+@@ -7799,24 +8948,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12009,18 +12078,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7825,8 +8981,9 @@
+@@ -7825,9 +8986,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
-@@ -7836,22 +8993,42 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7836,22 +8998,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12070,7 +12141,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7875,24 +9052,36 @@
+@@ -7875,24 +9057,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12115,18 +12186,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7901,8 +9090,9 @@
+@@ -7901,9 +9095,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
-@@ -7959,6 +9149,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7959,6 +9154,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12134,7 +12207,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7978,18 +9169,27 @@
+@@ -7978,18 +9174,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12168,7 +12241,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8002,12 +9202,14 @@
+@@ -8002,12 +9207,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12186,7 +12259,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8030,9 +9232,9 @@
+@@ -8030,9 +9237,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12199,7 +12272,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8046,24 +9248,36 @@
+@@ -8046,24 +9253,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12244,15 +12317,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8072,12 +9286,14 @@
+@@ -8072,12 +9291,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
@@ -12262,7 +12336,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8092,18 +9308,19 @@
+@@ -8092,18 +9313,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12290,7 +12364,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8114,24 +9331,36 @@
+@@ -8114,24 +9336,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12335,17 +12409,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8140,15 +9369,16 @@
+@@ -8140,15 +9374,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; }
@@ -12357,7 +12432,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8157,8 +9387,13 @@
+@@ -8157,8 +9392,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12373,7 +12448,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8182,9 +9417,10 @@
+@@ -8182,9 +9422,10 @@
ac_header_preproc=no
fi
@@ -12386,7 +12461,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8208,25 +9444,19 @@
+@@ -8208,25 +9449,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;}
@@ -12419,7 +12494,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8238,364 +9468,746 @@
+@@ -8238,364 +9473,746 @@
done
@@ -13079,6 +13154,8 @@
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
+- fi
+- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
@@ -13173,7 +13250,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
@@ -13236,7 +13313,7 @@
+ ac_cv_prog_f77_g=no
+fi
+
-+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_prog_f77_g" >&5
@@ -13421,8 +13498,8 @@
+hpux*) # Its linker distinguishes data from code symbols
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ fi
++ 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'"
;;
+linux* | k*bsd*-gnu)
@@ -13454,7 +13531,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8613,14 +10225,17 @@
+@@ -8613,14 +10230,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13474,7 +13551,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8738,15 +10353,15 @@
+@@ -8738,15 +10358,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
@@ -13496,7 +13573,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8760,8 +10375,8 @@
+@@ -8760,8 +10380,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13507,7 +13584,7 @@
objdir=$lt_cv_objdir
-@@ -8782,7 +10397,7 @@
+@@ -8782,7 +10402,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13516,7 +13593,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8802,7 +10417,7 @@
+@@ -8802,7 +10422,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13525,7 +13602,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8812,8 +10427,8 @@
+@@ -8812,8 +10432,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
@@ -13536,7 +13613,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8826,32 +10441,34 @@
+@@ -8826,32 +10446,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13578,7 +13655,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8864,27 +10481,41 @@
+@@ -8864,27 +10486,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13627,7 +13704,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8892,8 +10523,8 @@
+@@ -8892,8 +10528,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
@@ -13638,7 +13715,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8906,32 +10537,34 @@
+@@ -8906,32 +10542,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13680,7 +13757,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8944,27 +10577,41 @@
+@@ -8944,27 +10582,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13729,7 +13806,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8972,8 +10619,8 @@
+@@ -8972,8 +10624,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
@@ -13740,7 +13817,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8986,32 +10633,34 @@
+@@ -8986,32 +10638,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13782,7 +13859,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9024,27 +10673,41 @@
+@@ -9024,27 +10678,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13831,7 +13908,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9059,6 +10722,7 @@
+@@ -9059,6 +10727,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -13839,7 +13916,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9078,21 +10742,32 @@
+@@ -9078,21 +10747,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -13876,7 +13953,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9112,7 +10787,7 @@
+@@ -9112,7 +10792,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13885,7 +13962,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
-@@ -9144,17 +10819,17 @@
+@@ -9144,17 +10824,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13909,7 +13986,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9174,7 +10849,7 @@
+@@ -9174,7 +10854,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13918,7 +13995,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
-@@ -9206,11 +10881,11 @@
+@@ -9206,11 +10886,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13934,7 +14011,7 @@
fi
else
-@@ -9225,21 +10900,21 @@
+@@ -9225,21 +10905,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -13963,7 +14040,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9269,68 +10944,25 @@
+@@ -9269,68 +10949,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14047,7 +14124,7 @@
## CAVEAT EMPTOR:
-@@ -9344,8 +10976,8 @@
+@@ -9344,8 +10981,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14058,7 +14135,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9359,26 +10991,28 @@
+@@ -9359,26 +10996,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 \
@@ -14067,12 +14144,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9365: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10997: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11002: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9369: \$? = $ac_status" >&5
-+ echo "$as_me:11001: \$? = $ac_status" >&5
++ echo "$as_me:11006: \$? = $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
@@ -14094,7 +14171,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"
-@@ -9392,8 +11026,8 @@
+@@ -9392,8 +11031,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14105,7 +14182,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9431,6 +11065,11 @@
+@@ -9431,6 +11070,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14117,7 +14194,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9447,7 +11086,7 @@
+@@ -9447,7 +11091,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14126,7 +14203,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9473,6 +11112,16 @@
+@@ -9473,6 +11117,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14143,7 +14220,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9484,7 +11133,7 @@
+@@ -9484,7 +11138,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.
@@ -14152,7 +14229,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9507,13 +11156,20 @@
+@@ -9507,13 +11161,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14175,7 +14252,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9528,15 +11184,15 @@
+@@ -9528,15 +11189,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14197,7 +14274,7 @@
;;
sunos4*)
-@@ -9545,7 +11201,7 @@
+@@ -9545,7 +11206,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14206,7 +14283,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9558,6 +11214,17 @@
+@@ -9558,6 +11219,17 @@
fi
;;
@@ -14224,7 +14301,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9569,16 +11236,16 @@
+@@ -9569,16 +11241,16 @@
esac
fi
@@ -14245,7 +14322,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9592,26 +11259,28 @@
+@@ -9592,26 +11264,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 \
@@ -14254,12 +14331,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11265: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9602: \$? = $ac_status" >&5
-+ echo "$as_me:11269: \$? = $ac_status" >&5
++ echo "$as_me:11274: \$? = $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
@@ -14281,7 +14358,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9624,7 +11293,7 @@
+@@ -9624,7 +11298,7 @@
fi
fi
@@ -14290,7 +14367,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9634,8 +11303,50 @@
+@@ -9634,8 +11308,50 @@
;;
esac
@@ -14343,7 +14420,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9646,60 +11357,58 @@
+@@ -9646,60 +11362,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14365,12 +14442,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9665: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11369: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11374: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9669: \$? = $ac_status" >&5
-+ echo "$as_me:11373: \$? = $ac_status" >&5
++ echo "$as_me:11378: \$? = $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
@@ -14422,7 +14499,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;}
-@@ -9709,8 +11418,8 @@
+@@ -9709,8 +11423,8 @@
need_locks=no
fi
@@ -14433,7 +14510,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9748,6 +11457,16 @@
+@@ -9748,6 +11462,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14450,7 +14527,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9758,6 +11477,10 @@
+@@ -9758,6 +11482,10 @@
with_gnu_ld=no
fi
;;
@@ -14461,7 +14538,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9768,6 +11491,27 @@
+@@ -9768,6 +11496,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14489,7 +14566,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9805,7 +11549,7 @@
+@@ -9805,7 +11554,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14498,7 +14575,7 @@
else
ld_shlibs=no
fi
-@@ -9815,13 +11559,13 @@
+@@ -9815,13 +11564,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'
@@ -14515,7 +14592,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
-@@ -9830,23 +11574,70 @@
+@@ -9830,23 +11579,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14591,7 +14668,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9860,13 +11651,40 @@
+@@ -9860,13 +11656,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14634,7 +14711,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9876,24 +11694,19 @@
+@@ -9876,24 +11699,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14666,7 +14743,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9905,7 +11718,7 @@
+@@ -9905,7 +11723,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14675,7 +14752,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9927,9 +11740,21 @@
+@@ -9927,9 +11745,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
@@ -14699,7 +14776,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9946,7 +11771,7 @@
+@@ -9946,7 +11776,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -14708,7 +14785,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`
-@@ -9965,8 +11790,12 @@
+@@ -9965,8 +11795,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -14721,7 +14798,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9974,22 +11803,23 @@
+@@ -9974,22 +11808,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -14752,7 +14829,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10005,24 +11835,36 @@
+@@ -10005,24 +11840,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14797,14 +14874,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10036,19 +11878,20 @@
+@@ -10036,19 +11883,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
@@ -14822,7 +14900,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10067,24 +11910,36 @@
+@@ -10067,24 +11915,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14867,17 +14945,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10098,7 +11953,9 @@
+@@ -10098,8 +11958,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
-@@ -10108,13 +11965,11 @@
+
+@@ -10108,13 +11970,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -14894,7 +14974,7 @@
fi
fi
;;
-@@ -10127,7 +11982,7 @@
+@@ -10127,7 +11987,7 @@
ld_shlibs=no
;;
@@ -14903,7 +14983,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10137,13 +11992,13 @@
+@@ -10137,13 +11997,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -14920,7 +15000,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.
-@@ -10153,52 +12008,52 @@
+@@ -10153,52 +12013,52 @@
;;
darwin* | rhapsody*)
@@ -15013,7 +15093,7 @@
fi
;;
-@@ -10232,8 +12087,8 @@
+@@ -10232,8 +12092,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15024,7 +15104,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10241,7 +12096,7 @@
+@@ -10241,7 +12101,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15033,7 +15113,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
-@@ -10255,47 +12110,62 @@
+@@ -10255,47 +12115,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15120,7 +15200,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10309,7 +12179,7 @@
+@@ -10309,7 +12184,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15129,7 +15209,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'
-@@ -10319,7 +12189,7 @@
+@@ -10319,7 +12194,7 @@
link_all_deplibs=yes
;;
@@ -15138,7 +15218,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10342,7 +12212,8 @@
+@@ -10342,7 +12217,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
@@ -15148,7 +15228,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10352,7 +12223,7 @@
+@@ -10352,7 +12228,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15157,7 +15237,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10363,14 +12234,14 @@
+@@ -10363,14 +12239,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15174,7 +15254,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'
-@@ -10382,13 +12253,13 @@
+@@ -10382,13 +12258,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15190,7 +15270,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10396,21 +12267,15 @@
+@@ -10396,21 +12272,15 @@
hardcode_libdir_separator=:
;;
@@ -15216,7 +15296,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'
-@@ -10419,8 +12284,18 @@
+@@ -10419,8 +12289,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15237,7 +15317,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10429,7 +12304,7 @@
+@@ -10429,7 +12309,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.
@@ -15246,7 +15326,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10477,36 +12352,45 @@
+@@ -10477,36 +12357,45 @@
fi
;;
@@ -15313,7 +15393,7 @@
;;
uts4*)
-@@ -10521,15 +12405,10 @@
+@@ -10521,15 +12410,10 @@
esac
fi
@@ -15331,7 +15411,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10547,8 +12426,8 @@
+@@ -10547,8 +12431,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.
@@ -15342,7 +15422,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10562,6 +12441,7 @@
+@@ -10562,6 +12446,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15350,7 +15430,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10584,20 +12464,20 @@
+@@ -10584,20 +12469,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15376,7 +15456,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10607,7 +12487,20 @@
+@@ -10607,7 +12492,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15398,7 +15478,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10672,7 +12565,7 @@
+@@ -10672,7 +12570,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15407,7 +15487,7 @@
;;
beos*)
-@@ -10681,7 +12574,7 @@
+@@ -10681,7 +12579,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15416,7 +15496,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10697,7 +12590,7 @@
+@@ -10697,7 +12595,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15425,7 +15505,7 @@
need_version=no
need_lib_prefix=no
-@@ -10709,7 +12602,8 @@
+@@ -10709,7 +12607,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15435,7 +15515,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10739,7 +12633,7 @@
+@@ -10739,7 +12638,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15444,7 +15524,7 @@
;;
esac
;;
-@@ -10762,7 +12656,7 @@
+@@ -10762,7 +12661,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15453,7 +15533,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"`
-@@ -10785,20 +12679,17 @@
+@@ -10785,20 +12684,17 @@
dynamic_linker=no
;;
@@ -15485,7 +15565,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10816,14 +12707,19 @@
+@@ -10816,14 +12712,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15507,7 +15587,7 @@
esac
;;
-@@ -10843,9 +12739,9 @@
+@@ -10843,9 +12744,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15519,7 +15599,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10860,7 +12756,7 @@
+@@ -10860,7 +12761,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15528,7 +15608,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10871,7 +12767,7 @@
+@@ -10871,7 +12772,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15537,7 +15617,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10883,6 +12779,18 @@
+@@ -10883,6 +12784,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15556,7 +15636,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10926,29 +12834,26 @@
+@@ -10926,29 +12839,26 @@
;;
# This must be Linux ELF.
@@ -15593,7 +15673,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,
-@@ -10958,6 +12863,18 @@
+@@ -10958,6 +12868,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15612,7 +15692,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10967,7 +12884,7 @@
+@@ -10967,7 +12889,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15621,7 +15701,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10995,8 +12912,13 @@
+@@ -10995,8 +12917,13 @@
openbsd*)
version_type=sunos
@@ -15636,7 +15716,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
-@@ -11016,7 +12938,7 @@
+@@ -11016,7 +12943,7 @@
os2*)
libname_spec='$name'
@@ -15645,7 +15725,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11034,13 +12956,6 @@
+@@ -11034,13 +12961,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15659,7 +15739,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11066,7 +12981,7 @@
+@@ -11066,7 +12986,7 @@
need_version=yes
;;
@@ -15668,7 +15748,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'
-@@ -11099,6 +13014,29 @@
+@@ -11099,6 +13019,29 @@
fi
;;
@@ -15698,7 +15778,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11110,16 +13048,21 @@
+@@ -11110,16 +13053,21 @@
dynamic_linker=no
;;
esac
@@ -15726,7 +15806,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11139,8 +13082,8 @@
+@@ -11139,8 +13087,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -15737,7 +15817,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11153,29 +13096,29 @@
+@@ -11153,29 +13101,29 @@
striplib=
old_striplib=
@@ -15777,7 +15857,7 @@
;;
esac
fi
-@@ -11207,8 +13150,8 @@
+@@ -11207,8 +13155,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -15788,7 +15868,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11221,40 +13164,52 @@
+@@ -11221,40 +13169,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15853,15 +15933,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11263,14 +13218,15 @@
+@@ -11263,14 +13223,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
@@ -15872,7 +15953,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11284,8 +13240,8 @@
+@@ -11284,8 +13245,8 @@
;;
*)
@@ -15883,7 +15964,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11312,53 +13268,59 @@
+@@ -11312,53 +13273,59 @@
#undef shl_load
@@ -15962,15 +16043,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11367,18 +13329,19 @@
+@@ -11367,18 +13334,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
@@ -15987,7 +16069,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11391,40 +13354,52 @@
+@@ -11391,40 +13359,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16052,15 +16134,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11433,19 +13408,20 @@
+@@ -11433,19 +13413,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
@@ -16078,7 +16161,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11472,53 +13448,59 @@
+@@ -11472,53 +13453,59 @@
#undef dlopen
@@ -16157,15 +16240,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11527,18 +13509,19 @@
+@@ -11527,18 +13514,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
@@ -16182,7 +16266,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11551,40 +13534,52 @@
+@@ -11551,40 +13539,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16247,15 +16331,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11593,19 +13588,20 @@
+@@ -11593,19 +13593,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
@@ -16273,7 +16358,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11618,40 +13614,52 @@
+@@ -11618,40 +13619,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16338,15 +16423,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11660,19 +13668,20 @@
+@@ -11660,19 +13673,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
@@ -16364,7 +16450,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11685,40 +13694,52 @@
+@@ -11685,40 +13699,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16429,15 +16515,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11727,14 +13748,15 @@
+@@ -11727,14 +13753,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
@@ -16448,7 +16535,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11769,13 +13791,13 @@
+@@ -11769,13 +13796,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16465,16 +16552,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11785,7 +13807,7 @@
+@@ -11785,7 +13812,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11788 "configure"
-+#line 13810 "configure"
++#line 13815 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11842,6 +13864,8 @@
+@@ -11842,6 +13869,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16483,7 +16570,7 @@
exit (status);
}
-@@ -11851,12 +13875,12 @@
+@@ -11851,12 +13880,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16498,7 +16585,7 @@
esac
else :
# compilation failed
-@@ -11867,13 +13891,13 @@
+@@ -11867,13 +13896,13 @@
fi
@@ -16517,16 +16604,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11883,7 +13907,7 @@
+@@ -11883,7 +13912,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11886 "configure"
-+#line 13910 "configure"
++#line 13915 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11940,6 +13964,8 @@
+@@ -11940,6 +13969,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16535,7 +16622,7 @@
exit (status);
}
-@@ -11949,12 +13975,12 @@
+@@ -11949,12 +13980,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16550,7 +16637,7 @@
esac
else :
# compilation failed
-@@ -11965,8 +13991,8 @@
+@@ -11965,8 +13996,8 @@
fi
@@ -16561,7 +16648,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11987,19 +14013,19 @@
+@@ -11987,19 +14018,19 @@
fi
@@ -16589,7 +16676,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12008,58 +14034,21 @@
+@@ -12008,58 +14039,21 @@
fi
;;
@@ -16655,7 +16742,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12074,7 +14063,8 @@
+@@ -12074,7 +14068,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.
@@ -16665,7 +16752,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 \
-@@ -12188,11 +14178,11 @@
+@@ -12188,11 +14183,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16679,7 +16766,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12222,6 +14212,12 @@
+@@ -12222,6 +14217,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16692,7 +16779,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12233,6 +14229,9 @@
+@@ -12233,6 +14234,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -16702,7 +16789,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12252,7 +14251,7 @@
+@@ -12252,7 +14256,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -16711,7 +16798,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12283,7 +14282,7 @@
+@@ -12283,7 +14287,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -16720,7 +16807,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12298,7 +14297,7 @@
+@@ -12298,7 +14302,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -16729,7 +16816,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12525,7 +14524,10 @@
+@@ -12525,7 +14529,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.
@@ -16741,7 +16828,7 @@
fi
-@@ -12538,11 +14540,11 @@
+@@ -12538,11 +14545,11 @@
CC="$lt_save_CC"
@@ -16757,7 +16844,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12560,6 +14562,9 @@
+@@ -12560,6 +14567,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -16767,7 +16854,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12590,8 +14595,10 @@
+@@ -12590,8 +14600,10 @@
case $tagname in
CXX)
@@ -16780,7 +16867,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12610,6 +14617,7 @@
+@@ -12610,6 +14622,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -16788,7 +16875,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12627,7 +14635,7 @@
+@@ -12627,7 +14640,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -16797,7 +16884,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12637,17 +14645,34 @@
+@@ -12637,17 +14650,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -16833,7 +16920,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12658,18 +14683,27 @@
+@@ -12658,18 +14688,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -16864,7 +16951,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12683,18 +14717,18 @@
+@@ -12683,18 +14722,18 @@
# Set up default GNU C++ configuration
@@ -16889,7 +16976,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12723,11 +14757,11 @@
+@@ -12723,11 +14762,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16905,7 +16992,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12740,7 +14774,7 @@
+@@ -12740,7 +14779,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,
@@ -16914,7 +17001,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'*)
-@@ -12760,21 +14794,21 @@
+@@ -12760,21 +14799,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -16943,7 +17030,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12784,8 +14818,8 @@
+@@ -12784,8 +14823,8 @@
;;
esac
fi
@@ -16954,7 +17041,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12793,8 +14827,8 @@
+@@ -12793,8 +14832,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
@@ -16965,7 +17052,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12820,7 +14854,7 @@
+@@ -12820,7 +14859,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.
@@ -16974,7 +17061,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12835,8 +14869,8 @@
+@@ -12835,8 +14874,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -16985,7 +17072,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12851,8 +14885,23 @@
+@@ -12851,8 +14890,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17011,7 +17098,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12869,7 +14918,7 @@
+@@ -12869,7 +14923,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17020,7 +17107,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`
-@@ -12888,8 +14937,12 @@
+@@ -12888,8 +14942,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17033,7 +17120,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12898,15 +14951,16 @@
+@@ -12898,15 +14956,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17054,7 +17141,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.
-@@ -12928,24 +14982,36 @@
+@@ -12928,24 +14987,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17099,14 +17186,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12959,20 +15025,21 @@
+@@ -12959,20 +15030,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
@@ -17124,7 +17212,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12991,24 +15058,36 @@
+@@ -12991,24 +15063,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17169,17 +17257,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13022,7 +15101,9 @@
+@@ -13022,8 +15106,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
-@@ -13032,16 +15113,26 @@
+
+@@ -13032,16 +15118,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17211,7 +17301,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13055,12 +15146,12 @@
+@@ -13055,12 +15151,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'
@@ -17226,7 +17316,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
-@@ -13069,70 +15160,81 @@
+@@ -13069,70 +15165,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17360,7 +17450,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13143,14 +15245,14 @@
+@@ -13143,14 +15250,14 @@
;;
esac
;;
@@ -17377,7 +17467,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13167,12 +15269,12 @@
+@@ -13167,12 +15274,12 @@
# location of the library.
case $cc_basename in
@@ -17393,7 +17483,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13181,11 +15283,11 @@
+@@ -13181,11 +15288,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.
@@ -17407,7 +17497,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13195,33 +15297,22 @@
+@@ -13195,33 +15302,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17448,7 +17538,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13232,17 +15323,20 @@
+@@ -13232,17 +15328,20 @@
esac
case $cc_basename in
@@ -17475,7 +17565,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13258,12 +15352,15 @@
+@@ -13258,12 +15357,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17495,7 +17585,7 @@
;;
esac
fi
-@@ -13274,11 +15371,25 @@
+@@ -13274,11 +15376,25 @@
;;
esac
;;
@@ -17523,7 +17613,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13289,9 +15400,9 @@
+@@ -13289,9 +15405,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17535,7 +17625,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13300,16 +15411,16 @@
+@@ -13300,16 +15416,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17556,7 +17646,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13327,20 +15438,44 @@
+@@ -13327,20 +15443,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17607,7 +17697,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13368,7 +15503,7 @@
+@@ -13368,7 +15508,7 @@
;;
mvs*)
case $cc_basename in
@@ -17616,7 +17706,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13378,7 +15513,7 @@
+@@ -13378,7 +15518,7 @@
;;
esac
;;
@@ -17625,7 +17715,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=
-@@ -13389,15 +15524,31 @@
+@@ -13389,15 +15529,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::"'
;;
@@ -17659,7 +17749,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13407,14 +15558,14 @@
+@@ -13407,14 +15563,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17677,7 +17767,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13432,7 +15583,7 @@
+@@ -13432,7 +15588,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17686,7 +17776,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13451,13 +15602,13 @@
+@@ -13451,13 +15607,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -17702,7 +17792,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13466,17 +15617,17 @@
+@@ -13466,17 +15622,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -17724,7 +17814,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13495,7 +15646,7 @@
+@@ -13495,7 +15651,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17733,7 +17823,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13516,27 +15667,14 @@
+@@ -13516,27 +15672,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17763,7 +17853,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13549,36 +15687,33 @@
+@@ -13549,36 +15692,33 @@
;;
solaris*)
case $cc_basename in
@@ -17812,7 +17902,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13586,9 +15721,9 @@
+@@ -13586,9 +15726,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -17824,7 +17914,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13598,9 +15733,9 @@
+@@ -13598,9 +15738,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
@@ -17836,7 +17926,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13609,9 +15744,9 @@
+@@ -13609,9 +15749,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -17848,7 +17938,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13624,12 +15759,63 @@
+@@ -13624,12 +15764,63 @@
;;
esac
;;
@@ -17914,7 +18004,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13649,8 +15835,8 @@
+@@ -13649,8 +15840,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -17925,7 +18015,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13686,7 +15872,7 @@
+@@ -13686,7 +15877,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.
@@ -17934,7 +18024,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13726,7 +15912,7 @@
+@@ -13726,7 +15917,7 @@
fi
;;
@@ -17943,7 +18033,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13762,6 +15948,29 @@
+@@ -13762,6 +15953,29 @@
$rm -f confest.$objext
@@ -17973,7 +18063,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13770,8 +15979,8 @@
+@@ -13770,8 +15984,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17984,7 +18074,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13809,6 +16018,10 @@
+@@ -13809,6 +16023,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17995,7 +18085,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13817,7 +16030,7 @@
+@@ -13817,7 +16035,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18004,7 +18094,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13842,18 +16055,28 @@
+@@ -13842,18 +16060,28 @@
;;
chorus*)
case $cc_basename in
@@ -18036,7 +18126,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13861,22 +16084,22 @@
+@@ -13861,22 +16089,22 @@
;;
esac
;;
@@ -18065,7 +18155,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13889,9 +16112,13 @@
+@@ -13889,9 +16117,13 @@
;;
esac
;;
@@ -18080,7 +18170,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13900,20 +16127,26 @@
+@@ -13900,20 +16132,26 @@
;;
esac
;;
@@ -18111,7 +18201,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13930,25 +16163,25 @@
+@@ -13930,25 +16168,25 @@
;;
mvs*)
case $cc_basename in
@@ -18142,7 +18232,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13962,24 +16195,15 @@
+@@ -13962,24 +16200,15 @@
;;
psos*)
;;
@@ -18169,7 +18259,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13989,12 +16213,12 @@
+@@ -13989,12 +16218,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18184,7 +18274,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14004,7 +16228,7 @@
+@@ -14004,7 +16233,7 @@
;;
tandem*)
case $cc_basename in
@@ -18193,7 +18283,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14012,7 +16236,14 @@
+@@ -14012,7 +16241,14 @@
;;
esac
;;
@@ -18209,7 +18299,7 @@
;;
vxworks*)
;;
-@@ -14022,16 +16253,16 @@
+@@ -14022,16 +16258,16 @@
esac
fi
@@ -18230,7 +18320,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14045,26 +16276,28 @@
+@@ -14045,26 +16281,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 \
@@ -18239,12 +18329,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14051: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16282: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14055: \$? = $ac_status" >&5
-+ echo "$as_me:16286: \$? = $ac_status" >&5
++ echo "$as_me:16291: \$? = $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
@@ -18266,7 +18356,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14077,7 +16310,7 @@
+@@ -14077,7 +16315,7 @@
fi
fi
@@ -18275,7 +18365,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14087,8 +16320,50 @@
+@@ -14087,8 +16325,50 @@
;;
esac
@@ -18328,7 +18418,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14099,60 +16374,58 @@
+@@ -14099,60 +16379,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18350,12 +18440,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14118: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16386: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14122: \$? = $ac_status" >&5
-+ echo "$as_me:16390: \$? = $ac_status" >&5
++ echo "$as_me:16395: \$? = $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
@@ -18407,7 +18497,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;}
-@@ -14162,8 +16435,8 @@
+@@ -14162,8 +16440,8 @@
need_locks=no
fi
@@ -18418,7 +18508,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14180,22 +16453,20 @@
+@@ -14180,22 +16458,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18447,7 +18537,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14213,8 +16484,8 @@
+@@ -14213,8 +16489,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.
@@ -18458,7 +18548,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14228,6 +16499,7 @@
+@@ -14228,6 +16504,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18466,7 +18556,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14250,20 +16522,20 @@
+@@ -14250,20 +16527,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18492,7 +18582,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14273,7 +16545,20 @@
+@@ -14273,7 +16550,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18514,7 +18604,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14338,7 +16623,7 @@
+@@ -14338,7 +16628,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18523,7 +18613,7 @@
;;
beos*)
-@@ -14347,7 +16632,7 @@
+@@ -14347,7 +16637,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18532,7 +18622,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14363,7 +16648,7 @@
+@@ -14363,7 +16653,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18541,7 +18631,7 @@
need_version=no
need_lib_prefix=no
-@@ -14375,7 +16660,8 @@
+@@ -14375,7 +16665,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18551,7 +18641,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14405,7 +16691,7 @@
+@@ -14405,7 +16696,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18560,7 +18650,7 @@
;;
esac
;;
-@@ -14428,7 +16714,7 @@
+@@ -14428,7 +16719,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18569,7 +18659,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"`
-@@ -14451,20 +16737,17 @@
+@@ -14451,20 +16742,17 @@
dynamic_linker=no
;;
@@ -18601,7 +18691,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14482,14 +16765,19 @@
+@@ -14482,14 +16770,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18623,7 +18713,7 @@
esac
;;
-@@ -14509,9 +16797,9 @@
+@@ -14509,9 +16802,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18635,7 +18725,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14526,7 +16814,7 @@
+@@ -14526,7 +16819,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18644,7 +18734,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14537,7 +16825,7 @@
+@@ -14537,7 +16830,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18653,7 +18743,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14549,6 +16837,18 @@
+@@ -14549,6 +16842,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18672,7 +18762,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14592,29 +16892,26 @@
+@@ -14592,29 +16897,26 @@
;;
# This must be Linux ELF.
@@ -18709,7 +18799,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,
-@@ -14624,6 +16921,18 @@
+@@ -14624,6 +16926,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18728,7 +18818,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14633,7 +16942,7 @@
+@@ -14633,7 +16947,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18737,7 +18827,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14661,8 +16970,13 @@
+@@ -14661,8 +16975,13 @@
openbsd*)
version_type=sunos
@@ -18752,7 +18842,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
-@@ -14682,7 +16996,7 @@
+@@ -14682,7 +17001,7 @@
os2*)
libname_spec='$name'
@@ -18761,7 +18851,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14700,13 +17014,6 @@
+@@ -14700,13 +17019,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18775,7 +18865,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14732,7 +17039,7 @@
+@@ -14732,7 +17044,7 @@
need_version=yes
;;
@@ -18784,7 +18874,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'
-@@ -14765,6 +17072,29 @@
+@@ -14765,6 +17077,29 @@
fi
;;
@@ -18814,7 +18904,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14776,16 +17106,21 @@
+@@ -14776,16 +17111,21 @@
dynamic_linker=no
;;
esac
@@ -18842,7 +18932,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14805,8 +17140,8 @@
+@@ -14805,8 +17145,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18853,7 +18943,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14817,1266 +17152,444 @@
+@@ -14817,1266 +17157,444 @@
enable_fast_install=needless
fi
@@ -19979,9 +20069,7 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
@@ -20003,169 +20091,174 @@
- ;;
- esac
- done
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
+-cfgfile="$ofile"
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
--cfgfile="$ofile"
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
--# The host system.
--host_alias=$host_alias
--host=$host
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# A C compiler.
+-LTCC=$lt_LTCC
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--# A C compiler.
--LTCC=$lt_LTCC
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# A symbol stripping program
+-STRIP=$STRIP
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--# A symbol stripping program
--STRIP=$STRIP
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: assembler.
+-AS="$AS"
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
--# Used on cygwin: assembler.
--AS="$AS"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# ### END LIBTOOL TAG CONFIG: $tagname
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+__EOF__
++# ### END LIBTOOL TAG CONFIG: $tagname
-# Old archive suffix (normally "a").
-libext="$libext"
++__EOF__
-# Shared library suffix (normally ".so").
-shrext='$shrext'
+
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+else
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
@@ -20176,20 +20269,20 @@
+ fi
+fi
--# Executable file suffix (normally "").
--exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
+
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
@@ -20201,21 +20294,18 @@
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+ else
+ tagname=""
+ fi
+ ;;
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ F77)
+ if test -n "$F77" && test "X$F77" != "Xno"; then
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
-# Do we need a version for libraries?
-need_version=$need_version
-
@@ -20452,7 +20542,7 @@
archive_cmds_need_lc_F77=no
-@@ -16116,29 +17629,55 @@
+@@ -16116,29 +17634,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20492,19 +20582,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
@@ -20516,7 +20606,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16146,21 +17685,21 @@
+@@ -16146,21 +17690,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20548,7 +20638,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16169,8 +17708,8 @@
+@@ -16169,8 +17713,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20559,7 +20649,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16208,6 +17747,11 @@
+@@ -16208,6 +17752,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20571,7 +20661,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16224,7 +17768,7 @@
+@@ -16224,7 +17773,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20580,7 +20670,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16250,6 +17794,16 @@
+@@ -16250,6 +17799,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20597,7 +20687,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16261,7 +17815,7 @@
+@@ -16261,7 +17820,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.
@@ -20606,7 +20696,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16284,13 +17838,20 @@
+@@ -16284,13 +17843,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20629,7 +20719,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16305,15 +17866,15 @@
+@@ -16305,15 +17871,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20651,7 +20741,7 @@
;;
sunos4*)
-@@ -16322,7 +17883,7 @@
+@@ -16322,7 +17888,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20660,32 +20750,39 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16335,7 +17896,18 @@
+@@ -16335,27 +17901,38 @@
fi
;;
- uts4*)
+- lt_prog_compiler_pic_F77='-pic'
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- *)
++ unicos*)
++ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+- esac
+- fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++ uts4*)
++ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
-+ unicos*)
-+ lt_prog_compiler_wl_F77='-Wl,'
++ *)
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
++ esac
++ fi
+
-+ uts4*)
- lt_prog_compiler_pic_F77='-pic'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-@@ -16346,16 +17918,16 @@
- esac
- fi
-
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
@@ -20701,7 +20798,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16369,26 +17941,28 @@
+@@ -16369,26 +17946,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 \
@@ -20710,12 +20807,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17947: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17952: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16379: \$? = $ac_status" >&5
-+ echo "$as_me:17951: \$? = $ac_status" >&5
++ echo "$as_me:17956: \$? = $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
@@ -20737,7 +20834,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16401,7 +17975,7 @@
+@@ -16401,7 +17980,7 @@
fi
fi
@@ -20746,7 +20843,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16411,8 +17985,50 @@
+@@ -16411,8 +17990,50 @@
;;
esac
@@ -20799,7 +20896,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16423,60 +18039,58 @@
+@@ -16423,60 +18044,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20821,12 +20918,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16442: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18051: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18056: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16446: \$? = $ac_status" >&5
-+ echo "$as_me:18055: \$? = $ac_status" >&5
++ echo "$as_me:18060: \$? = $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
@@ -20878,7 +20975,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;}
-@@ -16486,8 +18100,8 @@
+@@ -16486,8 +18105,8 @@
need_locks=no
fi
@@ -20889,7 +20986,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16525,6 +18139,16 @@
+@@ -16525,6 +18144,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20906,7 +21003,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16535,6 +18159,10 @@
+@@ -16535,6 +18164,10 @@
with_gnu_ld=no
fi
;;
@@ -20917,7 +21014,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16545,6 +18173,27 @@
+@@ -16545,6 +18178,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20945,7 +21042,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16582,7 +18231,7 @@
+@@ -16582,7 +18236,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20954,7 +21051,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16592,13 +18241,13 @@
+@@ -16592,13 +18246,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'
@@ -20971,7 +21068,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
-@@ -16607,23 +18256,70 @@
+@@ -16607,23 +18261,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21048,7 +21145,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16637,13 +18333,40 @@
+@@ -16637,13 +18338,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21091,7 +21188,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16653,24 +18376,19 @@
+@@ -16653,24 +18381,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21123,7 +21220,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16682,7 +18400,7 @@
+@@ -16682,7 +18405,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21132,7 +21229,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16704,9 +18422,21 @@
+@@ -16704,9 +18427,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
@@ -21156,7 +21253,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16723,7 +18453,7 @@
+@@ -16723,7 +18458,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21165,7 +21262,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`
-@@ -16742,8 +18472,12 @@
+@@ -16742,8 +18477,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21178,7 +21275,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16751,45 +18485,58 @@
+@@ -16751,45 +18490,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21252,14 +21349,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16803,19 +18550,20 @@
+@@ -16803,19 +18555,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
@@ -21277,7 +21375,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16824,24 +18572,36 @@
+@@ -16824,24 +18577,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21322,17 +21420,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16855,7 +18615,9 @@
+@@ -16855,8 +18620,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
-@@ -16865,13 +18627,11 @@
+
+@@ -16865,13 +18632,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21349,7 +21449,7 @@
fi
fi
;;
-@@ -16884,7 +18644,7 @@
+@@ -16884,7 +18649,7 @@
ld_shlibs_F77=no
;;
@@ -21358,7 +21458,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16894,68 +18654,68 @@
+@@ -16894,68 +18659,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21471,7 +21571,7 @@
fi
;;
-@@ -16989,8 +18749,8 @@
+@@ -16989,8 +18754,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21482,7 +21582,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16998,7 +18758,7 @@
+@@ -16998,7 +18763,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21491,7 +21591,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
-@@ -17012,47 +18772,62 @@
+@@ -17012,47 +18777,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21560,25 +21660,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17066,7 +18841,7 @@
+@@ -17066,7 +18846,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21587,7 +21687,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'
-@@ -17076,7 +18851,7 @@
+@@ -17076,7 +18856,7 @@
link_all_deplibs_F77=yes
;;
@@ -21596,7 +21696,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
-@@ -17099,7 +18874,8 @@
+@@ -17099,7 +18879,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
@@ -21606,7 +21706,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17109,7 +18885,7 @@
+@@ -17109,7 +18890,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21615,7 +21715,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17120,14 +18896,14 @@
+@@ -17120,14 +18901,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21632,7 +21732,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'
-@@ -17139,13 +18915,13 @@
+@@ -17139,13 +18920,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21648,7 +21748,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17153,21 +18929,15 @@
+@@ -17153,21 +18934,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21674,7 +21774,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'
-@@ -17176,8 +18946,18 @@
+@@ -17176,8 +18951,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21695,7 +21795,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17186,7 +18966,7 @@
+@@ -17186,7 +18971,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.
@@ -21704,7 +21804,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17234,36 +19014,45 @@
+@@ -17234,36 +19019,45 @@
fi
;;
@@ -21771,7 +21871,7 @@
;;
uts4*)
-@@ -17278,15 +19067,10 @@
+@@ -17278,15 +19072,10 @@
esac
fi
@@ -21789,7 +21889,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17304,8 +19088,8 @@
+@@ -17304,8 +19093,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.
@@ -21800,7 +21900,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17319,6 +19103,7 @@
+@@ -17319,6 +19108,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21808,7 +21908,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17341,20 +19126,20 @@
+@@ -17341,20 +19131,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21834,7 +21934,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17364,7 +19149,20 @@
+@@ -17364,7 +19154,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21856,7 +21956,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17429,7 +19227,7 @@
+@@ -17429,7 +19232,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21865,7 +21965,7 @@
;;
beos*)
-@@ -17438,7 +19236,7 @@
+@@ -17438,7 +19241,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21874,7 +21974,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17454,7 +19252,7 @@
+@@ -17454,7 +19257,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21883,7 +21983,7 @@
need_version=no
need_lib_prefix=no
-@@ -17466,7 +19264,8 @@
+@@ -17466,7 +19269,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21893,7 +21993,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17496,7 +19295,7 @@
+@@ -17496,7 +19300,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21902,7 +22002,7 @@
;;
esac
;;
-@@ -17519,7 +19318,7 @@
+@@ -17519,7 +19323,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21911,7 +22011,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"`
-@@ -17542,20 +19341,17 @@
+@@ -17542,20 +19346,17 @@
dynamic_linker=no
;;
@@ -21943,7 +22043,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17573,14 +19369,19 @@
+@@ -17573,14 +19374,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21965,7 +22065,7 @@
esac
;;
-@@ -17600,9 +19401,9 @@
+@@ -17600,9 +19406,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21977,7 +22077,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17617,7 +19418,7 @@
+@@ -17617,7 +19423,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21986,7 +22086,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17628,7 +19429,7 @@
+@@ -17628,7 +19434,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21995,7 +22095,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17640,6 +19441,18 @@
+@@ -17640,6 +19446,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22014,7 +22114,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17683,29 +19496,26 @@
+@@ -17683,29 +19501,26 @@
;;
# This must be Linux ELF.
@@ -22051,7 +22151,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,
-@@ -17715,6 +19525,18 @@
+@@ -17715,6 +19530,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22070,7 +22170,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17724,7 +19546,7 @@
+@@ -17724,7 +19551,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22079,7 +22179,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17752,8 +19574,13 @@
+@@ -17752,8 +19579,13 @@
openbsd*)
version_type=sunos
@@ -22094,7 +22194,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
-@@ -17773,7 +19600,7 @@
+@@ -17773,7 +19605,7 @@
os2*)
libname_spec='$name'
@@ -22103,7 +22203,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17791,13 +19618,6 @@
+@@ -17791,13 +19623,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22117,7 +22217,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17823,7 +19643,7 @@
+@@ -17823,7 +19648,7 @@
need_version=yes
;;
@@ -22126,7 +22226,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'
-@@ -17856,27 +19676,55 @@
+@@ -17856,27 +19681,55 @@
fi
;;
@@ -22138,13 +22238,8 @@
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-- ;;
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -22164,9 +22259,13 @@
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+
+*)
+ dynamic_linker=no
@@ -22196,7 +22295,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17896,8 +19744,8 @@
+@@ -17896,8 +19749,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22207,7 +22306,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17908,36 +19756,6 @@
+@@ -17908,36 +19761,6 @@
enable_fast_install=needless
fi
@@ -22244,7 +22343,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17952,7 +19770,8 @@
+@@ -17952,7 +19775,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.
@@ -22254,7 +22353,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 \
-@@ -18052,6 +19871,12 @@
+@@ -18052,6 +19876,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22267,7 +22366,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18063,6 +19888,9 @@
+@@ -18063,6 +19893,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22277,7 +22376,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18082,7 +19910,7 @@
+@@ -18082,7 +19915,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22286,7 +22385,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18113,7 +19941,7 @@
+@@ -18113,7 +19946,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22295,7 +22394,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18128,7 +19956,7 @@
+@@ -18128,7 +19961,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22304,7 +22403,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18330,7 +20158,10 @@
+@@ -18330,7 +20163,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.
@@ -22316,7 +22415,7 @@
fi
-@@ -18351,7 +20182,6 @@
+@@ -18351,7 +20187,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22324,7 +22423,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18363,26 +20193,55 @@
+@@ -18363,26 +20198,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22381,7 +22480,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
-@@ -18394,8 +20253,8 @@
+@@ -18394,8 +20258,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22392,7 +22491,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18409,26 +20268,28 @@
+@@ -18409,26 +20273,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 \
@@ -22401,12 +22500,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18415: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20274: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20279: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18419: \$? = $ac_status" >&5
-+ echo "$as_me:20278: \$? = $ac_status" >&5
++ echo "$as_me:20283: \$? = $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
@@ -22428,7 +22527,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"
-@@ -18442,8 +20303,8 @@
+@@ -18442,8 +20308,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22439,7 +22538,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18481,6 +20342,11 @@
+@@ -18481,6 +20347,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22451,7 +22550,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18497,7 +20363,7 @@
+@@ -18497,7 +20368,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22460,7 +22559,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18523,6 +20389,16 @@
+@@ -18523,6 +20394,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22477,7 +22576,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18534,7 +20410,7 @@
+@@ -18534,7 +20415,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.
@@ -22486,7 +22585,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18557,13 +20433,20 @@
+@@ -18557,13 +20438,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22509,7 +22608,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18578,15 +20461,15 @@
+@@ -18578,15 +20466,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22531,7 +22630,7 @@
;;
sunos4*)
-@@ -18595,7 +20478,7 @@
+@@ -18595,7 +20483,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22540,7 +22639,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18608,6 +20491,17 @@
+@@ -18608,6 +20496,17 @@
fi
;;
@@ -22558,7 +22657,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18619,16 +20513,16 @@
+@@ -18619,16 +20518,16 @@
esac
fi
@@ -22579,7 +22678,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18642,26 +20536,28 @@
+@@ -18642,26 +20541,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 \
@@ -22588,12 +22687,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20542: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20547: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18652: \$? = $ac_status" >&5
-+ echo "$as_me:20546: \$? = $ac_status" >&5
++ echo "$as_me:20551: \$? = $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
@@ -22615,7 +22714,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18674,7 +20570,7 @@
+@@ -18674,7 +20575,7 @@
fi
fi
@@ -22624,7 +22723,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18684,8 +20580,50 @@
+@@ -18684,8 +20585,50 @@
;;
esac
@@ -22677,7 +22776,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18696,60 +20634,58 @@
+@@ -18696,60 +20639,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22699,12 +22798,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18715: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20646: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20651: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18719: \$? = $ac_status" >&5
-+ echo "$as_me:20650: \$? = $ac_status" >&5
++ echo "$as_me:20655: \$? = $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
@@ -22756,7 +22855,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;}
-@@ -18759,8 +20695,8 @@
+@@ -18759,8 +20700,8 @@
need_locks=no
fi
@@ -22767,7 +22866,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18798,6 +20734,16 @@
+@@ -18798,6 +20739,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22784,7 +22883,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18808,6 +20754,10 @@
+@@ -18808,6 +20759,10 @@
with_gnu_ld=no
fi
;;
@@ -22795,7 +22894,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18818,6 +20768,27 @@
+@@ -18818,6 +20773,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22823,7 +22922,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18855,7 +20826,7 @@
+@@ -18855,7 +20831,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22832,7 +22931,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18865,13 +20836,13 @@
+@@ -18865,13 +20841,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'
@@ -22849,7 +22948,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
-@@ -18880,23 +20851,70 @@
+@@ -18880,23 +20856,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22926,7 +23025,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18910,13 +20928,40 @@
+@@ -18910,13 +20933,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22969,7 +23068,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18926,24 +20971,19 @@
+@@ -18926,24 +20976,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23001,7 +23100,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18955,7 +20995,7 @@
+@@ -18955,7 +21000,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -23010,7 +23109,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18977,9 +21017,21 @@
+@@ -18977,9 +21022,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
@@ -23034,7 +23133,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18996,7 +21048,7 @@
+@@ -18996,7 +21053,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -23043,7 +23142,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`
-@@ -19015,8 +21067,12 @@
+@@ -19015,8 +21072,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23056,7 +23155,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19024,22 +21080,23 @@
+@@ -19024,22 +21085,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23087,7 +23186,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19055,24 +21112,36 @@
+@@ -19055,24 +21117,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23132,14 +23231,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19086,19 +21155,20 @@
+@@ -19086,19 +21160,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
@@ -23157,7 +23257,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19117,24 +21187,36 @@
+@@ -19117,24 +21192,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23202,17 +23302,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19148,7 +21230,9 @@
+@@ -19148,8 +21235,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
-@@ -19158,13 +21242,11 @@
+
+@@ -19158,13 +21247,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23229,7 +23331,7 @@
fi
fi
;;
-@@ -19177,7 +21259,7 @@
+@@ -19177,7 +21264,7 @@
ld_shlibs_GCJ=no
;;
@@ -23238,7 +23340,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19187,68 +21269,68 @@
+@@ -19187,68 +21274,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23351,7 +23453,7 @@
fi
;;
-@@ -19282,8 +21364,8 @@
+@@ -19282,8 +21369,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23362,7 +23464,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19291,7 +21373,7 @@
+@@ -19291,7 +21378,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23371,7 +23473,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
-@@ -19305,47 +21387,62 @@
+@@ -19305,47 +21392,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23458,7 +23560,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19359,7 +21456,7 @@
+@@ -19359,7 +21461,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23467,7 +23569,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'
-@@ -19369,7 +21466,7 @@
+@@ -19369,7 +21471,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23476,7 +23578,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
-@@ -19392,7 +21489,8 @@
+@@ -19392,7 +21494,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
@@ -23486,7 +23588,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19402,7 +21500,7 @@
+@@ -19402,7 +21505,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23495,7 +23597,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19413,14 +21511,14 @@
+@@ -19413,14 +21516,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23512,7 +23614,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'
-@@ -19432,13 +21530,13 @@
+@@ -19432,13 +21535,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23528,7 +23630,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19446,21 +21544,15 @@
+@@ -19446,21 +21549,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23554,7 +23656,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'
-@@ -19469,8 +21561,18 @@
+@@ -19469,8 +21566,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23575,7 +23677,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19479,7 +21581,7 @@
+@@ -19479,7 +21586,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.
@@ -23584,7 +23686,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19527,1513 +21629,746 @@
+@@ -19527,1513 +21634,746 @@
fi
;;
@@ -23592,26 +23694,18 @@
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ no_undefined_flag_GCJ='${wl}-z,text'
-+ archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-+ runpath_var='LD_RUN_PATH'
-
+-
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
+- if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
+- else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
+- fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
- ;;
@@ -23624,16 +23718,19 @@
- 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'
- hardcode_libdir_flag_spec_GCJ=
-- hardcode_shlibpath_var_GCJ=no
-- runpath_var='LD_RUN_PATH'
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag_GCJ='${wl}-z,text'
++ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ runpath_var='LD_RUN_PATH'
- ;;
--
+
- uts4*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
- ;;
-
+- ;;
+-
- *)
- ld_shlibs_GCJ=no
- ;;
@@ -24669,7 +24766,15 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ if test "$GCC" = yes; then
++ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
++ ;;
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -25774,7 +25879,7 @@
fi
-@@ -21050,7 +22385,8 @@
+@@ -21050,7 +22390,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.
@@ -25784,7 +25889,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 \
-@@ -21150,6 +22486,12 @@
+@@ -21150,6 +22491,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25797,7 +25902,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21161,6 +22503,9 @@
+@@ -21161,6 +22508,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25807,7 +25912,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21180,7 +22525,7 @@
+@@ -21180,7 +22530,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25816,7 +25921,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21211,7 +22556,7 @@
+@@ -21211,7 +22561,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25825,7 +25930,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21226,7 +22571,7 @@
+@@ -21226,7 +22576,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -25834,7 +25939,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21428,7 +22773,10 @@
+@@ -21428,7 +22778,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.
@@ -25846,7 +25951,7 @@
fi
-@@ -21448,7 +22796,6 @@
+@@ -21448,7 +22801,6 @@
RC)
@@ -25854,7 +25959,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21467,15 +22814,42 @@
+@@ -21467,15 +22819,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -25897,7 +26002,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21491,7 +22865,8 @@
+@@ -21491,7 +22870,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.
@@ -25907,7 +26012,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 \
-@@ -21591,6 +22966,12 @@
+@@ -21591,6 +22971,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25920,7 +26025,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21602,6 +22983,9 @@
+@@ -21602,6 +22988,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25930,7 +26035,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21621,7 +23005,7 @@
+@@ -21621,7 +23010,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25939,7 +26044,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21652,7 +23036,7 @@
+@@ -21652,7 +23041,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25948,7 +26053,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21667,7 +23051,7 @@
+@@ -21667,7 +23056,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25957,7 +26062,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21869,7 +23253,10 @@
+@@ -21869,7 +23258,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.
@@ -25969,7 +26074,7 @@
fi
-@@ -21916,7 +23303,7 @@
+@@ -21916,7 +23308,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25978,7 +26083,7 @@
# Prevent multiple expansion
-@@ -21971,8 +23358,8 @@
+@@ -21971,8 +23363,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25989,7 +26094,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21998,17 +23385,17 @@
+@@ -21998,17 +23390,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -26013,7 +26118,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22023,32 +23410,33 @@
+@@ -22023,32 +23415,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26055,7 +26160,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22057,8 +23445,8 @@
+@@ -22057,8 +23450,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -26066,7 +26171,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22084,11 +23472,11 @@
+@@ -22084,11 +23477,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -26082,7 +26187,7 @@
fi
-@@ -22096,8 +23484,8 @@
+@@ -22096,8 +23489,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -26093,7 +26198,7 @@
XGETTEXT=":"
fi
fi
-@@ -22107,8 +23495,7 @@
+@@ -22107,8 +23500,7 @@
@@ -26103,7 +26208,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22120,8 +23507,8 @@
+@@ -22120,8 +23512,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -26114,7 +26219,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22149,24 +23536,36 @@
+@@ -22149,24 +23541,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26159,15 +26264,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22175,15 +23574,16 @@
+@@ -22175,15 +23579,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
@@ -26179,7 +26285,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22212,15 +23612,14 @@
+@@ -22212,15 +23617,14 @@
@@ -26198,7 +26304,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22232,9 +23631,6 @@
+@@ -22232,9 +23636,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26208,7 +26314,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22260,24 +23656,36 @@
+@@ -22260,24 +23661,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26253,18 +26359,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22286,8 +23694,9 @@
+@@ -22286,9 +23699,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"
-@@ -22301,11 +23710,11 @@
+ ac_ext=c
+@@ -22301,11 +23715,11 @@
fi
@@ -26280,7 +26388,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22326,8 +23735,7 @@
+@@ -22326,8 +23740,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26290,7 +26398,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22365,24 +23773,36 @@
+@@ -22365,24 +23778,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26335,7 +26443,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22392,9 +23812,10 @@
+@@ -22392,10 +23817,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26343,11 +26451,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
-@@ -22408,8 +23829,8 @@
+ ac_ext=c
+@@ -22408,8 +23834,8 @@
fi
@@ -26358,7 +26468,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22433,15 +23854,14 @@
+@@ -22433,15 +23859,14 @@
@@ -26377,7 +26487,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22453,9 +23873,6 @@
+@@ -22453,9 +23878,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26387,7 +26497,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22480,24 +23897,36 @@
+@@ -22480,24 +23902,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26432,18 +26542,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22506,8 +23935,9 @@
+@@ -22506,9 +23940,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"
-@@ -22521,11 +23951,11 @@
+ ac_ext=c
+@@ -22521,11 +23956,11 @@
fi
@@ -26459,7 +26571,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22546,8 +23976,7 @@
+@@ -22546,8 +23981,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26469,7 +26581,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22584,24 +24013,36 @@
+@@ -22584,24 +24018,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26514,7 +26626,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22611,9 +24052,10 @@
+@@ -22611,10 +24057,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26522,11 +26634,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
-@@ -22627,8 +24069,8 @@
+ ac_ext=c
+@@ -22627,8 +24074,8 @@
fi
@@ -26537,7 +26651,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22651,8 +24093,8 @@
+@@ -22651,8 +24098,8 @@
@@ -26548,7 +26662,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22669,30 +24111,42 @@
+@@ -22669,30 +24116,42 @@
int
main ()
{
@@ -26600,15 +26714,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22701,20 +24155,21 @@
+@@ -22701,20 +24160,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
@@ -26627,7 +26742,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22731,30 +24186,42 @@
+@@ -22731,30 +24191,42 @@
int
main ()
{
@@ -26679,15 +26794,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22763,21 +24230,22 @@
+@@ -22763,21 +24235,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
@@ -26707,7 +26823,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22790,40 +24258,52 @@
+@@ -22790,40 +24263,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26772,15 +26888,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22832,19 +24312,20 @@
+@@ -22832,19 +24317,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
@@ -26798,7 +26915,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22857,40 +24338,52 @@
+@@ -22857,40 +24343,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26863,15 +26980,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22899,14 +24392,15 @@
+@@ -22899,14 +24397,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
@@ -26882,7 +27000,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22932,13 +24426,13 @@
+@@ -22932,13 +24431,13 @@
fi
@@ -26899,7 +27017,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22967,24 +24461,36 @@
+@@ -22967,24 +24466,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26944,17 +27062,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22996,7 +24502,9 @@
+@@ -22996,8 +24507,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'
-@@ -23007,17 +24515,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23007,17 +24520,17 @@
fi
@@ -26977,7 +27097,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23046,24 +24554,36 @@
+@@ -23046,24 +24559,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27022,17 +27142,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23075,7 +24595,9 @@
+@@ -23075,8 +24600,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
-@@ -23087,8 +24609,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23087,8 +24614,8 @@
fi
@@ -27043,7 +27165,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23101,8 +24623,8 @@
+@@ -23101,8 +24628,8 @@
_ACEOF
@@ -27054,7 +27176,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23115,40 +24637,52 @@
+@@ -23115,40 +24642,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27119,15 +27241,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23157,21 +24691,22 @@
+@@ -23157,21 +24696,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
@@ -27147,7 +27270,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23184,40 +24719,52 @@
+@@ -23184,40 +24724,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27212,15 +27335,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23226,21 +24773,22 @@
+@@ -23226,21 +24778,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
@@ -27240,7 +27364,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23267,53 +24815,59 @@
+@@ -23267,53 +24820,59 @@
#undef inet_ntoa
@@ -27319,15 +27443,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23322,17 +24876,18 @@
+@@ -23322,17 +24881,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
@@ -27343,7 +27468,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23345,40 +24900,52 @@
+@@ -23345,40 +24905,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27408,15 +27533,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23387,21 +24954,22 @@
+@@ -23387,21 +24959,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
@@ -27436,7 +27562,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23428,53 +24996,59 @@
+@@ -23428,53 +25001,59 @@
#undef connect
@@ -27515,15 +27641,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23483,17 +25057,18 @@
+@@ -23483,17 +25062,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
@@ -27539,7 +27666,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23506,40 +25081,52 @@
+@@ -23506,40 +25086,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27604,15 +27731,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23548,22 +25135,23 @@
+@@ -23548,22 +25140,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
@@ -27633,7 +27761,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23590,53 +25178,59 @@
+@@ -23590,53 +25183,59 @@
#undef remove
@@ -27712,15 +27840,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23645,17 +25239,18 @@
+@@ -23645,17 +25244,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
@@ -27736,7 +27865,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23668,40 +25263,52 @@
+@@ -23668,40 +25268,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27801,15 +27930,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23710,14 +25317,15 @@
+@@ -23710,14 +25322,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
@@ -27820,7 +27950,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23725,8 +25333,8 @@
+@@ -23725,8 +25338,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27831,7 +27961,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23753,53 +25361,59 @@
+@@ -23753,53 +25366,59 @@
#undef shmat
@@ -27910,15 +28040,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23808,18 +25422,19 @@
+@@ -23808,18 +25427,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
@@ -27935,7 +28066,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23832,40 +25447,52 @@
+@@ -23832,40 +25452,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28000,15 +28131,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23874,14 +25501,15 @@
+@@ -23874,14 +25506,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
@@ -28019,7 +28151,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23895,18 +25523,19 @@
+@@ -23895,18 +25528,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28047,7 +28179,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23917,24 +25546,36 @@
+@@ -23917,24 +25551,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28092,17 +28224,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23943,15 +25584,16 @@
+@@ -23943,15 +25589,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; }
@@ -28114,7 +28247,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23960,8 +25602,13 @@
+@@ -23960,8 +25607,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28130,7 +28263,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23985,9 +25632,10 @@
+@@ -23985,9 +25637,10 @@
ac_header_preproc=no
fi
@@ -28143,7 +28276,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24011,25 +25659,19 @@
+@@ -24011,25 +25664,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;}
@@ -28176,7 +28309,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24047,18 +25689,19 @@
+@@ -24047,18 +25694,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28204,7 +28337,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24069,24 +25712,36 @@
+@@ -24069,24 +25717,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28249,17 +28382,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24095,15 +25750,16 @@
+@@ -24095,15 +25755,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; }
@@ -28271,7 +28405,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24112,8 +25768,13 @@
+@@ -24112,8 +25773,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28287,7 +28421,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24137,9 +25798,10 @@
+@@ -24137,9 +25803,10 @@
ac_header_preproc=no
fi
@@ -28300,7 +28434,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24163,25 +25825,19 @@
+@@ -24163,25 +25830,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;}
@@ -28333,7 +28467,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24195,8 +25851,8 @@
+@@ -24195,8 +25856,8 @@
# darwin requires a poll emulation library
@@ -28344,7 +28478,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24209,40 +25865,52 @@
+@@ -24209,40 +25870,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28409,15 +28543,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24251,14 +25919,15 @@
+@@ -24251,14 +25924,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
@@ -28428,7 +28563,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24269,18 +25938,19 @@
+@@ -24269,18 +25943,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28456,7 +28591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24291,24 +25961,36 @@
+@@ -24291,24 +25966,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28501,17 +28636,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24317,15 +25999,16 @@
+@@ -24317,15 +26004,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; }
@@ -28523,7 +28659,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24334,8 +26017,13 @@
+@@ -24334,8 +26022,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28539,7 +28675,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24359,9 +26047,10 @@
+@@ -24359,9 +26052,10 @@
ac_header_preproc=no
fi
@@ -28552,7 +28688,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24385,25 +26074,19 @@
+@@ -24385,25 +26079,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;}
@@ -28585,7 +28721,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24418,17 +26101,17 @@
+@@ -24418,17 +26106,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28609,7 +28745,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24439,24 +26122,36 @@
+@@ -24439,24 +26127,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -28654,17 +28790,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24465,15 +26160,16 @@
+@@ -24465,15 +26165,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; }
@@ -28676,7 +28813,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24482,8 +26178,13 @@
+@@ -24482,8 +26183,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -28692,7 +28829,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24507,9 +26208,10 @@
+@@ -24507,9 +26213,10 @@
ac_header_preproc=no
fi
@@ -28705,7 +28842,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24533,25 +26235,18 @@
+@@ -24533,25 +26240,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;}
@@ -28736,7 +28873,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24568,8 +26263,8 @@
+@@ -24568,8 +26268,8 @@
@@ -28747,7 +28884,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24595,31 +26290,43 @@
+@@ -24595,31 +26295,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28801,7 +28938,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24630,25 +26337,25 @@
+@@ -24630,25 +26342,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28811,8 +28948,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
@@ -28833,7 +28971,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24660,9 +26367,6 @@
+@@ -24660,9 +26372,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28843,7 +28981,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24688,24 +26392,36 @@
+@@ -24688,24 +26397,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28888,18 +29026,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24714,8 +26430,9 @@
+@@ -24714,9 +26435,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"
-@@ -24729,11 +26446,11 @@
+ ac_ext=c
+@@ -24729,11 +26451,11 @@
fi
@@ -28915,7 +29055,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24754,8 +26471,7 @@
+@@ -24754,8 +26476,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -28925,7 +29065,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24793,24 +26509,36 @@
+@@ -24793,24 +26514,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28970,7 +29110,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24820,9 +26548,10 @@
+@@ -24820,10 +26553,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28978,11 +29118,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
-@@ -24836,8 +26565,8 @@
+ ac_ext=c
+@@ -24836,8 +26570,8 @@
fi
@@ -28993,7 +29135,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24864,8 +26593,8 @@
+@@ -24864,8 +26598,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -29004,7 +29146,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24878,40 +26607,52 @@
+@@ -24878,40 +26612,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29069,15 +29211,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24920,27 +26661,28 @@
+@@ -24920,27 +26666,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
@@ -29107,7 +29250,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24953,40 +26695,52 @@
+@@ -24953,40 +26700,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29172,15 +29315,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24995,22 +26749,23 @@
+@@ -24995,22 +26754,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
@@ -29201,7 +29345,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25021,36 +26776,49 @@
+@@ -25021,36 +26781,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29261,15 +29405,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25059,20 +26827,21 @@
+@@ -25059,20 +26832,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
@@ -29289,7 +29434,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.
-@@ -25085,10 +26854,11 @@
+@@ -25085,10 +26859,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29302,7 +29447,7 @@
test_array [0] = 0
;
-@@ -25096,24 +26866,36 @@
+@@ -25096,24 +26871,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29347,7 +29492,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25126,10 +26908,11 @@
+@@ -25126,10 +26913,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29360,7 +29505,7 @@
test_array [0] = 0
;
-@@ -25137,24 +26920,36 @@
+@@ -25137,24 +26925,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29405,7 +29550,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25163,30 +26958,32 @@
+@@ -25163,30 +26963,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29422,8 +29567,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
@@ -29446,7 +29592,7 @@
test_array [0] = 0
;
-@@ -25194,24 +26991,36 @@
+@@ -25194,24 +26996,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29491,7 +29637,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25224,10 +27033,11 @@
+@@ -25224,10 +27038,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29504,7 +29650,7 @@
test_array [0] = 0
;
-@@ -25235,24 +27045,36 @@
+@@ -25235,24 +27050,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29549,7 +29695,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25261,23 +27083,26 @@
+@@ -25261,24 +27088,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29566,8 +29712,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
@@ -29576,14 +29723,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
-@@ -25289,10 +27114,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25289,10 +27119,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29596,7 +29746,7 @@
test_array [0] = 0
;
-@@ -25300,24 +27126,36 @@
+@@ -25300,24 +27131,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29641,15 +29791,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25326,26 +27164,20 @@
+@@ -25326,26 +27169,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;;
@@ -29673,7 +29824,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25353,8 +27185,9 @@
+@@ -25353,8 +27190,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29685,7 +29836,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25363,35 +27196,44 @@
+@@ -25363,35 +27201,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29743,7 +29894,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25402,28 +27244,27 @@
+@@ -25402,28 +27249,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29780,7 +29931,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25434,36 +27275,49 @@
+@@ -25434,36 +27280,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29840,15 +29991,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25472,20 +27326,21 @@
+@@ -25472,20 +27331,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
@@ -29868,7 +30020,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.
-@@ -25498,10 +27353,11 @@
+@@ -25498,10 +27358,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29881,7 +30033,7 @@
test_array [0] = 0
;
-@@ -25509,24 +27365,36 @@
+@@ -25509,24 +27370,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29926,7 +30078,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25539,10 +27407,11 @@
+@@ -25539,10 +27412,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29939,7 +30091,7 @@
test_array [0] = 0
;
-@@ -25550,24 +27419,36 @@
+@@ -25550,24 +27424,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29984,7 +30136,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25576,30 +27457,32 @@
+@@ -25576,30 +27462,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30001,8 +30153,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
@@ -30025,7 +30178,7 @@
test_array [0] = 0
;
-@@ -25607,24 +27490,36 @@
+@@ -25607,24 +27495,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30070,7 +30223,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25637,10 +27532,11 @@
+@@ -25637,10 +27537,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30083,7 +30236,7 @@
test_array [0] = 0
;
-@@ -25648,24 +27544,36 @@
+@@ -25648,24 +27549,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30128,7 +30281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25674,23 +27582,26 @@
+@@ -25674,24 +27587,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30145,8 +30298,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
@@ -30155,14 +30309,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
-@@ -25702,10 +27613,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25702,10 +27618,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30175,7 +30332,7 @@
test_array [0] = 0
;
-@@ -25713,24 +27625,36 @@
+@@ -25713,24 +27630,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30220,15 +30377,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25739,26 +27663,20 @@
+@@ -25739,26 +27668,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;;
@@ -30252,7 +30410,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25766,8 +27684,9 @@
+@@ -25766,8 +27689,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30264,7 +30422,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25776,35 +27695,44 @@
+@@ -25776,35 +27700,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30322,7 +30480,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25815,28 +27743,27 @@
+@@ -25815,28 +27748,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30359,7 +30517,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25847,36 +27774,49 @@
+@@ -25847,36 +27779,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30419,15 +30577,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25885,20 +27825,21 @@
+@@ -25885,20 +27830,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
@@ -30447,7 +30606,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.
-@@ -25911,10 +27852,11 @@
+@@ -25911,10 +27857,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30460,7 +30619,7 @@
test_array [0] = 0
;
-@@ -25922,24 +27864,36 @@
+@@ -25922,24 +27869,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30505,7 +30664,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25952,10 +27906,11 @@
+@@ -25952,10 +27911,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30518,7 +30677,7 @@
test_array [0] = 0
;
-@@ -25963,24 +27918,36 @@
+@@ -25963,24 +27923,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30563,7 +30722,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25989,30 +27956,32 @@
+@@ -25989,30 +27961,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30580,8 +30739,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
@@ -30604,7 +30764,7 @@
test_array [0] = 0
;
-@@ -26020,24 +27989,36 @@
+@@ -26020,24 +27994,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30649,7 +30809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26050,10 +28031,11 @@
+@@ -26050,10 +28036,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30662,7 +30822,7 @@
test_array [0] = 0
;
-@@ -26061,24 +28043,36 @@
+@@ -26061,24 +28048,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30707,7 +30867,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26087,23 +28081,26 @@
+@@ -26087,24 +28086,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30724,8 +30884,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
@@ -30734,14 +30895,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
-@@ -26115,10 +28112,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26115,10 +28117,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30754,7 +30918,7 @@
test_array [0] = 0
;
-@@ -26126,24 +28124,36 @@
+@@ -26126,24 +28129,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30799,15 +30963,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26152,25 +28162,19 @@
+@@ -26152,25 +28167,19 @@
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;;
@@ -30832,7 +30997,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26179,8 +28183,9 @@
+@@ -26179,8 +28188,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30844,7 +31009,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26189,35 +28194,44 @@
+@@ -26189,35 +28199,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30902,7 +31067,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26228,28 +28242,27 @@
+@@ -26228,28 +28247,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30939,7 +31104,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26260,36 +28273,49 @@
+@@ -26260,36 +28278,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30999,15 +31164,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26298,20 +28324,21 @@
+@@ -26298,20 +28329,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
@@ -31027,7 +31193,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.
-@@ -26324,10 +28351,11 @@
+@@ -26324,10 +28356,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31040,7 +31206,7 @@
test_array [0] = 0
;
-@@ -26335,24 +28363,36 @@
+@@ -26335,24 +28368,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31085,7 +31251,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26365,10 +28405,11 @@
+@@ -26365,10 +28410,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31098,7 +31264,7 @@
test_array [0] = 0
;
-@@ -26376,24 +28417,36 @@
+@@ -26376,24 +28422,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31143,7 +31309,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26402,30 +28455,32 @@
+@@ -26402,30 +28460,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31160,8 +31326,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
@@ -31184,7 +31351,7 @@
test_array [0] = 0
;
-@@ -26433,24 +28488,36 @@
+@@ -26433,24 +28493,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31229,7 +31396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26463,10 +28530,11 @@
+@@ -26463,10 +28535,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31242,7 +31409,7 @@
test_array [0] = 0
;
-@@ -26474,24 +28542,36 @@
+@@ -26474,24 +28547,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31287,7 +31454,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26500,23 +28580,26 @@
+@@ -26500,24 +28585,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31304,8 +31471,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
@@ -31314,14 +31482,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
-@@ -26528,10 +28611,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26528,10 +28616,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31334,7 +31505,7 @@
test_array [0] = 0
;
-@@ -26539,24 +28623,36 @@
+@@ -26539,24 +28628,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31379,15 +31550,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26565,26 +28661,20 @@
+@@ -26565,26 +28666,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;;
@@ -31411,7 +31583,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26592,8 +28682,9 @@
+@@ -26592,8 +28687,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31423,7 +31595,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26602,35 +28693,44 @@
+@@ -26602,35 +28698,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31481,7 +31653,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26641,30 +28741,29 @@
+@@ -26641,30 +28746,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31520,7 +31692,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26677,40 +28776,52 @@
+@@ -26677,40 +28781,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31585,15 +31757,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26719,14 +28830,15 @@
+@@ -26719,14 +28835,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
@@ -31604,7 +31777,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26735,8 +28847,8 @@
+@@ -26735,8 +28852,8 @@
fi
@@ -31615,7 +31788,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26749,40 +28861,52 @@
+@@ -26749,40 +28866,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31680,15 +31853,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26791,14 +28915,15 @@
+@@ -26791,14 +28920,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
@@ -31699,7 +31873,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26812,8 +28937,8 @@
+@@ -26812,8 +28942,8 @@
@@ -31710,7 +31884,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26824,36 +28949,49 @@
+@@ -26824,36 +28954,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31770,15 +31944,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26862,20 +29000,21 @@
+@@ -26862,20 +29005,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
@@ -31798,7 +31973,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.
-@@ -26888,10 +29027,11 @@
+@@ -26888,10 +29032,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31811,7 +31986,7 @@
test_array [0] = 0
;
-@@ -26899,24 +29039,36 @@
+@@ -26899,24 +29044,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31856,7 +32031,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26929,10 +29081,11 @@
+@@ -26929,10 +29086,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31869,7 +32044,7 @@
test_array [0] = 0
;
-@@ -26940,24 +29093,36 @@
+@@ -26940,24 +29098,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31914,7 +32089,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26966,30 +29131,32 @@
+@@ -26966,30 +29136,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31931,8 +32106,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
@@ -31955,7 +32131,7 @@
test_array [0] = 0
;
-@@ -26997,24 +29164,36 @@
+@@ -26997,24 +29169,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32000,7 +32176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27027,10 +29206,11 @@
+@@ -27027,10 +29211,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32013,7 +32189,7 @@
test_array [0] = 0
;
-@@ -27038,24 +29218,36 @@
+@@ -27038,24 +29223,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32058,7 +32234,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27064,23 +29256,26 @@
+@@ -27064,24 +29261,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32075,8 +32251,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
@@ -32085,14 +32262,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
-@@ -27092,10 +29287,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27092,10 +29292,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32105,7 +32285,7 @@
test_array [0] = 0
;
-@@ -27103,24 +29299,36 @@
+@@ -27103,24 +29304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32150,15 +32330,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27129,26 +29337,20 @@
+@@ -27129,26 +29342,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;;
@@ -32182,7 +32363,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27156,8 +29358,9 @@
+@@ -27156,8 +29363,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32194,7 +32375,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27166,35 +29369,44 @@
+@@ -27166,35 +29374,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32252,7 +32433,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27205,29 +29417,28 @@
+@@ -27205,29 +29422,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32290,7 +32471,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27238,36 +29449,49 @@
+@@ -27238,36 +29454,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32350,15 +32531,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27276,20 +29500,21 @@
+@@ -27276,20 +29505,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
@@ -32378,7 +32560,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.
-@@ -27302,10 +29527,11 @@
+@@ -27302,10 +29532,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32391,7 +32573,7 @@
test_array [0] = 0
;
-@@ -27313,24 +29539,36 @@
+@@ -27313,24 +29544,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32436,7 +32618,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27343,10 +29581,11 @@
+@@ -27343,10 +29586,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32449,7 +32631,7 @@
test_array [0] = 0
;
-@@ -27354,24 +29593,36 @@
+@@ -27354,24 +29598,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32494,7 +32676,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27380,30 +29631,32 @@
+@@ -27380,30 +29636,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32511,8 +32693,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
@@ -32535,7 +32718,7 @@
test_array [0] = 0
;
-@@ -27411,24 +29664,36 @@
+@@ -27411,24 +29669,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32580,7 +32763,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27441,10 +29706,11 @@
+@@ -27441,10 +29711,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32593,7 +32776,7 @@
test_array [0] = 0
;
-@@ -27452,24 +29718,36 @@
+@@ -27452,24 +29723,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32638,7 +32821,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27478,23 +29756,26 @@
+@@ -27478,24 +29761,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32655,8 +32838,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
@@ -32665,14 +32849,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
-@@ -27506,10 +29787,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27506,10 +29792,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32685,7 +32872,7 @@
test_array [0] = 0
;
-@@ -27517,24 +29799,36 @@
+@@ -27517,24 +29804,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32730,15 +32917,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27543,26 +29837,20 @@
+@@ -27543,26 +29842,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;;
@@ -32762,7 +32950,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27570,8 +29858,9 @@
+@@ -27570,8 +29863,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32774,7 +32962,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27580,35 +29869,44 @@
+@@ -27580,35 +29874,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32832,7 +33020,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27619,30 +29917,29 @@
+@@ -27619,30 +29922,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32871,7 +33059,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27663,36 +29960,48 @@
+@@ -27663,36 +29965,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32932,12 +33120,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!
-@@ -27704,18 +30013,18 @@
+@@ -27704,18 +30018,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
@@ -32955,7 +33144,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27745,24 +30054,36 @@
+@@ -27745,24 +30059,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33000,18 +33189,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27771,8 +30092,9 @@
+@@ -27771,9 +30097,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
-@@ -27786,26 +30108,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27786,26 +30113,26 @@
fi
@@ -33048,7 +33239,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27824,18 +30146,19 @@
+@@ -27824,18 +30151,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33076,7 +33267,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27846,24 +30169,36 @@
+@@ -27846,24 +30174,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -33121,17 +33312,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27872,15 +30207,16 @@
+@@ -27872,15 +30212,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; }
@@ -33143,7 +33335,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27889,8 +30225,13 @@
+@@ -27889,8 +30230,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33159,7 +33351,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27914,9 +30255,10 @@
+@@ -27914,9 +30260,10 @@
ac_header_preproc=no
fi
@@ -33172,7 +33364,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27940,25 +30282,19 @@
+@@ -27940,25 +30287,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;}
@@ -33205,7 +33397,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27970,8 +30306,8 @@
+@@ -27970,8 +30311,8 @@
done
@@ -33216,7 +33408,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27998,53 +30334,59 @@
+@@ -27998,53 +30339,59 @@
#undef _NSGetEnviron
@@ -33295,15 +33487,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28053,13 +30395,14 @@
+@@ -28053,13 +30400,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
@@ -33313,7 +33506,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28080,9 +30423,9 @@
+@@ -28080,9 +30428,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33326,7 +33519,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28108,53 +30451,59 @@
+@@ -28108,53 +30456,59 @@
#undef $ac_func
@@ -33405,15 +33598,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28163,13 +30512,15 @@
+@@ -28163,13 +30517,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
@@ -33424,7 +33618,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28186,32 +30537,32 @@
+@@ -28186,32 +30542,32 @@
@@ -33469,7 +33663,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28227,8 +30578,8 @@
+@@ -28227,8 +30583,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33480,7 +33674,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28265,8 +30616,13 @@
+@@ -28265,8 +30621,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -33496,7 +33690,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28333,6 +30689,7 @@
+@@ -28333,6 +30694,7 @@
fi
done
fi
@@ -33504,7 +33698,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28362,24 +30719,36 @@
+@@ -28362,24 +30724,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33549,7 +33743,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28390,7 +30759,7 @@
+@@ -28390,7 +30764,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33558,15 +33752,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}/` \
-@@ -28438,6 +30807,7 @@
+@@ -28438,7 +30812,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
-@@ -28448,21 +30818,26 @@
+
+@@ -28448,21 +30823,26 @@
*-*-solaris*)
;;
*)
@@ -33601,7 +33797,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28470,7 +30845,7 @@
+@@ -28470,7 +30850,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
@@ -33610,7 +33806,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28479,7 +30854,7 @@
+@@ -28479,7 +30859,7 @@
esac
fi
cd ..
@@ -33619,7 +33815,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28523,12 +30898,12 @@
+@@ -28523,12 +30903,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -33636,7 +33832,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28556,8 +30931,8 @@
+@@ -28556,8 +30936,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.
@@ -33647,7 +33843,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28570,40 +30945,52 @@
+@@ -28570,40 +30950,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33712,15 +33908,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28612,14 +30999,15 @@
+@@ -28612,14 +31004,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
@@ -33731,7 +33928,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28628,8 +31016,8 @@
+@@ -28628,8 +31021,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -33742,7 +33939,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28663,24 +31051,36 @@
+@@ -28663,24 +31056,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33787,7 +33984,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28689,9 +31089,10 @@
+@@ -28689,10 +31094,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33795,11 +33992,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
-@@ -28701,8 +31102,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28701,8 +31107,8 @@
fi
@@ -33810,7 +34009,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28848,8 +31249,8 @@
+@@ -28848,8 +31254,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33821,7 +34020,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28860,9 +31261,9 @@
+@@ -28860,9 +31266,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33834,7 +34033,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28874,40 +31275,52 @@
+@@ -28874,40 +31280,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33899,15 +34098,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28916,14 +31329,16 @@
+@@ -28916,14 +31334,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
@@ -33919,7 +34119,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28936,8 +31351,8 @@
+@@ -28936,8 +31356,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -33930,7 +34130,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28950,40 +31365,52 @@
+@@ -28950,40 +31370,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33995,15 +34195,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28992,14 +31419,15 @@
+@@ -28992,14 +31424,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
@@ -34014,7 +34215,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29007,8 +31435,8 @@
+@@ -29007,8 +31440,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -34025,7 +34226,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29027,39 +31455,52 @@
+@@ -29027,40 +31460,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34086,11 +34287,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
-@@ -29075,16 +31516,15 @@
+ fi
+@@ -29075,16 +31521,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -34111,7 +34314,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29111,24 +31551,36 @@
+@@ -29111,24 +31556,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34156,17 +34359,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29137,7 +31589,9 @@
+@@ -29137,8 +31594,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"
-@@ -29151,13 +31605,13 @@
+ ac_ext=c
+@@ -29151,13 +31610,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34184,7 +34389,7 @@
:
fi
-@@ -29169,16 +31623,15 @@
+@@ -29169,16 +31628,15 @@
case $host_os in
solaris*)
@@ -34205,7 +34410,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29205,24 +31658,36 @@
+@@ -29205,24 +31663,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34250,17 +34455,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29231,7 +31696,9 @@
+@@ -29231,8 +31701,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"
-@@ -29245,13 +31712,13 @@
+ ac_ext=c
+@@ -29245,13 +31717,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34278,7 +34485,7 @@
:
fi
-@@ -29278,17 +31745,17 @@
+@@ -29278,17 +31750,17 @@
@@ -34302,7 +34509,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29306,21 +31773,21 @@
+@@ -29306,21 +31778,21 @@
fi
@@ -34332,7 +34539,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29339,14 +31806,14 @@
+@@ -29339,14 +31811,14 @@
@@ -34351,7 +34558,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29380,24 +31847,36 @@
+@@ -29380,24 +31852,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34396,18 +34603,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29406,8 +31885,9 @@
+@@ -29406,9 +31890,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"
-@@ -29421,8 +31901,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29421,8 +31906,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34418,7 +34627,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29442,8 +31922,8 @@
+@@ -29442,8 +31927,8 @@
@@ -34429,7 +34638,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29479,24 +31959,36 @@
+@@ -29479,24 +31964,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34474,7 +34683,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29505,9 +31997,10 @@
+@@ -29505,10 +32002,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34482,11 +34691,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"
-@@ -29522,19 +32015,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29522,19 +32020,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -34512,7 +34723,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29567,24 +32060,36 @@
+@@ -29567,24 +32065,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34557,18 +34768,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29593,8 +32098,9 @@
+@@ -29593,9 +32103,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"
-@@ -29605,14 +32111,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29605,14 +32116,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34589,7 +34802,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29645,24 +32151,36 @@
+@@ -29645,24 +32156,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34634,18 +34847,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29671,8 +32189,9 @@
+@@ -29671,9 +32194,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"
-@@ -29683,11 +32202,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29683,11 +32207,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34661,16 +34876,16 @@
LIBJPEG=
-@@ -29707,7 +32226,7 @@
+@@ -29707,7 +32231,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29710: $i/$j" >&5
-+ echo "configure: 32229: $i/$j" >&5
++ echo "configure: 32234: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29754,14 +32273,14 @@
+@@ -29754,14 +32278,14 @@
@@ -34688,7 +34903,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29804,8 +32323,8 @@
+@@ -29804,8 +32328,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34699,7 +34914,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29814,8 +32333,8 @@
+@@ -29814,8 +32338,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34710,7 +34925,7 @@
PERL=$kde_cv_path
fi
-@@ -29829,10 +32348,9 @@
+@@ -29829,10 +32353,9 @@
@@ -34723,7 +34938,7 @@
else
if test $kde_qtver = 3; then
-@@ -29842,7 +32360,8 @@
+@@ -29842,7 +32365,8 @@
fi
@@ -34733,7 +34948,7 @@
USING_QT_MT=""
-@@ -29862,13 +32381,13 @@
+@@ -29862,13 +32386,13 @@
else
kde_check_threading_default=yes
fi
@@ -34751,7 +34966,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29940,8 +32459,8 @@
+@@ -29940,8 +32464,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -34762,7 +34977,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"
-@@ -29950,34 +32469,34 @@
+@@ -29950,34 +32474,34 @@
qt_libraries=""
qt_includes=""
@@ -34809,16 +35024,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30005,7 +32524,7 @@
+@@ -30005,7 +32529,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30008: $i/$j" >&5
-+ echo "configure: 32527: $i/$j" >&5
++ echo "configure: 32532: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30042,8 +32561,7 @@
+@@ -30042,8 +32566,7 @@
ac_qt_libraries="$qt_libdir"
@@ -34828,7 +35043,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30180,13 +32698,13 @@
+@@ -30180,13 +32703,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -34846,7 +35061,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30195,15 +32713,14 @@
+@@ -30195,15 +32718,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -34865,7 +35080,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30324,12 +32841,12 @@
+@@ -30324,12 +32846,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34882,7 +35097,7 @@
fi
-@@ -30367,14 +32884,14 @@
+@@ -30367,14 +32889,14 @@
fi
@@ -34900,7 +35115,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30417,8 +32934,8 @@
+@@ -30417,8 +32939,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34911,7 +35126,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30439,22 +32956,22 @@
+@@ -30439,22 +32961,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34939,7 +35154,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30497,12 +33014,12 @@
+@@ -30497,12 +33019,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34956,7 +35171,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30532,10 +33049,10 @@
+@@ -30532,10 +33054,10 @@
if test $kde_qtver = 3; then
@@ -34970,7 +35185,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30558,22 +33075,22 @@
+@@ -30558,22 +33080,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35000,7 +35215,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30596,13 +33113,13 @@
+@@ -30596,13 +33118,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35018,7 +35233,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30633,15 +33150,14 @@
+@@ -30633,15 +33155,14 @@
if test -n "$LIBJPEG"; then
@@ -35037,7 +35252,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30674,24 +33190,36 @@
+@@ -30674,24 +33195,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35082,18 +35297,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30700,8 +33228,9 @@
+@@ -30700,9 +33233,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"
-@@ -30718,12 +33247,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30718,12 +33252,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35110,7 +35327,7 @@
LIBJPEG_QT=
fi
-@@ -30754,15 +33283,15 @@
+@@ -30754,15 +33288,15 @@
@@ -35132,7 +35349,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30786,11 +33315,11 @@
+@@ -30786,11 +33320,11 @@
@@ -35148,34 +35365,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30842,7 +33371,7 @@
+@@ -30842,7 +33376,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30845: $i/$j" >&5
-+ echo "configure: 33374: $i/$j" >&5
++ echo "configure: 33379: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30872,7 +33401,7 @@
+@@ -30872,7 +33406,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30875: $i/$j" >&5
-+ echo "configure: 33404: $i/$j" >&5
++ echo "configure: 33409: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30890,7 +33419,7 @@
+@@ -30890,7 +33424,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30893: $i/$j" >&5
-+ echo "configure: 33422: $i/$j" >&5
++ echo "configure: 33427: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30949,12 +33478,12 @@
+@@ -30949,12 +33483,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35192,7 +35409,7 @@
fi
kde_libraries="${libdir}"
-@@ -30963,8 +33492,8 @@
+@@ -30963,8 +33497,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35203,7 +35420,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31002,8 +33531,8 @@
+@@ -31002,8 +33536,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -35214,7 +35431,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31046,8 +33575,8 @@
+@@ -31046,8 +33580,8 @@
fi
@@ -35225,7 +35442,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31079,10 +33608,9 @@
+@@ -31079,10 +33613,9 @@
@@ -35238,7 +35455,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31096,13 +33624,14 @@
+@@ -31096,13 +33629,14 @@
fi
@@ -35256,7 +35473,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31213,15 +33742,14 @@
+@@ -31213,15 +33747,14 @@
else
if test $kde_qtver = 1; then
@@ -35277,7 +35494,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31273,8 +33801,8 @@
+@@ -31273,8 +33806,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35288,7 +35505,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.
-@@ -31313,8 +33841,8 @@
+@@ -31313,8 +33846,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35299,7 +35516,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
-@@ -31322,8 +33850,8 @@
+@@ -31322,8 +33855,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35310,7 +35527,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
-@@ -31516,15 +34044,14 @@
+@@ -31516,15 +34049,14 @@
else
if test $kde_qtver = 1; then
@@ -35331,7 +35548,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31576,8 +34103,8 @@
+@@ -31576,8 +34108,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35342,7 +35559,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.
-@@ -31616,8 +34143,8 @@
+@@ -31616,8 +34148,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35353,7 +35570,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
-@@ -31625,8 +34152,8 @@
+@@ -31625,8 +34157,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35364,7 +35581,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
-@@ -31718,22 +34245,22 @@
+@@ -31718,22 +34250,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35393,7 +35610,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31766,14 +34293,14 @@
+@@ -31766,14 +34298,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35411,7 +35628,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31816,8 +34343,8 @@
+@@ -31816,8 +34348,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35422,7 +35639,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31828,21 +34355,21 @@
+@@ -31828,21 +34360,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35449,7 +35666,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31885,8 +34412,8 @@
+@@ -31885,8 +34417,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35460,7 +35677,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31897,22 +34424,22 @@
+@@ -31897,22 +34429,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35488,7 +35705,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31955,8 +34482,8 @@
+@@ -31955,8 +34487,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35499,7 +35716,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31969,21 +34496,21 @@
+@@ -31969,21 +34501,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35526,7 +35743,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32026,8 +34553,8 @@
+@@ -32026,8 +34558,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35537,7 +35754,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32040,22 +34567,22 @@
+@@ -32040,22 +34572,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35565,7 +35782,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32098,12 +34625,12 @@
+@@ -32098,12 +34630,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35582,7 +35799,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32132,14 +34659,14 @@
+@@ -32132,14 +34664,14 @@
if test -n "$kde32ornewer"; then
@@ -35600,7 +35817,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32182,8 +34709,8 @@
+@@ -32182,8 +34714,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35611,7 +35828,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32194,21 +34721,21 @@
+@@ -32194,21 +34726,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35638,7 +35855,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32251,8 +34778,8 @@
+@@ -32251,8 +34783,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35649,7 +35866,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32263,8 +34790,8 @@
+@@ -32263,8 +34795,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35660,7 +35877,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32272,14 +34799,14 @@
+@@ -32272,14 +34804,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -35678,7 +35895,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32322,8 +34849,8 @@
+@@ -32322,8 +34854,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35689,7 +35906,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32334,8 +34861,8 @@
+@@ -32334,8 +34866,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35700,7 +35917,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32343,14 +34870,14 @@
+@@ -32343,14 +34875,14 @@
fi
@@ -35718,7 +35935,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32393,12 +34920,12 @@
+@@ -32393,12 +34925,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35735,16 +35952,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32413,7 +34940,7 @@
+@@ -32413,7 +34945,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32416: $i/$j" >&5
-+ echo "configure: 34943: $i/$j" >&5
++ echo "configure: 34948: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32575,15 +35102,14 @@
+@@ -32575,15 +35107,14 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE Themes"
@@ -35763,7 +35980,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32621,24 +35147,36 @@
+@@ -32621,24 +35152,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35808,18 +36025,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32647,8 +35185,9 @@
+@@ -32647,9 +35190,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_kde_qt_has_opengl=no
+ ac_cv_kde_qt_has_opengl=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
-@@ -32664,8 +35203,8 @@
+ CXXFLAGS="$save_CXXFLAGS"
+@@ -32664,8 +35208,8 @@
fi
@@ -35830,7 +36049,7 @@
-@@ -32673,28 +35212,27 @@
+@@ -32673,28 +35217,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -35866,7 +36085,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32730,24 +35268,36 @@
+@@ -32730,24 +35273,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35911,18 +36130,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32756,8 +35306,9 @@
+@@ -32756,9 +35311,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_gl="no"
+ ac_cv_have_gl="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
-@@ -32773,8 +35324,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -32773,8 +35329,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -35933,7 +36154,7 @@
GL_LDFLAGS=""
GLINC=""
have_gl=no
-@@ -32794,8 +35345,8 @@
+@@ -32794,8 +35350,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -35944,7 +36165,7 @@
have_gl=yes
fi
fi
-@@ -32855,25 +35406,25 @@
+@@ -32855,25 +35411,25 @@
@@ -35977,7 +36198,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32916,15 +35467,15 @@
+@@ -32916,15 +35472,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35997,7 +36218,7 @@
LIBART_CONFIG=$kde_cv_path
fi
-@@ -32983,9 +35534,9 @@
+@@ -32983,9 +35539,9 @@
for ac_func in gettimeofday
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36010,7 +36231,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33011,53 +35562,59 @@
+@@ -33011,53 +35567,59 @@
#undef $ac_func
@@ -36089,15 +36310,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33066,13 +35623,15 @@
+@@ -33066,13 +35628,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
@@ -36108,7 +36330,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -33089,25 +35648,25 @@
+@@ -33089,25 +35653,25 @@
DPMS_LIB=
@@ -36142,7 +36364,7 @@
ac_cv_have_dpms="no"
else
ac_save_ldflags="$LDFLAGS"
-@@ -33139,24 +35698,36 @@
+@@ -33139,24 +35703,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36187,7 +36409,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33189,24 +35760,36 @@
+@@ -33189,24 +35765,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36232,23 +36454,26 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33217,12 +35800,14 @@
+@@ -33217,13 +35805,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_dpms="no"
+ ac_cv_have_dpms="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
+-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
LDFLAGS="$ac_save_ldflags"
-@@ -33233,8 +35818,8 @@
+ CFLAGS="$ac_save_cflags"
+@@ -33233,8 +35823,8 @@
fi
if test "$ac_cv_have_dpms" = no; then
@@ -36259,7 +36484,7 @@
DPMS_LDFLAGS=""
DPMSINC=""
-@@ -33257,8 +35842,8 @@
+@@ -33257,8 +35847,8 @@
else
DPMSINC="-I$DPMS_INCLUDE"
fi
@@ -36270,7 +36495,7 @@
fi
fi
-@@ -33267,8 +35852,8 @@
+@@ -33267,8 +35857,8 @@
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
@@ -36281,7 +36506,7 @@
if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33286,6 +35871,7 @@
+@@ -33286,6 +35876,7 @@
{
#ifndef DPMSCapable
char *p = (char *) DPMSCapable;
@@ -36289,7 +36514,7 @@
#endif
;
-@@ -33293,24 +35879,36 @@
+@@ -33293,24 +35884,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36334,15 +36559,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33319,12 +35917,13 @@
+@@ -33319,12 +35922,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl_DPMSCapable=no
+ ac_cv_have_decl_DPMSCapable=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_have_decl_DPMSCapable" >&5
-echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6
@@ -36351,7 +36577,7 @@
if test $ac_cv_have_decl_DPMSCapable = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSCAPABLE_PROTO 1
-@@ -33334,8 +35933,8 @@
+@@ -33334,8 +35938,8 @@
@@ -36362,7 +36588,7 @@
if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33353,6 +35952,7 @@
+@@ -33353,6 +35957,7 @@
{
#ifndef DPMSInfo
char *p = (char *) DPMSInfo;
@@ -36370,7 +36596,7 @@
#endif
;
-@@ -33360,24 +35960,36 @@
+@@ -33360,24 +35965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36415,15 +36641,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33386,12 +35998,13 @@
+@@ -33386,12 +36003,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_have_decl_DPMSInfo=no
+ ac_cv_have_decl_DPMSInfo=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_have_decl_DPMSInfo" >&5
-echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6
@@ -36432,7 +36659,7 @@
if test $ac_cv_have_decl_DPMSInfo = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSINFO_PROTO 1
-@@ -33422,13 +36035,13 @@
+@@ -33422,13 +36040,13 @@
IFS=$old_IFS
@@ -36450,7 +36677,7 @@
XSCREENSAVER=''
echo "Searching in $xscreensaver_prefixes"
-@@ -33439,14 +36052,14 @@
+@@ -33439,14 +36057,14 @@
bin/xscreensaver-hacks hacks; do
test -n "$XSCREENSAVER" && break
@@ -36468,7 +36695,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33489,12 +36102,12 @@
+@@ -33489,12 +36107,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36485,7 +36712,7 @@
XSCREENSAVER=$kde_cv_path
fi
-@@ -33518,8 +36131,8 @@
+@@ -33518,8 +36136,8 @@
_ACEOF
@@ -36496,16 +36723,16 @@
for subdir in lib/xscreensaver/config \
lib/X11/xscreensaver/config \
share/control-center/screensavers \
-@@ -33534,7 +36147,7 @@
+@@ -33534,7 +36152,7 @@
do
for j in $subdir/flame.xml;
do
- echo "configure: 33537: $i/$j" >&5
-+ echo "configure: 36150: $i/$j" >&5
++ echo "configure: 36155: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
XSCREENSAVER_CONFIG=$i
-@@ -33551,8 +36164,8 @@
+@@ -33551,8 +36169,8 @@
break
fi
done
@@ -36516,7 +36743,7 @@
cat >>confdefs.h <<_ACEOF
#define XSCREENSAVER_CONFIG_DIR "$XSCREENSAVER_CONFIG"
-@@ -33596,8 +36209,8 @@
+@@ -33596,8 +36214,8 @@
fi
for i in $ac_topsubdirs; do
@@ -36527,7 +36754,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -33608,8 +36221,8 @@
+@@ -33608,8 +36226,8 @@
else
install_it="no"
fi
@@ -36538,7 +36765,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -33711,125 +36324,125 @@
+@@ -33711,125 +36329,125 @@
wallpapers_SUBDIR_included_FALSE=
fi
@@ -36724,7 +36951,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -33849,39 +36462,58 @@
+@@ -33849,39 +36467,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -36799,7 +37026,7 @@
fi
fi
rm -f confcache
-@@ -33890,38 +36522,31 @@
+@@ -33890,38 +36527,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -36851,7 +37078,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
-@@ -34107,11 +36732,35 @@
+@@ -34107,11 +36737,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -36889,7 +37116,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -34120,8 +36769,43 @@
+@@ -34120,8 +36774,43 @@
fi
@@ -36934,7 +37161,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -34135,18 +36819,19 @@
+@@ -34135,18 +36824,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -36957,7 +37184,7 @@
as_basename=basename
else
as_basename=false
-@@ -34154,159 +36839,120 @@
+@@ -34154,159 +36844,120 @@
# Name of the executable.
@@ -37188,7 +37415,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -34315,7 +36961,19 @@
+@@ -34315,7 +36966,19 @@
as_mkdir_p=false
fi
@@ -37209,7 +37436,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'"
-@@ -34324,31 +36982,14 @@
+@@ -34324,31 +36987,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -37241,11 +37468,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
-@@ -34356,30 +36997,20 @@
+@@ -34356,30 +37002,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -37284,7 +37511,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -34406,19 +37037,21 @@
+@@ -34406,19 +37042,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -37296,7 +37523,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.
@@ -37312,7 +37539,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -34429,39 +37062,24 @@
+@@ -34429,39 +37067,24 @@
do
case $1 in
--*=*)
@@ -37358,7 +37585,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -34471,18 +37089,24 @@
+@@ -34471,18 +37094,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -37388,7 +37615,7 @@
esac
shift
-@@ -34498,96 +37122,108 @@
+@@ -34498,96 +37127,108 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -37567,7 +37794,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
-@@ -34599,533 +37235,684 @@
+@@ -34599,533 +37240,684 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -38724,7 +38951,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -35133,248 +37920,129 @@
+@@ -35133,248 +37925,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -38765,6 +38992,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'
@@ -39072,7 +39300,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -35385,135 +38053,39 @@
+@@ -35385,135 +38059,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -39234,7 +39462,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.
-@@ -35523,18 +38095,29 @@
+@@ -35523,18 +38101,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
@@ -39272,7 +39500,7 @@
else
continue
fi
-@@ -35556,53 +38139,79 @@
+@@ -35556,53 +38145,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -39385,7 +39613,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeartwork, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeartwork, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -41150,19 +41378,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -532,12 +541,6 @@
- for mng in $$mngs; do \
- $(INSTALL_DATA) $(top_srcdir)/IconThemes/$$theme/$$size/$$group/$$mng \
- $(DESTDIR)$(kde_icondir)/$$theme/$$size/$$group/$$mng ; done; \
-- if [ $$group = "actions" -a -d $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde ]; then \
-- (cd $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde && \
-- $(bindir)/kimage_concat kde- kde.png) ;\
-- $(INSTALL_DATA) $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde/kde.png \
-- $(DESTDIR)$(kde_icondir)/$$theme/$$size/$$group ; \
-- fi ; \
- fi ; \
- done ; \
- fi ; \
--- kscreensaver/kdesavers/data/Makefile.in
+++ kscreensaver/kdesavers/data/Makefile.in
@@ -119,6 +119,7 @@
More information about the pkg-kde-commits
mailing list