rev 4257 - trunk/packages/kdeaccessibility/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:45:44 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:45:41 +0000 (Sun, 30 Jul 2006)
New Revision: 4257
Modified:
trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2006-07-30 01:43:14 UTC (rev 4256)
+++ trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2006-07-30 01:45:41 UTC (rev 4257)
@@ -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
@@ -5547,7 +5547,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,
@@ -5566,7 +5566,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 $@
@@ -6200,7 +6200,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
@@ -7302,8 +7302,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
@@ -7376,7 +7377,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3108,285 +3892,273 @@
+@@ -3108,285 +3892,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7652,15 +7653,16 @@
-continue
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -7726,6 +7728,11 @@
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
@@ -7798,7 +7805,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
@@ -7833,7 +7840,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3395,8 +4167,8 @@
+@@ -3395,8 +4172,8 @@
depcc="$CC" am_compiler_list=
@@ -7844,7 +7851,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3485,8 +4257,8 @@
+@@ -3485,8 +4262,8 @@
fi
fi
@@ -7855,7 +7862,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3508,8 +4280,8 @@
+@@ -3508,8 +4285,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
@@ -7866,7 +7873,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3543,8 +4315,13 @@
+@@ -3543,8 +4320,13 @@
#endif
Syntax error
_ACEOF
@@ -7882,7 +7889,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3569,9 +4346,10 @@
+@@ -3569,9 +4351,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7894,7 +7901,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3581,8 +4359,13 @@
+@@ -3581,8 +4364,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7910,7 +7917,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3609,6 +4392,7 @@
+@@ -3609,6 +4397,7 @@
ac_preproc_ok=:
break
fi
@@ -7918,7 +7925,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3626,8 +4410,8 @@
+@@ -3626,8 +4415,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7929,7 +7936,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3650,8 +4434,13 @@
+@@ -3650,8 +4439,13 @@
#endif
Syntax error
_ACEOF
@@ -7945,7 +7952,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3676,9 +4465,10 @@
+@@ -3676,9 +4470,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7957,7 +7964,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3688,8 +4478,13 @@
+@@ -3688,8 +4483,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7973,7 +7980,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3716,6 +4511,7 @@
+@@ -3716,6 +4516,7 @@
ac_preproc_ok=:
break
fi
@@ -7981,7 +7988,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3766,18 +4562,22 @@
+@@ -3766,18 +4567,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8009,7 +8016,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3790,36 +4590,38 @@
+@@ -3790,36 +4595,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8056,7 +8063,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3832,55 +4634,85 @@
+@@ -3832,55 +4639,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8160,7 +8167,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3903,24 +4735,36 @@
+@@ -3903,24 +4740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8205,15 +8212,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3929,24 +4773,28 @@
+@@ -3929,24 +4778,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
@@ -8241,7 +8249,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3962,24 +4810,36 @@
+@@ -3962,24 +4815,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8286,7 +8294,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3988,70 +4848,53 @@
+@@ -3988,70 +4853,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8381,7 +8389,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4060,61 +4903,91 @@
+@@ -4060,61 +4908,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8458,20 +8466,21 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8494,7 +8503,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4123,8 +4996,8 @@
+@@ -4123,8 +5001,8 @@
depcc="$CXX" am_compiler_list=
@@ -8505,7 +8514,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4213,8 +5086,8 @@
+@@ -4213,8 +5091,8 @@
fi
fi
@@ -8516,7 +8525,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4232,8 +5105,8 @@
+@@ -4232,8 +5110,8 @@
@@ -8527,7 +8536,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4258,24 +5131,36 @@
+@@ -4258,24 +5136,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8572,7 +8581,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4284,13 +5169,14 @@
+@@ -4284,13 +5174,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8580,17 +8589,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:
-@@ -4332,17 +5218,16 @@
+@@ -4332,17 +5223,16 @@
fi
fi
@@ -8612,7 +8622,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4370,24 +5255,36 @@
+@@ -4370,24 +5260,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8657,17 +8667,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4396,7 +5293,9 @@
+@@ -4396,8 +5298,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"
-@@ -4410,29 +5309,28 @@
+ ac_ext=c
+@@ -4410,29 +5314,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8705,7 +8717,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4459,24 +5357,36 @@
+@@ -4459,24 +5362,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8750,17 +8762,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4485,7 +5395,9 @@
+@@ -4485,8 +5400,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"
-@@ -4499,13 +5411,13 @@
+ ac_ext=c
+@@ -4499,13 +5416,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8778,7 +8792,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4526,16 +5438,15 @@
+@@ -4526,16 +5443,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8799,7 +8813,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4562,24 +5473,36 @@
+@@ -4562,24 +5478,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8844,17 +8858,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4588,7 +5511,9 @@
+@@ -4588,8 +5516,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"
-@@ -4602,16 +5527,16 @@
+ ac_ext=c
+@@ -4602,16 +5532,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8875,7 +8891,7 @@
:
fi
-@@ -4626,16 +5551,15 @@
+@@ -4626,16 +5556,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"
@@ -8896,7 +8912,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4662,24 +5586,36 @@
+@@ -4662,24 +5591,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8941,17 +8957,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4688,7 +5624,9 @@
+@@ -4688,8 +5629,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"
-@@ -4702,27 +5640,26 @@
+ ac_ext=c
+@@ -4702,27 +5645,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8986,7 +9004,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4747,24 +5684,36 @@
+@@ -4747,24 +5689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9031,17 +9049,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4773,7 +5722,9 @@
+@@ -4773,8 +5727,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"
-@@ -4787,13 +5738,13 @@
+ ac_ext=c
+@@ -4787,13 +5743,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9059,7 +9079,7 @@
:
fi
-@@ -4801,16 +5752,15 @@
+@@ -4801,16 +5757,15 @@
;;
esac
@@ -9080,7 +9100,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4837,24 +5787,36 @@
+@@ -4837,24 +5792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9125,17 +9145,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4863,7 +5825,9 @@
+@@ -4863,8 +5830,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"
-@@ -4877,28 +5841,27 @@
+ ac_ext=c
+@@ -4877,28 +5846,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9172,7 +9194,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4925,24 +5888,36 @@
+@@ -4925,24 +5893,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9217,17 +9239,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4951,7 +5926,9 @@
+@@ -4951,8 +5931,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"
-@@ -4965,28 +5942,27 @@
+ ac_ext=c
+@@ -4965,28 +5947,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9264,7 +9288,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5013,24 +5989,36 @@
+@@ -5013,24 +5994,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9309,17 +9333,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5039,7 +6027,9 @@
+@@ -5039,8 +6032,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"
-@@ -5053,13 +6043,13 @@
+ ac_ext=c
+@@ -5053,13 +6048,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9337,7 +9363,7 @@
:
fi
-@@ -5071,13 +6061,13 @@
+@@ -5071,13 +6066,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9355,7 +9381,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5085,16 +6075,15 @@
+@@ -5085,16 +6080,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9376,7 +9402,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5121,24 +6110,36 @@
+@@ -5121,24 +6115,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9421,17 +9447,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5147,7 +6148,9 @@
+@@ -5147,8 +6153,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"
-@@ -5161,13 +6164,13 @@
+ ac_ext=c
+@@ -5161,13 +6169,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9449,7 +9477,7 @@
:
fi
-@@ -5179,16 +6182,15 @@
+@@ -5179,16 +6187,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9470,7 +9498,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5215,24 +6217,36 @@
+@@ -5215,24 +6222,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9515,17 +9543,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5241,7 +6255,9 @@
+@@ -5241,8 +6260,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"
-@@ -5255,28 +6271,27 @@
+ ac_ext=c
+@@ -5255,28 +6276,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9562,7 +9592,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5303,24 +6318,36 @@
+@@ -5303,24 +6323,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9607,17 +9637,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5329,7 +6356,9 @@
+@@ -5329,8 +6361,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"
-@@ -5343,28 +6372,27 @@
+ ac_ext=c
+@@ -5343,28 +6377,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9654,7 +9686,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5391,24 +6419,36 @@
+@@ -5391,24 +6424,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9699,17 +9731,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5417,7 +6457,9 @@
+@@ -5417,8 +6462,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"
-@@ -5431,28 +6473,27 @@
+ ac_ext=c
+@@ -5431,28 +6478,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9746,7 +9780,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5479,24 +6520,36 @@
+@@ -5479,24 +6525,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9791,17 +9825,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5505,7 +6558,9 @@
+@@ -5505,8 +6563,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"
-@@ -5519,13 +6574,13 @@
+ ac_ext=c
+@@ -5519,13 +6579,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9819,7 +9855,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5533,37 +6588,37 @@
+@@ -5533,37 +6593,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -9871,7 +9907,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5595,24 +6650,36 @@
+@@ -5595,24 +6655,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9916,7 +9952,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5621,9 +6688,10 @@
+@@ -5621,18 +6693,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9924,11 +9960,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
-@@ -5631,8 +6699,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -9939,7 +9976,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5652,16 +6720,15 @@
+@@ -5652,16 +6725,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -9960,7 +9997,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5688,24 +6755,36 @@
+@@ -5688,24 +6760,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10005,17 +10042,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5714,7 +6793,9 @@
+@@ -5714,8 +6798,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"
-@@ -5728,29 +6809,28 @@
+ ac_ext=c
+@@ -5728,29 +6814,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10053,7 +10092,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5777,24 +6857,36 @@
+@@ -5777,24 +6862,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10098,17 +10137,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5803,7 +6895,9 @@
+@@ -5803,8 +6900,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"
-@@ -5817,28 +6911,27 @@
+ ac_ext=c
+@@ -5817,28 +6916,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10145,7 +10186,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5865,24 +6958,36 @@
+@@ -5865,24 +6963,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10190,17 +10231,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5891,7 +6996,9 @@
+@@ -5891,8 +7001,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"
-@@ -5905,28 +7012,27 @@
+ ac_ext=c
+@@ -5905,28 +7017,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10237,7 +10280,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5953,24 +7059,36 @@
+@@ -5953,24 +7064,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10282,17 +10325,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5979,7 +7097,9 @@
+@@ -5979,8 +7102,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"
-@@ -5993,28 +7113,27 @@
+ ac_ext=c
+@@ -5993,28 +7118,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10329,7 +10374,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6041,24 +7160,36 @@
+@@ -6041,24 +7165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10374,17 +10419,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6067,7 +7198,9 @@
+@@ -6067,8 +7203,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"
-@@ -6081,28 +7214,27 @@
+ ac_ext=c
+@@ -6081,28 +7219,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10421,7 +10468,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6129,24 +7261,36 @@
+@@ -6129,24 +7266,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10466,17 +10513,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6155,7 +7299,9 @@
+@@ -6155,8 +7304,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"
-@@ -6169,13 +7315,13 @@
+ ac_ext=c
+@@ -6169,13 +7320,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10494,7 +10543,7 @@
:
fi
-@@ -6282,13 +7428,13 @@
+@@ -6282,13 +7433,13 @@
fi
@@ -10511,7 +10560,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6318,8 +7464,13 @@
+@@ -6318,8 +7469,13 @@
#endif
Syntax error
_ACEOF
@@ -10527,7 +10576,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6344,9 +7495,10 @@
+@@ -6344,9 +7500,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10539,7 +10588,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6356,8 +7508,13 @@
+@@ -6356,8 +7513,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10555,7 +10604,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6384,6 +7541,7 @@
+@@ -6384,6 +7546,7 @@
ac_preproc_ok=:
break
fi
@@ -10563,7 +10612,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6401,8 +7559,8 @@
+@@ -6401,8 +7564,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10574,7 +10623,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6425,8 +7583,13 @@
+@@ -6425,8 +7588,13 @@
#endif
Syntax error
_ACEOF
@@ -10590,7 +10639,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6451,9 +7614,10 @@
+@@ -6451,9 +7619,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10602,7 +10651,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6463,8 +7627,13 @@
+@@ -6463,8 +7632,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10618,7 +10667,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6491,6 +7660,7 @@
+@@ -6491,6 +7665,7 @@
ac_preproc_ok=:
break
fi
@@ -10626,7 +10675,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6517,16 +7687,15 @@
+@@ -6517,16 +7692,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -10647,7 +10696,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6553,24 +7722,36 @@
+@@ -6553,24 +7727,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10692,17 +10741,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6579,7 +7760,9 @@
+@@ -6579,8 +7765,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"
-@@ -6593,22 +7776,21 @@
+ ac_ext=c
+@@ -6593,22 +7781,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10731,7 +10782,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6624,36 +7806,36 @@
+@@ -6624,36 +7811,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -10778,7 +10829,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6680,24 +7862,36 @@
+@@ -6680,24 +7867,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10823,17 +10874,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6706,7 +7900,9 @@
+@@ -6706,8 +7905,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"
-@@ -6720,29 +7916,28 @@
+ ac_ext=c
+@@ -6720,29 +7921,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10871,7 +10924,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6769,24 +7964,36 @@
+@@ -6769,24 +7969,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10916,17 +10969,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6795,7 +8002,9 @@
+@@ -6795,8 +8007,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"
-@@ -6809,13 +8018,13 @@
+ ac_ext=c
+@@ -6809,13 +8023,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10944,7 +10999,7 @@
:
fi
-@@ -6825,13 +8034,13 @@
+@@ -6825,13 +8039,13 @@
@@ -10962,7 +11017,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6844,13 +8053,13 @@
+@@ -6844,13 +8058,13 @@
@@ -10980,7 +11035,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6861,216 +8070,36 @@
+@@ -6861,216 +8075,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -10993,25 +11048,9 @@
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+ # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-+ kde_use_nmcheck=no
-+fi
+-else
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11020,6 +11059,12 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -11030,7 +11075,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 ()
-{
@@ -11201,12 +11253,12 @@
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
--
+
+
+
-
--
--
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11216,7 +11268,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7089,12 +8118,12 @@
+@@ -7089,12 +8123,12 @@
esac
else
enable_shared=yes
@@ -11233,7 +11285,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7113,7 +8142,8 @@
+@@ -7113,7 +8147,8 @@
esac
else
enable_static=no
@@ -11243,7 +11295,7 @@
-@@ -7122,11 +8152,11 @@
+@@ -7122,11 +8157,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -11259,7 +11311,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7147,8 +8177,8 @@
+@@ -7147,8 +8182,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11270,7 +11322,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7164,14 +8194,13 @@
+@@ -7164,14 +8199,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11289,7 +11341,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7190,10 +8219,11 @@
+@@ -7190,10 +8224,11 @@
esac
else
enable_fast_install=yes
@@ -11304,7 +11356,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7217,7 +8247,7 @@
+@@ -7217,7 +8252,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
@@ -11313,7 +11365,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7246,37 +8276,184 @@
+@@ -7246,37 +8281,184 @@
fi
SED=$lt_cv_path_SED
@@ -11389,7 +11441,10 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -11399,11 +11454,8 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
+
++
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
@@ -11476,25 +11528,25 @@
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
@@ -11515,7 +11567,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7305,11 +8482,11 @@
+@@ -7305,11 +8487,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11531,7 +11583,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7322,7 +8499,7 @@
+@@ -7322,7 +8504,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,
@@ -11540,7 +11592,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'*)
-@@ -7342,21 +8519,21 @@
+@@ -7342,21 +8524,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11569,7 +11621,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7366,29 +8543,38 @@
+@@ -7366,29 +8548,38 @@
;;
esac
fi
@@ -11616,7 +11668,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7396,56 +8582,63 @@
+@@ -7396,56 +8587,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -11714,7 +11766,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7472,44 +8665,36 @@
+@@ -7472,44 +8670,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -11769,7 +11821,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7525,7 +8710,7 @@
+@@ -7525,7 +8715,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -11778,7 +11830,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
-@@ -7541,43 +8726,27 @@
+@@ -7541,43 +8731,27 @@
esac
;;
@@ -11835,7 +11887,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
-@@ -7596,32 +8765,22 @@
+@@ -7596,32 +8770,22 @@
;;
openbsd*)
@@ -11871,7 +11923,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]'
-@@ -7642,17 +8801,20 @@
+@@ -7642,17 +8806,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11895,7 +11947,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
-@@ -7661,14 +8823,17 @@
+@@ -7661,14 +8828,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -11916,16 +11968,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7695,7 +8860,7 @@
+@@ -7695,7 +8865,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7698 "configure"' > conftest.$ac_ext
-+ echo '#line 8863 "configure"' > conftest.$ac_ext
++ echo '#line 8868 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7738,14 +8903,13 @@
+@@ -7738,14 +8908,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -11942,7 +11994,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7757,7 +8921,6 @@
+@@ -7757,7 +8926,6 @@
esac
;;
*64-bit*)
@@ -11950,7 +12002,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7782,8 +8945,8 @@
+@@ -7782,8 +8950,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -11961,7 +12013,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7809,24 +8972,36 @@
+@@ -7809,24 +8977,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12006,18 +12058,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7835,8 +9010,9 @@
+@@ -7835,9 +9015,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
-@@ -7846,13 +9022,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7846,25 +9027,45 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12030,6 +12084,18 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
+-
+-esac
+-
+-need_locks="$enable_libtool_lock"
+-
+-
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
@@ -12050,21 +12116,22 @@
+ rm -rf conftest*
+ ;;
+
-
- esac
-
-@@ -7860,8 +9056,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7885,24 +9081,36 @@
++if test "${ac_cv_header_stdc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -7885,24 +9086,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12109,18 +12176,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7911,8 +9119,9 @@
+@@ -7911,9 +9124,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
-@@ -7969,6 +9178,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7969,6 +9183,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12128,7 +12197,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7988,18 +9198,27 @@
+@@ -7988,18 +9203,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12162,7 +12231,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8012,12 +9231,14 @@
+@@ -8012,12 +9236,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12180,7 +12249,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8040,9 +9261,9 @@
+@@ -8040,9 +9266,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12193,7 +12262,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8056,24 +9277,36 @@
+@@ -8056,24 +9282,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12238,15 +12307,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8082,12 +9315,14 @@
+@@ -8082,12 +9320,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
@@ -12256,7 +12326,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8102,18 +9337,19 @@
+@@ -8102,18 +9342,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12284,7 +12354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8124,24 +9360,36 @@
+@@ -8124,24 +9365,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12329,17 +12399,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8150,15 +9398,16 @@
+@@ -8150,15 +9403,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; }
@@ -12351,7 +12422,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8167,8 +9416,13 @@
+@@ -8167,8 +9421,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12367,7 +12438,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8192,9 +9446,10 @@
+@@ -8192,9 +9451,10 @@
ac_header_preproc=no
fi
@@ -12380,7 +12451,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8218,25 +9473,19 @@
+@@ -8218,25 +9478,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;}
@@ -12413,7 +12484,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8248,324 +9497,693 @@
+@@ -8248,324 +9502,693 @@
done
@@ -13144,7 +13215,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
@@ -13207,7 +13278,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
@@ -13370,7 +13441,7 @@
# [They come from Ultrix. What could be older than Ultrix?!! ;)]
# Character class describing NM global symbol codes.
-@@ -8574,9 +10192,6 @@
+@@ -8574,9 +10197,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13380,7 +13451,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8598,14 +10213,30 @@
+@@ -8598,14 +10218,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -13413,7 +13484,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8623,14 +10254,17 @@
+@@ -8623,14 +10259,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13433,7 +13504,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8748,15 +10382,15 @@
+@@ -8748,15 +10387,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
@@ -13455,7 +13526,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8770,8 +10404,8 @@
+@@ -8770,8 +10409,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13466,7 +13537,7 @@
objdir=$lt_cv_objdir
-@@ -8792,7 +10426,7 @@
+@@ -8792,7 +10431,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13475,7 +13546,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8812,7 +10446,7 @@
+@@ -8812,7 +10451,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13484,7 +13555,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8822,8 +10456,8 @@
+@@ -8822,8 +10461,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
@@ -13495,7 +13566,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8836,32 +10470,34 @@
+@@ -8836,32 +10475,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13537,7 +13608,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8874,27 +10510,41 @@
+@@ -8874,27 +10515,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13586,7 +13657,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8902,8 +10552,8 @@
+@@ -8902,8 +10557,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
@@ -13597,7 +13668,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8916,32 +10566,34 @@
+@@ -8916,32 +10571,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13639,7 +13710,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8954,27 +10606,41 @@
+@@ -8954,27 +10611,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13688,7 +13759,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8982,8 +10648,8 @@
+@@ -8982,8 +10653,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
@@ -13699,7 +13770,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8996,32 +10662,34 @@
+@@ -8996,32 +10667,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13741,7 +13812,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9034,27 +10702,41 @@
+@@ -9034,27 +10707,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13790,7 +13861,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9069,6 +10751,7 @@
+@@ -9069,6 +10756,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -13798,7 +13869,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9088,21 +10771,32 @@
+@@ -9088,21 +10776,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -13835,7 +13906,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9122,7 +10816,7 @@
+@@ -9122,7 +10821,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13844,7 +13915,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
-@@ -9154,17 +10848,17 @@
+@@ -9154,17 +10853,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13868,7 +13939,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9184,7 +10878,7 @@
+@@ -9184,7 +10883,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13877,7 +13948,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
-@@ -9216,11 +10910,11 @@
+@@ -9216,11 +10915,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13893,7 +13964,7 @@
fi
else
-@@ -9235,21 +10929,21 @@
+@@ -9235,21 +10934,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -13922,7 +13993,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9279,68 +10973,25 @@
+@@ -9279,68 +10978,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14006,7 +14077,7 @@
## CAVEAT EMPTOR:
-@@ -9354,8 +11005,8 @@
+@@ -9354,8 +11010,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14017,7 +14088,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9369,26 +11020,28 @@
+@@ -9369,26 +11025,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 \
@@ -14026,12 +14097,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9375: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11026: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11031: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9379: \$? = $ac_status" >&5
-+ echo "$as_me:11030: \$? = $ac_status" >&5
++ echo "$as_me:11035: \$? = $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
@@ -14053,7 +14124,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"
-@@ -9402,8 +11055,8 @@
+@@ -9402,8 +11060,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14064,7 +14135,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9441,6 +11094,11 @@
+@@ -9441,6 +11099,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14076,7 +14147,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9457,7 +11115,7 @@
+@@ -9457,7 +11120,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14085,7 +14156,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9483,6 +11141,16 @@
+@@ -9483,6 +11146,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14102,7 +14173,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9494,7 +11162,7 @@
+@@ -9494,7 +11167,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.
@@ -14111,7 +14182,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9517,13 +11185,20 @@
+@@ -9517,13 +11190,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14134,7 +14205,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9538,15 +11213,15 @@
+@@ -9538,15 +11218,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14156,7 +14227,7 @@
;;
sunos4*)
-@@ -9555,7 +11230,7 @@
+@@ -9555,7 +11235,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14165,7 +14236,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9568,6 +11243,17 @@
+@@ -9568,6 +11248,17 @@
fi
;;
@@ -14183,7 +14254,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9579,16 +11265,16 @@
+@@ -9579,16 +11270,16 @@
esac
fi
@@ -14204,7 +14275,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9602,26 +11288,28 @@
+@@ -9602,26 +11293,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 \
@@ -14213,12 +14284,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11294: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11299: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9612: \$? = $ac_status" >&5
-+ echo "$as_me:11298: \$? = $ac_status" >&5
++ echo "$as_me:11303: \$? = $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
@@ -14240,7 +14311,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9634,7 +11322,7 @@
+@@ -9634,7 +11327,7 @@
fi
fi
@@ -14249,7 +14320,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9644,8 +11332,50 @@
+@@ -9644,8 +11337,50 @@
;;
esac
@@ -14302,7 +14373,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9656,60 +11386,58 @@
+@@ -9656,60 +11391,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14324,12 +14395,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9675: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11398: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11403: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9679: \$? = $ac_status" >&5
-+ echo "$as_me:11402: \$? = $ac_status" >&5
++ echo "$as_me:11407: \$? = $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
@@ -14381,7 +14452,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;}
-@@ -9719,8 +11447,8 @@
+@@ -9719,8 +11452,8 @@
need_locks=no
fi
@@ -14392,7 +14463,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9758,6 +11486,16 @@
+@@ -9758,6 +11491,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14409,7 +14480,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9768,6 +11506,10 @@
+@@ -9768,6 +11511,10 @@
with_gnu_ld=no
fi
;;
@@ -14420,7 +14491,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9778,6 +11520,27 @@
+@@ -9778,6 +11525,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14448,7 +14519,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9815,7 +11578,7 @@
+@@ -9815,7 +11583,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14457,7 +14528,7 @@
else
ld_shlibs=no
fi
-@@ -9825,13 +11588,13 @@
+@@ -9825,13 +11593,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'
@@ -14474,7 +14545,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
-@@ -9840,23 +11603,70 @@
+@@ -9840,23 +11608,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14550,7 +14621,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9870,13 +11680,40 @@
+@@ -9870,13 +11685,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14593,7 +14664,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9886,24 +11723,19 @@
+@@ -9886,24 +11728,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14625,7 +14696,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9915,7 +11747,7 @@
+@@ -9915,7 +11752,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14634,7 +14705,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9937,9 +11769,21 @@
+@@ -9937,9 +11774,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
@@ -14658,7 +14729,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9956,7 +11800,7 @@
+@@ -9956,7 +11805,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -14667,7 +14738,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`
-@@ -9975,8 +11819,12 @@
+@@ -9975,8 +11824,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -14680,7 +14751,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9984,22 +11832,23 @@
+@@ -9984,22 +11837,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -14711,7 +14782,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10015,24 +11864,36 @@
+@@ -10015,24 +11869,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14756,14 +14827,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10046,19 +11907,20 @@
+@@ -10046,19 +11912,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
@@ -14781,7 +14853,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10077,24 +11939,36 @@
+@@ -10077,24 +11944,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14826,17 +14898,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10108,7 +11982,9 @@
+@@ -10108,8 +11987,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
-@@ -10118,13 +11994,11 @@
+
+@@ -10118,13 +11999,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -14853,7 +14927,7 @@
fi
fi
;;
-@@ -10137,7 +12011,7 @@
+@@ -10137,7 +12016,7 @@
ld_shlibs=no
;;
@@ -14862,7 +14936,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10147,13 +12021,13 @@
+@@ -10147,13 +12026,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -14879,7 +14953,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.
-@@ -10163,52 +12037,52 @@
+@@ -10163,52 +12042,52 @@
;;
darwin* | rhapsody*)
@@ -14972,7 +15046,7 @@
fi
;;
-@@ -10242,8 +12116,8 @@
+@@ -10242,8 +12121,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -14983,7 +15057,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10251,7 +12125,7 @@
+@@ -10251,7 +12130,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -14992,7 +15066,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
-@@ -10265,47 +12139,62 @@
+@@ -10265,47 +12144,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15079,7 +15153,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10319,7 +12208,7 @@
+@@ -10319,7 +12213,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15088,7 +15162,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'
-@@ -10329,7 +12218,7 @@
+@@ -10329,7 +12223,7 @@
link_all_deplibs=yes
;;
@@ -15097,7 +15171,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10352,7 +12241,8 @@
+@@ -10352,7 +12246,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
@@ -15107,7 +15181,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10362,7 +12252,7 @@
+@@ -10362,7 +12257,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15116,7 +15190,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10373,14 +12263,14 @@
+@@ -10373,14 +12268,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15133,7 +15207,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'
-@@ -10392,13 +12282,13 @@
+@@ -10392,13 +12287,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15149,7 +15223,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10406,21 +12296,15 @@
+@@ -10406,21 +12301,15 @@
hardcode_libdir_separator=:
;;
@@ -15175,7 +15249,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'
-@@ -10429,8 +12313,18 @@
+@@ -10429,8 +12318,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15196,7 +15270,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10439,7 +12333,7 @@
+@@ -10439,7 +12338,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.
@@ -15205,7 +15279,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10487,36 +12381,45 @@
+@@ -10487,36 +12386,45 @@
fi
;;
@@ -15272,7 +15346,7 @@
;;
uts4*)
-@@ -10531,15 +12434,10 @@
+@@ -10531,15 +12439,10 @@
esac
fi
@@ -15290,7 +15364,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10557,8 +12455,8 @@
+@@ -10557,8 +12460,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.
@@ -15301,7 +15375,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10572,6 +12470,7 @@
+@@ -10572,6 +12475,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15309,7 +15383,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10594,20 +12493,20 @@
+@@ -10594,20 +12498,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15335,7 +15409,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10617,7 +12516,20 @@
+@@ -10617,7 +12521,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15357,7 +15431,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10682,7 +12594,7 @@
+@@ -10682,7 +12599,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15366,7 +15440,7 @@
;;
beos*)
-@@ -10691,7 +12603,7 @@
+@@ -10691,7 +12608,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15375,7 +15449,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10707,7 +12619,7 @@
+@@ -10707,7 +12624,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15384,7 +15458,7 @@
need_version=no
need_lib_prefix=no
-@@ -10719,7 +12631,8 @@
+@@ -10719,7 +12636,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15394,7 +15468,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10749,7 +12662,7 @@
+@@ -10749,7 +12667,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15403,7 +15477,7 @@
;;
esac
;;
-@@ -10772,7 +12685,7 @@
+@@ -10772,7 +12690,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15412,7 +15486,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"`
-@@ -10795,20 +12708,17 @@
+@@ -10795,20 +12713,17 @@
dynamic_linker=no
;;
@@ -15444,7 +15518,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10826,14 +12736,19 @@
+@@ -10826,14 +12741,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15466,7 +15540,7 @@
esac
;;
-@@ -10853,9 +12768,9 @@
+@@ -10853,9 +12773,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15478,7 +15552,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10870,7 +12785,7 @@
+@@ -10870,7 +12790,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15487,7 +15561,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10881,7 +12796,7 @@
+@@ -10881,7 +12801,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15496,7 +15570,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10893,11 +12808,23 @@
+@@ -10893,13 +12813,25 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15505,6 +15579,8 @@
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
@@ -15522,10 +15598,12 @@
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
++ version_type=linux
++ else
version_type=irix
-@@ -10936,29 +12863,26 @@
+ fi ;;
+ esac
+@@ -10936,29 +12868,26 @@
;;
# This must be Linux ELF.
@@ -15562,7 +15640,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,
-@@ -10968,6 +12892,18 @@
+@@ -10968,6 +12897,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15581,7 +15659,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10977,7 +12913,7 @@
+@@ -10977,7 +12918,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15590,7 +15668,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11005,8 +12941,13 @@
+@@ -11005,8 +12946,13 @@
openbsd*)
version_type=sunos
@@ -15605,7 +15683,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
-@@ -11026,7 +12967,7 @@
+@@ -11026,7 +12972,7 @@
os2*)
libname_spec='$name'
@@ -15614,7 +15692,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11044,13 +12985,6 @@
+@@ -11044,13 +12990,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15628,7 +15706,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11076,7 +13010,7 @@
+@@ -11076,7 +13015,7 @@
need_version=yes
;;
@@ -15637,7 +15715,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'
-@@ -11109,6 +13043,29 @@
+@@ -11109,6 +13048,29 @@
fi
;;
@@ -15667,7 +15745,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11120,16 +13077,21 @@
+@@ -11120,16 +13082,21 @@
dynamic_linker=no
;;
esac
@@ -15695,7 +15773,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11149,8 +13111,8 @@
+@@ -11149,8 +13116,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -15706,7 +15784,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11163,29 +13125,29 @@
+@@ -11163,29 +13130,29 @@
striplib=
old_striplib=
@@ -15746,7 +15824,7 @@
;;
esac
fi
-@@ -11217,8 +13179,8 @@
+@@ -11217,8 +13184,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -15757,7 +15835,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11231,40 +13193,52 @@
+@@ -11231,40 +13198,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15822,15 +15900,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11273,14 +13247,15 @@
+@@ -11273,14 +13252,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
@@ -15841,7 +15920,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11294,8 +13269,8 @@
+@@ -11294,8 +13274,8 @@
;;
*)
@@ -15852,7 +15931,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11322,53 +13297,59 @@
+@@ -11322,53 +13302,59 @@
#undef shl_load
@@ -15931,15 +16010,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11377,18 +13358,19 @@
+@@ -11377,18 +13363,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
@@ -15956,7 +16036,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11401,40 +13383,52 @@
+@@ -11401,40 +13388,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16021,15 +16101,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11443,19 +13437,20 @@
+@@ -11443,19 +13442,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
@@ -16047,7 +16128,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11482,53 +13477,59 @@
+@@ -11482,53 +13482,59 @@
#undef dlopen
@@ -16126,15 +16207,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11537,18 +13538,19 @@
+@@ -11537,18 +13543,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
@@ -16151,7 +16233,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11561,40 +13563,52 @@
+@@ -11561,40 +13568,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16216,15 +16298,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11603,19 +13617,20 @@
+@@ -11603,19 +13622,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
@@ -16242,7 +16325,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11628,40 +13643,52 @@
+@@ -11628,40 +13648,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16307,15 +16390,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11670,19 +13697,20 @@
+@@ -11670,19 +13702,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
@@ -16333,7 +16417,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11695,40 +13723,52 @@
+@@ -11695,40 +13728,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16398,15 +16482,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11737,14 +13777,15 @@
+@@ -11737,14 +13782,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
@@ -16417,7 +16502,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11779,13 +13820,13 @@
+@@ -11779,13 +13825,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16434,16 +16519,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11795,7 +13836,7 @@
+@@ -11795,7 +13841,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11798 "configure"
-+#line 13839 "configure"
++#line 13844 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11852,6 +13893,8 @@
+@@ -11852,6 +13898,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16452,7 +16537,7 @@
exit (status);
}
-@@ -11861,12 +13904,12 @@
+@@ -11861,12 +13909,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16467,7 +16552,7 @@
esac
else :
# compilation failed
-@@ -11877,13 +13920,13 @@
+@@ -11877,13 +13925,13 @@
fi
@@ -16486,16 +16571,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11893,7 +13936,7 @@
+@@ -11893,7 +13941,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11896 "configure"
-+#line 13939 "configure"
++#line 13944 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11950,6 +13993,8 @@
+@@ -11950,6 +13998,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16504,7 +16589,7 @@
exit (status);
}
-@@ -11959,12 +14004,12 @@
+@@ -11959,12 +14009,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16519,7 +16604,7 @@
esac
else :
# compilation failed
-@@ -11975,8 +14020,8 @@
+@@ -11975,8 +14025,8 @@
fi
@@ -16530,7 +16615,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11997,19 +14042,19 @@
+@@ -11997,19 +14047,19 @@
fi
@@ -16558,7 +16643,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12018,58 +14063,21 @@
+@@ -12018,58 +14068,21 @@
fi
;;
@@ -16624,7 +16709,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12084,7 +14092,8 @@
+@@ -12084,7 +14097,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.
@@ -16634,7 +16719,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 \
-@@ -12198,11 +14207,11 @@
+@@ -12198,11 +14212,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16648,7 +16733,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12232,6 +14241,12 @@
+@@ -12232,6 +14246,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16661,7 +16746,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12243,6 +14258,9 @@
+@@ -12243,6 +14263,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -16671,7 +16756,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12262,7 +14280,7 @@
+@@ -12262,7 +14285,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -16680,7 +16765,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12293,7 +14311,7 @@
+@@ -12293,7 +14316,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -16689,7 +16774,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12308,7 +14326,7 @@
+@@ -12308,7 +14331,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -16698,7 +16783,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12535,7 +14553,10 @@
+@@ -12535,7 +14558,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.
@@ -16710,7 +16795,7 @@
fi
-@@ -12548,11 +14569,11 @@
+@@ -12548,11 +14574,11 @@
CC="$lt_save_CC"
@@ -16726,7 +16811,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12570,6 +14591,9 @@
+@@ -12570,6 +14596,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -16736,7 +16821,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12600,8 +14624,10 @@
+@@ -12600,8 +14629,10 @@
case $tagname in
CXX)
@@ -16749,7 +16834,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12620,6 +14646,7 @@
+@@ -12620,6 +14651,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -16757,7 +16842,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12637,7 +14664,7 @@
+@@ -12637,7 +14669,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -16766,7 +16851,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12647,17 +14674,34 @@
+@@ -12647,17 +14679,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -16802,7 +16887,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12668,18 +14712,27 @@
+@@ -12668,18 +14717,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -16833,7 +16918,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12693,18 +14746,18 @@
+@@ -12693,18 +14751,18 @@
# Set up default GNU C++ configuration
@@ -16858,7 +16943,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12733,11 +14786,11 @@
+@@ -12733,11 +14791,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16874,7 +16959,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12750,7 +14803,7 @@
+@@ -12750,7 +14808,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,
@@ -16883,7 +16968,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'*)
-@@ -12770,21 +14823,21 @@
+@@ -12770,21 +14828,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -16912,7 +16997,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12794,8 +14847,8 @@
+@@ -12794,8 +14852,8 @@
;;
esac
fi
@@ -16923,7 +17008,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12803,8 +14856,8 @@
+@@ -12803,8 +14861,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
@@ -16934,7 +17019,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12830,7 +14883,7 @@
+@@ -12830,7 +14888,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.
@@ -16943,7 +17028,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12845,8 +14898,8 @@
+@@ -12845,8 +14903,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -16954,7 +17039,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12861,8 +14914,23 @@
+@@ -12861,8 +14919,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -16980,7 +17065,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12879,7 +14947,7 @@
+@@ -12879,7 +14952,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -16989,7 +17074,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`
-@@ -12898,8 +14966,12 @@
+@@ -12898,8 +14971,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17002,7 +17087,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12908,15 +14980,16 @@
+@@ -12908,15 +14985,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17023,7 +17108,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.
-@@ -12938,24 +15011,36 @@
+@@ -12938,24 +15016,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17068,14 +17153,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12969,20 +15054,21 @@
+@@ -12969,20 +15059,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
@@ -17093,7 +17179,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13001,24 +15087,36 @@
+@@ -13001,24 +15092,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17138,17 +17224,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13032,7 +15130,9 @@
+@@ -13032,8 +15135,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
-@@ -13042,16 +15142,26 @@
+
+@@ -13042,16 +15147,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17180,7 +17268,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13065,12 +15175,12 @@
+@@ -13065,12 +15180,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'
@@ -17195,7 +17283,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
-@@ -13079,70 +15189,81 @@
+@@ -13079,70 +15194,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17329,7 +17417,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13153,14 +15274,14 @@
+@@ -13153,14 +15279,14 @@
;;
esac
;;
@@ -17346,7 +17434,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13177,12 +15298,12 @@
+@@ -13177,12 +15303,12 @@
# location of the library.
case $cc_basename in
@@ -17362,7 +17450,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13191,11 +15312,11 @@
+@@ -13191,11 +15317,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.
@@ -17376,7 +17464,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13205,33 +15326,22 @@
+@@ -13205,33 +15331,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17417,7 +17505,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13242,17 +15352,20 @@
+@@ -13242,17 +15357,20 @@
esac
case $cc_basename in
@@ -17444,7 +17532,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13268,12 +15381,15 @@
+@@ -13268,12 +15386,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17464,7 +17552,7 @@
;;
esac
fi
-@@ -13284,11 +15400,25 @@
+@@ -13284,11 +15405,25 @@
;;
esac
;;
@@ -17492,7 +17580,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13299,9 +15429,9 @@
+@@ -13299,9 +15434,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17504,7 +17592,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13310,16 +15440,16 @@
+@@ -13310,16 +15445,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17525,7 +17613,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13337,20 +15467,44 @@
+@@ -13337,20 +15472,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17558,6 +17646,9 @@
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- # Compaq C++
+- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ pgCC*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -17568,15 +17659,13 @@
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
- # Compaq C++
-- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ # Compaq C++
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13378,7 +15532,7 @@
+@@ -13378,7 +15537,7 @@
;;
mvs*)
case $cc_basename in
@@ -17585,7 +17674,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13388,7 +15542,7 @@
+@@ -13388,7 +15547,7 @@
;;
esac
;;
@@ -17594,7 +17683,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=
-@@ -13399,15 +15553,31 @@
+@@ -13399,15 +15558,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::"'
;;
@@ -17628,7 +17717,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13417,14 +15587,14 @@
+@@ -13417,14 +15592,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17646,7 +17735,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13442,7 +15612,7 @@
+@@ -13442,7 +15617,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17655,7 +17744,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13461,13 +15631,13 @@
+@@ -13461,13 +15636,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -17671,7 +17760,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13476,17 +15646,17 @@
+@@ -13476,17 +15651,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -17693,7 +17782,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13505,7 +15675,7 @@
+@@ -13505,7 +15680,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17702,7 +17791,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13526,27 +15696,14 @@
+@@ -13526,27 +15701,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17732,7 +17821,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13559,36 +15716,33 @@
+@@ -13559,36 +15721,33 @@
;;
solaris*)
case $cc_basename in
@@ -17781,7 +17870,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13596,9 +15750,9 @@
+@@ -13596,9 +15755,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -17793,7 +17882,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13608,9 +15762,9 @@
+@@ -13608,9 +15767,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
@@ -17805,7 +17894,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13619,9 +15773,9 @@
+@@ -13619,9 +15778,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -17817,7 +17906,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13634,12 +15788,63 @@
+@@ -13634,12 +15793,63 @@
;;
esac
;;
@@ -17883,7 +17972,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13659,8 +15864,8 @@
+@@ -13659,8 +15869,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -17894,7 +17983,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13696,7 +15901,7 @@
+@@ -13696,7 +15906,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.
@@ -17903,7 +17992,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13736,7 +15941,7 @@
+@@ -13736,7 +15946,7 @@
fi
;;
@@ -17912,7 +18001,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13772,6 +15977,29 @@
+@@ -13772,6 +15982,29 @@
$rm -f confest.$objext
@@ -17942,7 +18031,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13780,8 +16008,8 @@
+@@ -13780,8 +16013,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17953,7 +18042,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13819,6 +16047,10 @@
+@@ -13819,6 +16052,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17964,7 +18053,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13827,7 +16059,7 @@
+@@ -13827,7 +16064,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17973,7 +18062,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13852,18 +16084,28 @@
+@@ -13852,18 +16089,28 @@
;;
chorus*)
case $cc_basename in
@@ -18005,7 +18094,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13871,22 +16113,22 @@
+@@ -13871,22 +16118,22 @@
;;
esac
;;
@@ -18034,7 +18123,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13899,9 +16141,13 @@
+@@ -13899,9 +16146,13 @@
;;
esac
;;
@@ -18049,7 +18138,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13910,20 +16156,26 @@
+@@ -13910,20 +16161,26 @@
;;
esac
;;
@@ -18080,7 +18169,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13940,25 +16192,25 @@
+@@ -13940,25 +16197,25 @@
;;
mvs*)
case $cc_basename in
@@ -18111,7 +18200,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13972,24 +16224,15 @@
+@@ -13972,24 +16229,15 @@
;;
psos*)
;;
@@ -18138,7 +18227,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13999,12 +16242,12 @@
+@@ -13999,12 +16247,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18153,7 +18242,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14014,7 +16257,7 @@
+@@ -14014,7 +16262,7 @@
;;
tandem*)
case $cc_basename in
@@ -18162,7 +18251,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14022,7 +16265,14 @@
+@@ -14022,7 +16270,14 @@
;;
esac
;;
@@ -18178,7 +18267,7 @@
;;
vxworks*)
;;
-@@ -14032,16 +16282,16 @@
+@@ -14032,16 +16287,16 @@
esac
fi
@@ -18199,7 +18288,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14055,26 +16305,28 @@
+@@ -14055,26 +16310,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 \
@@ -18208,12 +18297,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14061: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16311: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16316: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14065: \$? = $ac_status" >&5
-+ echo "$as_me:16315: \$? = $ac_status" >&5
++ echo "$as_me:16320: \$? = $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
@@ -18235,7 +18324,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14087,7 +16339,7 @@
+@@ -14087,7 +16344,7 @@
fi
fi
@@ -18244,7 +18333,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14097,8 +16349,50 @@
+@@ -14097,8 +16354,50 @@
;;
esac
@@ -18297,7 +18386,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14109,60 +16403,58 @@
+@@ -14109,60 +16408,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18319,12 +18408,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14128: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16420: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14132: \$? = $ac_status" >&5
-+ echo "$as_me:16419: \$? = $ac_status" >&5
++ echo "$as_me:16424: \$? = $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
@@ -18376,7 +18465,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;}
-@@ -14172,8 +16464,8 @@
+@@ -14172,8 +16469,8 @@
need_locks=no
fi
@@ -18387,7 +18476,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14190,22 +16482,20 @@
+@@ -14190,22 +16487,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18416,7 +18505,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14223,8 +16513,8 @@
+@@ -14223,8 +16518,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.
@@ -18427,7 +18516,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14238,6 +16528,7 @@
+@@ -14238,6 +16533,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18435,7 +18524,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14260,20 +16551,20 @@
+@@ -14260,20 +16556,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18461,7 +18550,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14283,7 +16574,20 @@
+@@ -14283,7 +16579,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18483,7 +18572,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14348,7 +16652,7 @@
+@@ -14348,7 +16657,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18492,7 +18581,7 @@
;;
beos*)
-@@ -14357,7 +16661,7 @@
+@@ -14357,7 +16666,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18501,7 +18590,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14373,7 +16677,7 @@
+@@ -14373,7 +16682,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18510,7 +18599,7 @@
need_version=no
need_lib_prefix=no
-@@ -14385,7 +16689,8 @@
+@@ -14385,7 +16694,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18520,7 +18609,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14415,7 +16720,7 @@
+@@ -14415,7 +16725,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18529,7 +18618,7 @@
;;
esac
;;
-@@ -14438,7 +16743,7 @@
+@@ -14438,7 +16748,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18538,7 +18627,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"`
-@@ -14461,20 +16766,17 @@
+@@ -14461,20 +16771,17 @@
dynamic_linker=no
;;
@@ -18570,7 +18659,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14492,14 +16794,19 @@
+@@ -14492,14 +16799,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18592,7 +18681,7 @@
esac
;;
-@@ -14519,9 +16826,9 @@
+@@ -14519,9 +16831,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18604,7 +18693,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14536,7 +16843,7 @@
+@@ -14536,7 +16848,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18613,7 +18702,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14547,7 +16854,7 @@
+@@ -14547,7 +16859,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18622,7 +18711,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14559,6 +16866,18 @@
+@@ -14559,6 +16871,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18641,7 +18730,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14602,29 +16921,26 @@
+@@ -14602,29 +16926,26 @@
;;
# This must be Linux ELF.
@@ -18678,7 +18767,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,
-@@ -14634,6 +16950,18 @@
+@@ -14634,6 +16955,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18697,7 +18786,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14643,7 +16971,7 @@
+@@ -14643,7 +16976,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18706,7 +18795,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14671,8 +16999,13 @@
+@@ -14671,8 +17004,13 @@
openbsd*)
version_type=sunos
@@ -18721,7 +18810,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
-@@ -14692,7 +17025,7 @@
+@@ -14692,7 +17030,7 @@
os2*)
libname_spec='$name'
@@ -18730,7 +18819,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14710,13 +17043,6 @@
+@@ -14710,13 +17048,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18744,7 +18833,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14742,7 +17068,7 @@
+@@ -14742,7 +17073,7 @@
need_version=yes
;;
@@ -18753,7 +18842,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'
-@@ -14775,6 +17101,29 @@
+@@ -14775,6 +17106,29 @@
fi
;;
@@ -18783,7 +18872,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14786,16 +17135,21 @@
+@@ -14786,16 +17140,21 @@
dynamic_linker=no
;;
esac
@@ -18811,7 +18900,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14815,8 +17169,8 @@
+@@ -14815,8 +17174,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18822,7 +18911,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14827,1235 +17181,413 @@
+@@ -14827,1242 +17186,420 @@
enable_fast_install=needless
fi
@@ -19236,29 +19325,31 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-
--#undef dlopen
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+-#undef dlopen
++# A C compiler.
++LTCC=$lt_LTCC
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19278,8 +19369,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A C compiler.
-+LTCC=$lt_LTCC
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -19315,8 +19406,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_dlopen=no
-fi
@@ -19341,8 +19432,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19385,8 +19476,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dl_dlopen=no
-fi
@@ -19412,8 +19503,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19456,8 +19547,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-ac_cv_lib_svld_dlopen=no
-fi
@@ -19483,8 +19574,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# A BSD-compatible nm program.
++NM=$lt_NM
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19527,8 +19618,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# A symbol stripping program
++STRIP=$lt_STRIP
-ac_cv_lib_dld_dld_link=no
-fi
@@ -19541,21 +19632,16 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
--fi
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+-fi
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
--fi
--
+# Used on cygwin: assembler.
+AS="$AS"
@@ -19578,36 +19664,43 @@
+# Old archive suffix (normally "a").
+libext="$libext"
-- ;;
-- esac
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+-fi
++# Executable file suffix (normally "").
++exeext="$exeext"
+
+- ;;
+- esac
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -19622,18 +19715,18 @@
- cat > conftest.$ac_ext <<EOF
-#line 15464 "configure"
-#include "confdefs.h"
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Do we need a version for libraries?
++need_version=$need_version
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
-#include <stdio.h>
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -19644,8 +19737,8 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -19668,22 +19761,22 @@
-# endif
-# endif
-#endif
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- if (self)
- {
@@ -19691,8 +19784,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- exit (status);
-}
@@ -19715,17 +19808,17 @@
- fi
-fi
-rm -fr conftest*
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Library versioning type.
++version_type=$version_type
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
@@ -19742,19 +19835,22 @@
- cat > conftest.$ac_ext <<EOF
-#line 15562 "configure"
-#include "confdefs.h"
-+# Library versioning type.
-+version_type=$version_type
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
-#include <stdio.h>
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -19765,8 +19861,8 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -19789,25 +19885,26 @@
-# endif
-# endif
-#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
- if (self)
- {
@@ -19815,11 +19912,9 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
- exit (status);
-}
@@ -19842,22 +19937,19 @@
- fi
-fi
-rm -fr conftest*
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
+-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
@@ -19874,14 +19966,14 @@
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -19938,9 +20030,9 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- case $var in
- old_archive_cmds_CXX | \
@@ -19963,192 +20055,198 @@
- ;;
- esac
- done
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-
--cfgfile="$ofile"
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-cfgfile="$ofile"
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+# 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
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--# 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 add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# 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 optimize for fast installation.
--fast_install=$enable_fast_install
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+
-# The host system.
-host_alias=$host_alias
-host=$host
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
-# A C compiler.
-LTCC=$lt_LTCC
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+# 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
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+# 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
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--# A symbol stripping program
--STRIP=$STRIP
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# 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
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# A symbol stripping program
+-STRIP=$STRIP
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--# Used on cygwin: assembler.
--AS="$AS"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Used on cygwin: assembler.
+-AS="$AS"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
+
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
-# Old archive suffix (normally "a").
-libext="$libext"
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# ### END LIBTOOL TAG CONFIG: $tagname
-# Executable file suffix (normally "").
-exeext="$exeext"
-+# ### END LIBTOOL TAG CONFIG: $tagname
++__EOF__
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-+__EOF__
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
++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
++ # libtool script then.
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
++fi
-# 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
-
@@ -20353,19 +20451,22 @@
- # libtool script then.
- test -f Makefile && make "$ltmain"
-fi
-+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
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
+-
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- ac_ext=c
-@@ -16126,29 +17658,55 @@
+ CC=$lt_save_CC
+ LDCXX=$LD
+@@ -16126,29 +17663,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20405,19 +20506,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
@@ -20429,7 +20530,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16156,21 +17714,21 @@
+@@ -16156,21 +17719,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20461,7 +20562,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16179,8 +17737,8 @@
+@@ -16179,8 +17742,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20472,7 +20573,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16218,6 +17776,11 @@
+@@ -16218,6 +17781,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20484,7 +20585,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16234,7 +17797,7 @@
+@@ -16234,7 +17802,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20493,7 +20594,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16260,6 +17823,16 @@
+@@ -16260,6 +17828,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20510,7 +20611,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16271,7 +17844,7 @@
+@@ -16271,7 +17849,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.
@@ -20519,7 +20620,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16294,13 +17867,20 @@
+@@ -16294,13 +17872,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20542,7 +20643,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16315,15 +17895,15 @@
+@@ -16315,15 +17900,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20564,7 +20665,7 @@
;;
sunos4*)
-@@ -16332,7 +17912,7 @@
+@@ -16332,7 +17917,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20573,7 +20674,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16345,6 +17925,17 @@
+@@ -16345,6 +17930,17 @@
fi
;;
@@ -20591,7 +20692,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16356,16 +17947,16 @@
+@@ -16356,16 +17952,16 @@
esac
fi
@@ -20612,7 +20713,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16379,26 +17970,28 @@
+@@ -16379,26 +17975,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 \
@@ -20621,12 +20722,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17976: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16389: \$? = $ac_status" >&5
-+ echo "$as_me:17980: \$? = $ac_status" >&5
++ echo "$as_me:17985: \$? = $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
@@ -20648,7 +20749,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16411,7 +18004,7 @@
+@@ -16411,7 +18009,7 @@
fi
fi
@@ -20657,7 +20758,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16421,72 +18014,112 @@
+@@ -16421,24 +18019,59 @@
;;
esac
@@ -20686,14 +20787,6 @@
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -20738,23 +20831,24 @@
+ cd conftest
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -16446,47 +18079,52 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16452: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18080: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18085: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16456: \$? = $ac_status" >&5
-+ echo "$as_me:18084: \$? = $ac_status" >&5
++ echo "$as_me:18089: \$? = $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
@@ -20806,7 +20900,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;}
-@@ -16496,8 +18129,8 @@
+@@ -16496,8 +18134,8 @@
need_locks=no
fi
@@ -20817,7 +20911,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16535,6 +18168,16 @@
+@@ -16535,6 +18173,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20834,7 +20928,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16545,6 +18188,10 @@
+@@ -16545,6 +18193,10 @@
with_gnu_ld=no
fi
;;
@@ -20845,7 +20939,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16555,6 +18202,27 @@
+@@ -16555,6 +18207,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20873,7 +20967,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16592,7 +18260,7 @@
+@@ -16592,7 +18265,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20882,7 +20976,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16602,13 +18270,13 @@
+@@ -16602,13 +18275,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'
@@ -20899,7 +20993,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
-@@ -16617,23 +18285,70 @@
+@@ -16617,23 +18290,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20976,7 +21070,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16647,13 +18362,40 @@
+@@ -16647,13 +18367,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21019,7 +21113,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16663,24 +18405,19 @@
+@@ -16663,24 +18410,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21051,7 +21145,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16692,7 +18429,7 @@
+@@ -16692,7 +18434,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21060,7 +21154,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16714,9 +18451,21 @@
+@@ -16714,9 +18456,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
@@ -21084,7 +21178,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16733,7 +18482,7 @@
+@@ -16733,7 +18487,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21093,7 +21187,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`
-@@ -16752,8 +18501,12 @@
+@@ -16752,8 +18506,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21106,7 +21200,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16761,45 +18514,58 @@
+@@ -16761,45 +18519,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21180,14 +21274,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16813,19 +18579,20 @@
+@@ -16813,19 +18584,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
@@ -21205,7 +21300,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16834,24 +18601,36 @@
+@@ -16834,24 +18606,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21250,17 +21345,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16865,7 +18644,9 @@
+@@ -16865,8 +18649,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
-@@ -16875,13 +18656,11 @@
+
+@@ -16875,13 +18661,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21277,7 +21374,7 @@
fi
fi
;;
-@@ -16894,7 +18673,7 @@
+@@ -16894,7 +18678,7 @@
ld_shlibs_F77=no
;;
@@ -21286,7 +21383,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16904,68 +18683,68 @@
+@@ -16904,68 +18688,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21399,7 +21496,7 @@
fi
;;
-@@ -16999,8 +18778,8 @@
+@@ -16999,8 +18783,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21410,7 +21507,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17008,7 +18787,7 @@
+@@ -17008,7 +18792,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21419,7 +21516,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
-@@ -17022,47 +18801,62 @@
+@@ -17022,47 +18806,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21506,7 +21603,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17076,7 +18870,7 @@
+@@ -17076,7 +18875,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21515,7 +21612,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'
-@@ -17086,7 +18880,7 @@
+@@ -17086,7 +18885,7 @@
link_all_deplibs_F77=yes
;;
@@ -21524,7 +21621,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
-@@ -17109,7 +18903,8 @@
+@@ -17109,7 +18908,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
@@ -21534,7 +21631,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17119,7 +18914,7 @@
+@@ -17119,7 +18919,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21543,7 +21640,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17130,14 +18925,14 @@
+@@ -17130,14 +18930,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21560,7 +21657,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'
-@@ -17149,13 +18944,13 @@
+@@ -17149,13 +18949,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21576,7 +21673,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17163,21 +18958,15 @@
+@@ -17163,21 +18963,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21602,7 +21699,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'
-@@ -17186,8 +18975,18 @@
+@@ -17186,8 +18980,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21623,7 +21720,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17196,7 +18995,7 @@
+@@ -17196,7 +19000,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.
@@ -21632,7 +21729,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17244,36 +19043,45 @@
+@@ -17244,36 +19048,45 @@
fi
;;
@@ -21699,7 +21796,7 @@
;;
uts4*)
-@@ -17288,15 +19096,10 @@
+@@ -17288,15 +19101,10 @@
esac
fi
@@ -21717,7 +21814,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17314,8 +19117,8 @@
+@@ -17314,8 +19122,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.
@@ -21728,7 +21825,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17329,6 +19132,7 @@
+@@ -17329,6 +19137,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21736,7 +21833,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17351,20 +19155,20 @@
+@@ -17351,20 +19160,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21762,7 +21859,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17374,7 +19178,20 @@
+@@ -17374,7 +19183,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21784,7 +21881,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17439,7 +19256,7 @@
+@@ -17439,7 +19261,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21793,7 +21890,7 @@
;;
beos*)
-@@ -17448,7 +19265,7 @@
+@@ -17448,7 +19270,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21802,7 +21899,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17464,7 +19281,7 @@
+@@ -17464,7 +19286,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21811,7 +21908,7 @@
need_version=no
need_lib_prefix=no
-@@ -17476,7 +19293,8 @@
+@@ -17476,7 +19298,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21821,7 +21918,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17506,7 +19324,7 @@
+@@ -17506,7 +19329,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21830,7 +21927,7 @@
;;
esac
;;
-@@ -17529,7 +19347,7 @@
+@@ -17529,7 +19352,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21839,7 +21936,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"`
-@@ -17552,20 +19370,17 @@
+@@ -17552,20 +19375,17 @@
dynamic_linker=no
;;
@@ -21871,7 +21968,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17583,14 +19398,19 @@
+@@ -17583,14 +19403,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21893,7 +21990,7 @@
esac
;;
-@@ -17610,9 +19430,9 @@
+@@ -17610,9 +19435,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21905,7 +22002,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17627,7 +19447,7 @@
+@@ -17627,7 +19452,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21914,7 +22011,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17638,7 +19458,7 @@
+@@ -17638,7 +19463,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21923,7 +22020,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17650,6 +19470,18 @@
+@@ -17650,6 +19475,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21942,7 +22039,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17693,29 +19525,26 @@
+@@ -17693,29 +19530,26 @@
;;
# This must be Linux ELF.
@@ -21979,7 +22076,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,
-@@ -17725,6 +19554,18 @@
+@@ -17725,6 +19559,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21998,7 +22095,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17734,7 +19575,7 @@
+@@ -17734,7 +19580,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22007,7 +22104,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17762,8 +19603,13 @@
+@@ -17762,8 +19608,13 @@
openbsd*)
version_type=sunos
@@ -22022,7 +22119,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
-@@ -17783,7 +19629,7 @@
+@@ -17783,7 +19634,7 @@
os2*)
libname_spec='$name'
@@ -22031,7 +22128,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17801,13 +19647,6 @@
+@@ -17801,13 +19652,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22045,7 +22142,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17833,7 +19672,7 @@
+@@ -17833,7 +19677,7 @@
need_version=yes
;;
@@ -22054,23 +22151,17 @@
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'
-@@ -17866,27 +19705,55 @@
+@@ -17866,6 +19710,29 @@
fi
;;
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ 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
-- ;;
--
--*)
++ 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'
@@ -22087,14 +22178,10 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
-+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
-+ ;;
-+
-+*)
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17877,16 +19744,21 @@
dynamic_linker=no
;;
esac
@@ -22122,7 +22209,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17906,8 +19773,8 @@
+@@ -17906,8 +19778,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22133,7 +22220,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17918,36 +19785,6 @@
+@@ -17918,36 +19790,6 @@
enable_fast_install=needless
fi
@@ -22170,7 +22257,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17962,7 +19799,8 @@
+@@ -17962,7 +19804,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.
@@ -22180,7 +22267,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 \
-@@ -18062,6 +19900,12 @@
+@@ -18062,6 +19905,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22193,7 +22280,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18073,6 +19917,9 @@
+@@ -18073,6 +19922,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22203,7 +22290,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18092,7 +19939,7 @@
+@@ -18092,7 +19944,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22212,7 +22299,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18123,7 +19970,7 @@
+@@ -18123,7 +19975,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22221,7 +22308,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18138,7 +19985,7 @@
+@@ -18138,7 +19990,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22230,7 +22317,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18340,7 +20187,10 @@
+@@ -18340,7 +20192,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.
@@ -22242,7 +22329,7 @@
fi
-@@ -18361,7 +20211,6 @@
+@@ -18361,7 +20216,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22250,7 +22337,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18373,26 +20222,55 @@
+@@ -18373,26 +20227,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22307,7 +22394,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
-@@ -18404,8 +20282,8 @@
+@@ -18404,8 +20287,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22318,7 +22405,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18419,26 +20297,28 @@
+@@ -18419,26 +20302,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 \
@@ -22327,12 +22414,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18425: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20303: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18429: \$? = $ac_status" >&5
-+ echo "$as_me:20307: \$? = $ac_status" >&5
++ echo "$as_me:20312: \$? = $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
@@ -22354,7 +22441,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"
-@@ -18452,8 +20332,8 @@
+@@ -18452,8 +20337,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22365,7 +22452,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18491,6 +20371,11 @@
+@@ -18491,6 +20376,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22377,7 +22464,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18507,7 +20392,7 @@
+@@ -18507,7 +20397,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22386,7 +22473,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18533,6 +20418,16 @@
+@@ -18533,6 +20423,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22403,7 +22490,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18544,7 +20439,7 @@
+@@ -18544,7 +20444,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.
@@ -22412,7 +22499,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18567,13 +20462,20 @@
+@@ -18567,13 +20467,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22435,7 +22522,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18588,15 +20490,15 @@
+@@ -18588,15 +20495,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22457,7 +22544,7 @@
;;
sunos4*)
-@@ -18605,7 +20507,7 @@
+@@ -18605,7 +20512,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22466,7 +22553,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18618,6 +20520,17 @@
+@@ -18618,6 +20525,17 @@
fi
;;
@@ -22484,7 +22571,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18629,16 +20542,16 @@
+@@ -18629,16 +20547,16 @@
esac
fi
@@ -22505,7 +22592,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18652,26 +20565,28 @@
+@@ -18652,26 +20570,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 \
@@ -22514,12 +22601,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20571: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20576: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18662: \$? = $ac_status" >&5
-+ echo "$as_me:20575: \$? = $ac_status" >&5
++ echo "$as_me:20580: \$? = $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
@@ -22541,7 +22628,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18684,7 +20599,7 @@
+@@ -18684,7 +20604,7 @@
fi
fi
@@ -22550,7 +22637,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18694,8 +20609,50 @@
+@@ -18694,8 +20614,50 @@
;;
esac
@@ -22603,7 +22690,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18706,60 +20663,58 @@
+@@ -18706,60 +20668,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22625,12 +22712,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18725: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20675: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20680: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18729: \$? = $ac_status" >&5
-+ echo "$as_me:20679: \$? = $ac_status" >&5
++ echo "$as_me:20684: \$? = $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
@@ -22682,7 +22769,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;}
-@@ -18769,8 +20724,8 @@
+@@ -18769,8 +20729,8 @@
need_locks=no
fi
@@ -22693,7 +22780,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18808,6 +20763,16 @@
+@@ -18808,6 +20768,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22710,7 +22797,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18818,6 +20783,10 @@
+@@ -18818,6 +20788,10 @@
with_gnu_ld=no
fi
;;
@@ -22721,7 +22808,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18828,6 +20797,27 @@
+@@ -18828,6 +20802,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22749,7 +22836,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18865,7 +20855,7 @@
+@@ -18865,7 +20860,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22758,7 +22845,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18875,13 +20865,13 @@
+@@ -18875,13 +20870,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'
@@ -22775,7 +22862,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
-@@ -18890,23 +20880,70 @@
+@@ -18890,23 +20885,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22852,7 +22939,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18920,13 +20957,40 @@
+@@ -18920,13 +20962,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22895,7 +22982,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18936,24 +21000,19 @@
+@@ -18936,24 +21005,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22927,7 +23014,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18965,7 +21024,7 @@
+@@ -18965,7 +21029,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22936,7 +23023,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18987,9 +21046,21 @@
+@@ -18987,9 +21051,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
@@ -22960,7 +23047,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19006,7 +21077,7 @@
+@@ -19006,7 +21082,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22969,7 +23056,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`
-@@ -19025,8 +21096,12 @@
+@@ -19025,8 +21101,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22982,7 +23069,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19034,22 +21109,23 @@
+@@ -19034,22 +21114,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23013,7 +23100,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19065,24 +21141,36 @@
+@@ -19065,24 +21146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23058,14 +23145,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19096,19 +21184,20 @@
+@@ -19096,19 +21189,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
@@ -23083,7 +23171,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19127,24 +21216,36 @@
+@@ -19127,24 +21221,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23128,17 +23216,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19158,7 +21259,9 @@
+@@ -19158,8 +21264,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
-@@ -19168,13 +21271,11 @@
+
+@@ -19168,13 +21276,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23155,7 +23245,7 @@
fi
fi
;;
-@@ -19187,7 +21288,7 @@
+@@ -19187,7 +21293,7 @@
ld_shlibs_GCJ=no
;;
@@ -23164,7 +23254,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19197,68 +21298,68 @@
+@@ -19197,68 +21303,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23277,7 +23367,7 @@
fi
;;
-@@ -19292,8 +21393,8 @@
+@@ -19292,8 +21398,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23288,7 +23378,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19301,7 +21402,7 @@
+@@ -19301,7 +21407,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23297,7 +23387,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
-@@ -19315,47 +21416,62 @@
+@@ -19315,47 +21421,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23384,7 +23474,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19369,7 +21485,7 @@
+@@ -19369,7 +21490,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23393,7 +23483,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'
-@@ -19379,7 +21495,7 @@
+@@ -19379,7 +21500,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23402,7 +23492,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
-@@ -19402,7 +21518,8 @@
+@@ -19402,7 +21523,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
@@ -23412,7 +23502,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19412,7 +21529,7 @@
+@@ -19412,7 +21534,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23421,7 +23511,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19423,14 +21540,14 @@
+@@ -19423,14 +21545,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23438,7 +23528,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'
-@@ -19442,13 +21559,13 @@
+@@ -19442,13 +21564,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23454,7 +23544,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19456,21 +21573,15 @@
+@@ -19456,21 +21578,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23480,7 +23570,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'
-@@ -19479,8 +21590,18 @@
+@@ -19479,8 +21595,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23501,7 +23591,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19489,7 +21610,7 @@
+@@ -19489,7 +21615,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.
@@ -23510,7 +23600,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19537,36 +21658,45 @@
+@@ -19537,1513 +21663,746 @@
fi
;;
@@ -23518,30 +23608,22 @@
- 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
- ;;
-
+- ;;
+-
- sysv5*)
- no_undefined_flag_GCJ=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
@@ -23550,75 +23632,77 @@
- 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=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ no_undefined_flag_GCJ='${wl}-z,text'
-+ allow_undefined_flag_GCJ='${wl}-z,nodefs'
+ archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ hardcode_libdir_separator_GCJ=':'
-+ link_all_deplibs_GCJ=yes
-+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
- ;;
-
- uts4*)
-@@ -19581,15 +21711,10 @@
- esac
- fi
-
+- ;;
+-
+- 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
+- ;;
+- esac
+- fi
+-
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
- test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
+-test "$ld_shlibs_GCJ" = no && can_build_shared=no
+-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
+
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_GCJ" in
+-x|xyes)
+- # Assume -lc should be added
+- archive_cmds_need_lc_GCJ=yes
-
- #
- # Do we need to explicitly link libc?
- #
-@@ -19607,8 +21732,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.
+- if test "$enable_shared" = yes && test "$GCC" = yes; then
+- case $archive_cmds_GCJ in
+- *'~'*)
+- # FIXME: we may have to deal with multi-command sequences.
+- ;;
+- '$CC '*)
+- # Test whether the compiler implicitly links with -lc since on some
+- # systems, -lgcc has to come before -lc. If gcc already passes -lc
+- # to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-@@ -19622,6 +21747,7 @@
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_GCJ
-+ pic_flag=$lt_prog_compiler_pic_GCJ
- compiler_flags=-v
- linker_flags=-v
- verstring=
-@@ -19632,1418 +21758,646 @@
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
+- $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl_GCJ
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
+- allow_undefined_flag_GCJ=
+- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_GCJ=no
@@ -24504,20 +24588,57 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
++ 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
++ ;;
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag_GCJ='${wl}-z,text'
++ allow_undefined_flag_GCJ='${wl}-z,nodefs'
++ archive_cmds_need_lc_GCJ=no
++ hardcode_shlibpath_var_GCJ=no
++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_GCJ=':'
++ link_all_deplibs_GCJ=yes
++ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++ if test "$GCC" = yes; then
++ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
++ ;;
+
-#undef dlopen
--
++ 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
++ ;;
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -24537,7 +24658,12 @@
-#ifdef __cplusplus
-}
-#endif
--
++ *)
++ ld_shlibs_GCJ=no
++ ;;
++ esac
++ fi
+
-int
-main ()
-{
@@ -24572,7 +24698,10 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -24596,7 +24725,14 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++ # Assume -lc should be added
++ archive_cmds_need_lc_GCJ=yes
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -24625,20 +24761,70 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ if test "$enable_shared" = yes && test "$GCC" = yes; then
++ case $archive_cmds_GCJ in
++ *'~'*)
++ # FIXME: we may have to deal with multi-command sequences.
++ ;;
++ '$CC '*)
++ # Test whether the compiler implicitly links with -lc since on some
++ # systems, -lgcc has to come before -lc. If gcc already passes -lc
++ # to ld, don't add -lc before -lgcc.
++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
++ $rm conftest*
++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } 2>conftest.err; then
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl_GCJ
++ pic_flag=$lt_prog_compiler_pic_GCJ
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++ allow_undefined_flag_GCJ=
++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++ (exit $ac_status); }
++ then
++ archive_cmds_need_lc_GCJ=no
++ else
++ archive_cmds_need_lc_GCJ=yes
++ fi
++ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $rm conftest*
++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
++ ;;
++ esac
++ fi
++ ;;
++esac
+
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -24654,7 +24840,33 @@
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -24663,7 +24875,11 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -24705,7 +24921,20 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++ shlibpath_var=LIBPATH
++
++ # AIX 3 has no versioning support, so we append a major version to the name.
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
+
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -24730,7 +24959,50 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++aix4* | aix5*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ hardcode_into_libs=yes
++ if test "$host_cpu" = ia64; then
++ # AIX 5 supports IA64
++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ else
++ # With GCC up to 2.95.x, collect2 would create an import file
++ # for dependence libraries. The import file would start with
++ # the line `#! .'. This would cause the generated library to
++ # depend on `.', always an invalid library. This was fixed in
++ # development snapshots of GCC prior to 3.0.
++ case $host_os in
++ aix4 | aix4.[01] | aix4.[01].*)
++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++ echo ' yes '
++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++ :
++ else
++ can_build_shared=no
++ fi
++ ;;
++ esac
++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++ # soname into executable. Probably we can add versioning support to
++ # collect2, so additional links can be useful in future.
++ if test "$aix_use_runtimelinking" = yes; then
++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++ # instead of lib<name>.a to let people know that these are not
++ # typical AIX shared libraries.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ else
++ # We preserve .a as extension for shared libraries through AIX4.2
++ # and later when we are not doing run time linking.
++ library_names_spec='${libname}${release}.a $libname.a'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ fi
++ shlibpath_var=LIBPATH
++ fi
++ ;;
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -24772,25 +25044,11 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_GCJ=no
-+ else
-+ archive_cmds_need_lc_GCJ=yes
-+ fi
-+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-+ ;;
-+ esac
-+ fi
++amigaos*)
++ library_names_spec='$libname.ixlibrary $libname.a'
++ # Create ${libname}_ixlibrary.a entries in /sys/libs.
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
-+esac
-ac_cv_lib_dld_dld_link=no
-fi
@@ -24802,111 +25060,13 @@
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-
-fi
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-
--fi
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-
--fi
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
-+
+
+bsdi[45]*)
+ version_type=linux
+ need_version=no
@@ -24921,13 +25081,13 @@
+ # libtool to hard-code these into programs
+ ;;
+-fi
+cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
--fi
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
@@ -24942,7 +25102,8 @@
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+ shlibpath_overrides_runpath=yes
-+
+
+-fi
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -25009,11 +25170,12 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-+
+
+-fi
+freebsd1*)
+ dynamic_linker=no
+ ;;
-+
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -25057,7 +25219,8 @@
+ ;;
+ esac
+ ;;
-+
+
+-fi
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
@@ -25067,7 +25230,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
-+
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
@@ -25631,7 +25794,7 @@
fi
-@@ -21060,7 +22414,8 @@
+@@ -21060,7 +22419,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.
@@ -25641,7 +25804,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 \
-@@ -21160,6 +22515,12 @@
+@@ -21160,6 +22520,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25654,7 +25817,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21171,6 +22532,9 @@
+@@ -21171,6 +22537,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25664,7 +25827,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21190,7 +22554,7 @@
+@@ -21190,7 +22559,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25673,7 +25836,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21221,7 +22585,7 @@
+@@ -21221,7 +22590,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25682,7 +25845,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21236,7 +22600,7 @@
+@@ -21236,7 +22605,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -25691,7 +25854,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21438,7 +22802,10 @@
+@@ -21438,7 +22807,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.
@@ -25703,7 +25866,7 @@
fi
-@@ -21458,7 +22825,6 @@
+@@ -21458,7 +22830,6 @@
RC)
@@ -25711,7 +25874,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21477,15 +22843,42 @@
+@@ -21477,15 +22848,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -25754,7 +25917,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21501,7 +22894,8 @@
+@@ -21501,7 +22899,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.
@@ -25764,7 +25927,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 \
-@@ -21601,6 +22995,12 @@
+@@ -21601,6 +23000,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25777,7 +25940,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21612,6 +23012,9 @@
+@@ -21612,6 +23017,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25787,7 +25950,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21631,7 +23034,7 @@
+@@ -21631,7 +23039,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25796,7 +25959,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21662,7 +23065,7 @@
+@@ -21662,7 +23070,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25805,7 +25968,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21677,7 +23080,7 @@
+@@ -21677,7 +23085,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25814,7 +25977,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21879,7 +23282,10 @@
+@@ -21879,7 +23287,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.
@@ -25826,7 +25989,7 @@
fi
-@@ -21926,7 +23332,7 @@
+@@ -21926,7 +23337,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25835,7 +25998,7 @@
# Prevent multiple expansion
-@@ -21981,8 +23387,8 @@
+@@ -21981,8 +23392,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25846,7 +26009,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22008,17 +23414,17 @@
+@@ -22008,17 +23419,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -25870,7 +26033,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22033,32 +23439,33 @@
+@@ -22033,32 +23444,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25912,7 +26075,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22067,8 +23474,8 @@
+@@ -22067,8 +23479,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -25923,7 +26086,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22094,11 +23501,11 @@
+@@ -22094,11 +23506,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -25939,7 +26102,7 @@
fi
-@@ -22106,8 +23513,8 @@
+@@ -22106,8 +23518,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25950,7 +26113,7 @@
XGETTEXT=":"
fi
fi
-@@ -22201,8 +23608,7 @@
+@@ -22201,8 +23613,7 @@
@@ -25960,7 +26123,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22214,8 +23620,8 @@
+@@ -22214,8 +23625,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25971,7 +26134,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22243,24 +23649,36 @@
+@@ -22243,24 +23654,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26016,15 +26179,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22269,15 +23687,16 @@
+@@ -22269,15 +23692,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
@@ -26036,7 +26200,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22306,15 +23725,14 @@
+@@ -22306,15 +23730,14 @@
@@ -26055,7 +26219,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22326,9 +23744,6 @@
+@@ -22326,9 +23749,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26065,7 +26229,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22354,24 +23769,36 @@
+@@ -22354,24 +23774,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26110,18 +26274,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22380,8 +23807,9 @@
+@@ -22380,9 +23812,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"
-@@ -22395,11 +23823,11 @@
+ ac_ext=c
+@@ -22395,11 +23828,11 @@
fi
@@ -26137,7 +26303,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22420,8 +23848,7 @@
+@@ -22420,8 +23853,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26147,7 +26313,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22459,24 +23886,36 @@
+@@ -22459,24 +23891,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26192,7 +26358,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22486,9 +23925,10 @@
+@@ -22486,10 +23930,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26200,11 +26366,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
-@@ -22502,8 +23942,8 @@
+ ac_ext=c
+@@ -22502,8 +23947,8 @@
fi
@@ -26215,7 +26383,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22527,15 +23967,14 @@
+@@ -22527,15 +23972,14 @@
@@ -26234,7 +26402,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22547,9 +23986,6 @@
+@@ -22547,9 +23991,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26244,7 +26412,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22574,24 +24010,36 @@
+@@ -22574,24 +24015,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26289,18 +26457,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22600,8 +24048,9 @@
+@@ -22600,9 +24053,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"
-@@ -22615,11 +24064,11 @@
+ ac_ext=c
+@@ -22615,11 +24069,11 @@
fi
@@ -26316,7 +26486,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22640,8 +24089,7 @@
+@@ -22640,8 +24094,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26326,7 +26496,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22678,24 +24126,36 @@
+@@ -22678,24 +24131,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26371,7 +26541,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22705,9 +24165,10 @@
+@@ -22705,10 +24170,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26379,11 +26549,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
-@@ -22721,8 +24182,8 @@
+ ac_ext=c
+@@ -22721,8 +24187,8 @@
fi
@@ -26394,7 +26566,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22745,8 +24206,8 @@
+@@ -22745,8 +24211,8 @@
@@ -26405,7 +26577,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22763,30 +24224,42 @@
+@@ -22763,30 +24229,42 @@
int
main ()
{
@@ -26457,15 +26629,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22795,20 +24268,21 @@
+@@ -22795,20 +24273,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
@@ -26484,7 +26657,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22825,30 +24299,42 @@
+@@ -22825,30 +24304,42 @@
int
main ()
{
@@ -26536,15 +26709,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22857,21 +24343,22 @@
+@@ -22857,21 +24348,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
@@ -26564,7 +26738,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22884,40 +24371,52 @@
+@@ -22884,40 +24376,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26629,15 +26803,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22926,19 +24425,20 @@
+@@ -22926,19 +24430,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
@@ -26655,7 +26830,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22951,40 +24451,52 @@
+@@ -22951,40 +24456,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26720,15 +26895,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22993,14 +24505,15 @@
+@@ -22993,14 +24510,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
@@ -26739,7 +26915,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -23026,13 +24539,13 @@
+@@ -23026,13 +24544,13 @@
fi
@@ -26756,7 +26932,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23061,24 +24574,36 @@
+@@ -23061,24 +24579,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26801,17 +26977,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23090,7 +24615,9 @@
+@@ -23090,8 +24620,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'
-@@ -23101,17 +24628,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23101,17 +24633,17 @@
fi
@@ -26834,7 +27012,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23140,24 +24667,36 @@
+@@ -23140,24 +24672,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26879,17 +27057,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23169,7 +24708,9 @@
+@@ -23169,8 +24713,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
-@@ -23181,8 +24722,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23181,8 +24727,8 @@
fi
@@ -26900,7 +27080,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23195,8 +24736,8 @@
+@@ -23195,8 +24741,8 @@
_ACEOF
@@ -26911,7 +27091,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23209,40 +24750,52 @@
+@@ -23209,40 +24755,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26976,15 +27156,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23251,21 +24804,22 @@
+@@ -23251,21 +24809,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
@@ -27004,7 +27185,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23278,40 +24832,52 @@
+@@ -23278,40 +24837,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27069,15 +27250,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23320,21 +24886,22 @@
+@@ -23320,21 +24891,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
@@ -27097,7 +27279,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23361,53 +24928,59 @@
+@@ -23361,53 +24933,59 @@
#undef inet_ntoa
@@ -27176,15 +27358,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23416,17 +24989,18 @@
+@@ -23416,17 +24994,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
@@ -27200,7 +27383,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23439,40 +25013,52 @@
+@@ -23439,40 +25018,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27265,15 +27448,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23481,21 +25067,22 @@
+@@ -23481,21 +25072,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
@@ -27293,7 +27477,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23522,53 +25109,59 @@
+@@ -23522,53 +25114,59 @@
#undef connect
@@ -27372,15 +27556,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23577,17 +25170,18 @@
+@@ -23577,17 +25175,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
@@ -27396,7 +27581,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23600,40 +25194,52 @@
+@@ -23600,40 +25199,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27461,15 +27646,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23642,22 +25248,23 @@
+@@ -23642,22 +25253,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
@@ -27490,7 +27676,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23684,53 +25291,59 @@
+@@ -23684,53 +25296,59 @@
#undef remove
@@ -27569,15 +27755,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23739,17 +25352,18 @@
+@@ -23739,17 +25357,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
@@ -27593,7 +27780,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23762,40 +25376,52 @@
+@@ -23762,40 +25381,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27658,15 +27845,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23804,14 +25430,15 @@
+@@ -23804,14 +25435,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
@@ -27677,7 +27865,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23819,8 +25446,8 @@
+@@ -23819,8 +25451,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27688,7 +27876,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23847,53 +25474,59 @@
+@@ -23847,53 +25479,59 @@
#undef shmat
@@ -27767,15 +27955,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23902,18 +25535,19 @@
+@@ -23902,18 +25540,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
@@ -27792,7 +27981,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23926,40 +25560,52 @@
+@@ -23926,40 +25565,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27857,15 +28046,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23968,14 +25614,15 @@
+@@ -23968,14 +25619,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
@@ -27876,7 +28066,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23989,18 +25636,19 @@
+@@ -23989,18 +25641,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27904,7 +28094,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24011,24 +25659,36 @@
+@@ -24011,24 +25664,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27949,17 +28139,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24037,15 +25697,16 @@
+@@ -24037,15 +25702,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; }
@@ -27971,7 +28162,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24054,8 +25715,13 @@
+@@ -24054,8 +25720,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27987,7 +28178,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24079,9 +25745,10 @@
+@@ -24079,9 +25750,10 @@
ac_header_preproc=no
fi
@@ -28000,7 +28191,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24105,25 +25772,19 @@
+@@ -24105,25 +25777,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;}
@@ -28033,7 +28224,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24141,18 +25802,19 @@
+@@ -24141,18 +25807,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28061,7 +28252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24163,24 +25825,36 @@
+@@ -24163,24 +25830,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28106,17 +28297,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24189,15 +25863,16 @@
+@@ -24189,15 +25868,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; }
@@ -28128,7 +28320,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24206,8 +25881,13 @@
+@@ -24206,8 +25886,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28144,7 +28336,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24231,9 +25911,10 @@
+@@ -24231,9 +25916,10 @@
ac_header_preproc=no
fi
@@ -28157,7 +28349,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24257,25 +25938,19 @@
+@@ -24257,25 +25943,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;}
@@ -28190,7 +28382,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24289,8 +25964,8 @@
+@@ -24289,8 +25969,8 @@
# darwin requires a poll emulation library
@@ -28201,7 +28393,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24303,40 +25978,52 @@
+@@ -24303,40 +25983,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28266,15 +28458,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24345,14 +26032,15 @@
+@@ -24345,14 +26037,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
@@ -28285,7 +28478,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24363,18 +26051,19 @@
+@@ -24363,18 +26056,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28313,7 +28506,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24385,24 +26074,36 @@
+@@ -24385,24 +26079,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28358,17 +28551,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24411,15 +26112,16 @@
+@@ -24411,15 +26117,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; }
@@ -28380,7 +28574,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24428,8 +26130,13 @@
+@@ -24428,8 +26135,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28396,7 +28590,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24453,9 +26160,10 @@
+@@ -24453,9 +26165,10 @@
ac_header_preproc=no
fi
@@ -28409,7 +28603,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24479,25 +26187,19 @@
+@@ -24479,25 +26192,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;}
@@ -28442,7 +28636,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24512,17 +26214,17 @@
+@@ -24512,17 +26219,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28466,7 +28660,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24533,24 +26235,36 @@
+@@ -24533,24 +26240,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -28511,17 +28705,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24559,15 +26273,16 @@
+@@ -24559,15 +26278,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; }
@@ -28533,7 +28728,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24576,8 +26291,13 @@
+@@ -24576,8 +26296,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -28549,7 +28744,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24601,9 +26321,10 @@
+@@ -24601,9 +26326,10 @@
ac_header_preproc=no
fi
@@ -28562,7 +28757,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24627,25 +26348,18 @@
+@@ -24627,25 +26353,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;}
@@ -28593,7 +28788,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24662,8 +26376,8 @@
+@@ -24662,8 +26381,8 @@
@@ -28604,7 +28799,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24689,31 +26403,43 @@
+@@ -24689,31 +26408,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28658,7 +28853,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24724,25 +26450,25 @@
+@@ -24724,25 +26455,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28668,8 +28863,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
@@ -28690,7 +28886,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24754,9 +26480,6 @@
+@@ -24754,9 +26485,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28700,7 +28896,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24782,24 +26505,36 @@
+@@ -24782,24 +26510,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28745,18 +28941,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24808,8 +26543,9 @@
+@@ -24808,9 +26548,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"
-@@ -24823,11 +26559,11 @@
+ ac_ext=c
+@@ -24823,11 +26564,11 @@
fi
@@ -28772,7 +28970,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24848,8 +26584,7 @@
+@@ -24848,8 +26589,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -28782,7 +28980,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24887,24 +26622,36 @@
+@@ -24887,24 +26627,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28827,7 +29025,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24914,9 +26661,10 @@
+@@ -24914,10 +26666,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28835,11 +29033,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
-@@ -24930,8 +26678,8 @@
+ ac_ext=c
+@@ -24930,8 +26683,8 @@
fi
@@ -28850,7 +29050,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24958,8 +26706,8 @@
+@@ -24958,8 +26711,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -28861,7 +29061,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24972,40 +26720,52 @@
+@@ -24972,40 +26725,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28926,15 +29126,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25014,27 +26774,28 @@
+@@ -25014,27 +26779,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
@@ -28964,7 +29165,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25047,40 +26808,52 @@
+@@ -25047,40 +26813,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29029,15 +29230,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25089,22 +26862,23 @@
+@@ -25089,22 +26867,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
@@ -29058,7 +29260,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25115,36 +26889,49 @@
+@@ -25115,36 +26894,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29118,15 +29320,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25153,20 +26940,21 @@
+@@ -25153,20 +26945,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
@@ -29146,7 +29349,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.
-@@ -25179,10 +26967,11 @@
+@@ -25179,10 +26972,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29159,7 +29362,7 @@
test_array [0] = 0
;
-@@ -25190,24 +26979,36 @@
+@@ -25190,24 +26984,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29204,7 +29407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25220,10 +27021,11 @@
+@@ -25220,10 +27026,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29217,7 +29420,7 @@
test_array [0] = 0
;
-@@ -25231,24 +27033,36 @@
+@@ -25231,24 +27038,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29262,7 +29465,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25257,30 +27071,32 @@
+@@ -25257,30 +27076,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29279,8 +29482,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
@@ -29303,7 +29507,7 @@
test_array [0] = 0
;
-@@ -25288,24 +27104,36 @@
+@@ -25288,24 +27109,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29348,7 +29552,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25318,10 +27146,11 @@
+@@ -25318,10 +27151,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29361,7 +29565,7 @@
test_array [0] = 0
;
-@@ -25329,24 +27158,36 @@
+@@ -25329,24 +27163,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29406,7 +29610,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25355,23 +27196,26 @@
+@@ -25355,24 +27201,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29423,8 +29627,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
@@ -29433,14 +29638,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
-@@ -25383,10 +27227,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25383,10 +27232,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29453,7 +29661,7 @@
test_array [0] = 0
;
-@@ -25394,24 +27239,36 @@
+@@ -25394,24 +27244,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29498,15 +29706,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25420,26 +27277,20 @@
+@@ -25420,26 +27282,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;;
@@ -29530,7 +29739,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25447,8 +27298,9 @@
+@@ -25447,8 +27303,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29542,7 +29751,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25457,35 +27309,44 @@
+@@ -25457,35 +27314,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29600,7 +29809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25496,28 +27357,27 @@
+@@ -25496,28 +27362,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -29637,7 +29846,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25528,36 +27388,49 @@
+@@ -25528,36 +27393,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29697,15 +29906,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25566,20 +27439,21 @@
+@@ -25566,20 +27444,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
@@ -29725,7 +29935,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.
-@@ -25592,10 +27466,11 @@
+@@ -25592,10 +27471,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29738,7 +29948,7 @@
test_array [0] = 0
;
-@@ -25603,24 +27478,36 @@
+@@ -25603,24 +27483,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29783,7 +29993,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25633,10 +27520,11 @@
+@@ -25633,10 +27525,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29796,7 +30006,7 @@
test_array [0] = 0
;
-@@ -25644,24 +27532,36 @@
+@@ -25644,24 +27537,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29841,7 +30051,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25670,30 +27570,32 @@
+@@ -25670,30 +27575,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29858,8 +30068,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
@@ -29882,7 +30093,7 @@
test_array [0] = 0
;
-@@ -25701,24 +27603,36 @@
+@@ -25701,24 +27608,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29927,7 +30138,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25731,10 +27645,11 @@
+@@ -25731,10 +27650,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29940,7 +30151,7 @@
test_array [0] = 0
;
-@@ -25742,24 +27657,36 @@
+@@ -25742,24 +27662,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29985,7 +30196,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25768,23 +27695,26 @@
+@@ -25768,24 +27700,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30002,8 +30213,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
@@ -30012,14 +30224,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
-@@ -25796,10 +27726,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25796,10 +27731,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30032,7 +30247,7 @@
test_array [0] = 0
;
-@@ -25807,24 +27738,36 @@
+@@ -25807,24 +27743,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30077,15 +30292,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25833,26 +27776,20 @@
+@@ -25833,26 +27781,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;;
@@ -30109,7 +30325,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25860,8 +27797,9 @@
+@@ -25860,8 +27802,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30121,7 +30337,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25870,35 +27808,44 @@
+@@ -25870,35 +27813,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30179,7 +30395,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25909,28 +27856,27 @@
+@@ -25909,28 +27861,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30216,7 +30432,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25941,36 +27887,49 @@
+@@ -25941,36 +27892,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30276,15 +30492,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25979,20 +27938,21 @@
+@@ -25979,20 +27943,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
@@ -30304,7 +30521,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.
-@@ -26005,10 +27965,11 @@
+@@ -26005,10 +27970,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30317,7 +30534,7 @@
test_array [0] = 0
;
-@@ -26016,24 +27977,36 @@
+@@ -26016,24 +27982,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30362,7 +30579,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26046,10 +28019,11 @@
+@@ -26046,10 +28024,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30375,7 +30592,7 @@
test_array [0] = 0
;
-@@ -26057,24 +28031,36 @@
+@@ -26057,24 +28036,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30420,7 +30637,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26083,30 +28069,32 @@
+@@ -26083,30 +28074,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30437,8 +30654,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
@@ -30461,7 +30679,7 @@
test_array [0] = 0
;
-@@ -26114,24 +28102,36 @@
+@@ -26114,24 +28107,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30506,7 +30724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26144,10 +28144,11 @@
+@@ -26144,10 +28149,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30519,7 +30737,7 @@
test_array [0] = 0
;
-@@ -26155,24 +28156,36 @@
+@@ -26155,24 +28161,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30564,7 +30782,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26181,23 +28194,26 @@
+@@ -26181,24 +28199,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30581,8 +30799,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
@@ -30591,14 +30810,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
-@@ -26209,10 +28225,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26209,10 +28230,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30611,7 +30833,7 @@
test_array [0] = 0
;
-@@ -26220,24 +28237,36 @@
+@@ -26220,24 +28242,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30656,15 +30878,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26246,26 +28275,20 @@
+@@ -26246,26 +28280,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -30688,7 +30911,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26273,8 +28296,9 @@
+@@ -26273,8 +28301,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30700,7 +30923,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26283,35 +28307,44 @@
+@@ -26283,35 +28312,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30758,7 +30981,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26322,28 +28355,27 @@
+@@ -26322,28 +28360,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30795,7 +31018,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26354,36 +28386,49 @@
+@@ -26354,36 +28391,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30855,15 +31078,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26392,20 +28437,21 @@
+@@ -26392,20 +28442,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
@@ -30883,7 +31107,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.
-@@ -26418,10 +28464,11 @@
+@@ -26418,10 +28469,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30896,7 +31120,7 @@
test_array [0] = 0
;
-@@ -26429,24 +28476,36 @@
+@@ -26429,24 +28481,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30941,7 +31165,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26459,10 +28518,11 @@
+@@ -26459,10 +28523,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30954,7 +31178,7 @@
test_array [0] = 0
;
-@@ -26470,24 +28530,36 @@
+@@ -26470,24 +28535,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30999,7 +31223,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26496,30 +28568,32 @@
+@@ -26496,30 +28573,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31016,8 +31240,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
@@ -31040,7 +31265,7 @@
test_array [0] = 0
;
-@@ -26527,24 +28601,36 @@
+@@ -26527,24 +28606,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31085,7 +31310,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26557,10 +28643,11 @@
+@@ -26557,10 +28648,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31098,7 +31323,7 @@
test_array [0] = 0
;
-@@ -26568,24 +28655,36 @@
+@@ -26568,24 +28660,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31143,7 +31368,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26594,23 +28693,26 @@
+@@ -26594,24 +28698,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31160,8 +31385,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
@@ -31170,14 +31396,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
-@@ -26622,10 +28724,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26622,10 +28729,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31190,7 +31419,7 @@
test_array [0] = 0
;
-@@ -26633,24 +28736,36 @@
+@@ -26633,24 +28741,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31235,15 +31464,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26659,26 +28774,20 @@
+@@ -26659,26 +28779,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;;
@@ -31267,7 +31497,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26686,8 +28795,9 @@
+@@ -26686,8 +28800,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31279,7 +31509,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26696,35 +28806,44 @@
+@@ -26696,35 +28811,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31337,7 +31567,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26735,30 +28854,29 @@
+@@ -26735,30 +28859,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31376,7 +31606,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26771,40 +28889,52 @@
+@@ -26771,40 +28894,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31441,15 +31671,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26813,14 +28943,15 @@
+@@ -26813,14 +28948,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
@@ -31460,7 +31691,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26829,8 +28960,8 @@
+@@ -26829,8 +28965,8 @@
fi
@@ -31471,7 +31702,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26843,40 +28974,52 @@
+@@ -26843,40 +28979,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31536,15 +31767,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26885,14 +29028,15 @@
+@@ -26885,14 +29033,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
@@ -31555,7 +31787,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26906,8 +29050,8 @@
+@@ -26906,8 +29055,8 @@
@@ -31566,7 +31798,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26918,36 +29062,49 @@
+@@ -26918,36 +29067,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31626,15 +31858,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26956,20 +29113,21 @@
+@@ -26956,20 +29118,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
@@ -31654,7 +31887,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.
-@@ -26982,10 +29140,11 @@
+@@ -26982,10 +29145,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31667,7 +31900,7 @@
test_array [0] = 0
;
-@@ -26993,24 +29152,36 @@
+@@ -26993,24 +29157,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31712,7 +31945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27023,10 +29194,11 @@
+@@ -27023,10 +29199,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31725,7 +31958,7 @@
test_array [0] = 0
;
-@@ -27034,24 +29206,36 @@
+@@ -27034,24 +29211,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31770,7 +32003,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27060,30 +29244,32 @@
+@@ -27060,30 +29249,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31787,8 +32020,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
@@ -31811,7 +32045,7 @@
test_array [0] = 0
;
-@@ -27091,24 +29277,36 @@
+@@ -27091,24 +29282,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31856,7 +32090,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27121,10 +29319,11 @@
+@@ -27121,10 +29324,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31869,7 +32103,7 @@
test_array [0] = 0
;
-@@ -27132,24 +29331,36 @@
+@@ -27132,24 +29336,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31914,7 +32148,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27158,23 +29369,26 @@
+@@ -27158,24 +29374,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31931,8 +32165,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
@@ -31941,14 +32176,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
-@@ -27186,10 +29400,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27186,10 +29405,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31961,7 +32199,7 @@
test_array [0] = 0
;
-@@ -27197,24 +29412,36 @@
+@@ -27197,24 +29417,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32006,15 +32244,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27223,26 +29450,20 @@
+@@ -27223,26 +29455,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;;
@@ -32038,7 +32277,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27250,8 +29471,9 @@
+@@ -27250,8 +29476,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32050,7 +32289,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27260,35 +29482,44 @@
+@@ -27260,35 +29487,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32108,7 +32347,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27299,29 +29530,28 @@
+@@ -27299,29 +29535,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32146,7 +32385,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27332,36 +29562,49 @@
+@@ -27332,36 +29567,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32206,15 +32445,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27370,20 +29613,21 @@
+@@ -27370,20 +29618,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
@@ -32234,7 +32474,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.
-@@ -27396,10 +29640,11 @@
+@@ -27396,10 +29645,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32247,7 +32487,7 @@
test_array [0] = 0
;
-@@ -27407,24 +29652,36 @@
+@@ -27407,24 +29657,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32292,7 +32532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27437,10 +29694,11 @@
+@@ -27437,10 +29699,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32305,7 +32545,7 @@
test_array [0] = 0
;
-@@ -27448,24 +29706,36 @@
+@@ -27448,24 +29711,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32350,7 +32590,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27474,30 +29744,32 @@
+@@ -27474,30 +29749,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32367,8 +32607,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
@@ -32391,7 +32632,7 @@
test_array [0] = 0
;
-@@ -27505,24 +29777,36 @@
+@@ -27505,24 +29782,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32436,7 +32677,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27535,10 +29819,11 @@
+@@ -27535,10 +29824,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32449,7 +32690,7 @@
test_array [0] = 0
;
-@@ -27546,24 +29831,36 @@
+@@ -27546,24 +29836,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32494,7 +32735,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27572,23 +29869,26 @@
+@@ -27572,24 +29874,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32511,8 +32752,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
@@ -32521,14 +32763,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
-@@ -27600,10 +29900,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27600,10 +29905,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32541,7 +32786,7 @@
test_array [0] = 0
;
-@@ -27611,24 +29912,36 @@
+@@ -27611,24 +29917,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32586,15 +32831,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27637,26 +29950,20 @@
+@@ -27637,26 +29955,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;;
@@ -32618,7 +32864,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27664,8 +29971,9 @@
+@@ -27664,8 +29976,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32630,7 +32876,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27674,35 +29982,44 @@
+@@ -27674,35 +29987,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32688,7 +32934,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27713,30 +30030,29 @@
+@@ -27713,30 +30035,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32727,7 +32973,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27757,36 +30073,48 @@
+@@ -27757,36 +30078,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32788,16 +33034,17 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27798,18 +30126,18 @@
+@@ -27798,18 +30131,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
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking for PIE support" >&5
+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
if test "${kde_cv_val_pie_support+set}" = set; then
@@ -32811,7 +33058,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27839,24 +30167,36 @@
+@@ -27839,24 +30172,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32856,18 +33103,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27865,8 +30205,9 @@
+@@ -27865,9 +30210,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
-@@ -27880,26 +30221,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27880,26 +30226,26 @@
fi
@@ -32904,7 +33153,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27918,18 +30259,19 @@
+@@ -27918,18 +30264,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32932,7 +33181,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27940,24 +30282,36 @@
+@@ -27940,24 +30287,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32977,17 +33226,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27966,15 +30320,16 @@
+@@ -27966,15 +30325,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; }
@@ -32999,7 +33249,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27983,8 +30338,13 @@
+@@ -27983,8 +30343,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33015,7 +33265,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28008,9 +30368,10 @@
+@@ -28008,9 +30373,10 @@
ac_header_preproc=no
fi
@@ -33028,7 +33278,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28034,25 +30395,19 @@
+@@ -28034,25 +30400,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;}
@@ -33061,7 +33311,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28064,8 +30419,8 @@
+@@ -28064,8 +30424,8 @@
done
@@ -33072,7 +33322,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28092,53 +30447,59 @@
+@@ -28092,53 +30452,59 @@
#undef _NSGetEnviron
@@ -33151,15 +33401,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28147,13 +30508,14 @@
+@@ -28147,13 +30513,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
@@ -33169,7 +33420,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28174,9 +30536,9 @@
+@@ -28174,9 +30541,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33182,7 +33433,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28202,53 +30564,59 @@
+@@ -28202,53 +30569,59 @@
#undef $ac_func
@@ -33261,15 +33512,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28257,13 +30625,15 @@
+@@ -28257,13 +30630,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
@@ -33280,7 +33532,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28280,32 +30650,32 @@
+@@ -28280,32 +30655,32 @@
@@ -33325,7 +33577,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28321,8 +30691,8 @@
+@@ -28321,8 +30696,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33336,7 +33588,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28359,8 +30729,13 @@
+@@ -28359,8 +30734,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -33352,7 +33604,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28427,6 +30802,7 @@
+@@ -28427,6 +30807,7 @@
fi
done
fi
@@ -33360,7 +33612,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28456,24 +30832,36 @@
+@@ -28456,24 +30837,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33405,7 +33657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28484,7 +30872,7 @@
+@@ -28484,7 +30877,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33414,15 +33666,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}/` \
-@@ -28532,6 +30920,7 @@
+@@ -28532,7 +30925,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
-@@ -28542,21 +30931,26 @@
+
+@@ -28542,21 +30936,26 @@
*-*-solaris*)
;;
*)
@@ -33457,7 +33711,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28564,7 +30958,7 @@
+@@ -28564,7 +30963,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
@@ -33466,7 +33720,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28573,7 +30967,7 @@
+@@ -28573,7 +30972,7 @@
esac
fi
cd ..
@@ -33475,7 +33729,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28617,12 +31011,12 @@
+@@ -28617,12 +31016,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -33492,7 +33746,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28650,8 +31044,8 @@
+@@ -28650,8 +31049,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.
@@ -33503,7 +33757,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28664,40 +31058,52 @@
+@@ -28664,40 +31063,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33568,15 +33822,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28706,14 +31112,15 @@
+@@ -28706,14 +31117,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
@@ -33587,7 +33842,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28722,8 +31129,8 @@
+@@ -28722,8 +31134,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -33598,7 +33853,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28757,24 +31164,36 @@
+@@ -28757,24 +31169,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33643,7 +33898,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28783,9 +31202,10 @@
+@@ -28783,10 +31207,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33651,11 +33906,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
-@@ -28795,8 +31215,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28795,8 +31220,8 @@
fi
@@ -33666,7 +33923,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28858,8 +31278,8 @@
+@@ -28858,8 +31283,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33677,7 +33934,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28870,9 +31290,9 @@
+@@ -28870,9 +31295,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33690,7 +33947,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28884,40 +31304,52 @@
+@@ -28884,40 +31309,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33755,15 +34012,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28926,14 +31358,16 @@
+@@ -28926,14 +31363,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
@@ -33775,7 +34033,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28946,8 +31380,8 @@
+@@ -28946,8 +31385,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -33786,7 +34044,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28960,40 +31394,52 @@
+@@ -28960,40 +31399,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33851,15 +34109,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29002,14 +31448,15 @@
+@@ -29002,14 +31453,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
@@ -33870,7 +34129,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29017,8 +31464,8 @@
+@@ -29017,8 +31469,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -33881,7 +34140,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29037,39 +31484,52 @@
+@@ -29037,40 +31489,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33942,11 +34201,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
-@@ -29085,16 +31545,15 @@
+ fi
+@@ -29085,16 +31550,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33967,7 +34228,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29121,24 +31580,36 @@
+@@ -29121,24 +31585,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34012,17 +34273,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29147,7 +31618,9 @@
+@@ -29147,8 +31623,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"
-@@ -29161,13 +31634,13 @@
+ ac_ext=c
+@@ -29161,13 +31639,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34040,7 +34303,7 @@
:
fi
-@@ -29179,16 +31652,15 @@
+@@ -29179,16 +31657,15 @@
case $host_os in
solaris*)
@@ -34061,7 +34324,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29215,24 +31687,36 @@
+@@ -29215,24 +31692,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34106,17 +34369,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29241,7 +31725,9 @@
+@@ -29241,8 +31730,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"
-@@ -29255,13 +31741,13 @@
+ ac_ext=c
+@@ -29255,13 +31746,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34134,7 +34399,7 @@
:
fi
-@@ -29288,17 +31774,17 @@
+@@ -29288,17 +31779,17 @@
@@ -34158,7 +34423,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29316,21 +31802,21 @@
+@@ -29316,21 +31807,21 @@
fi
@@ -34188,7 +34453,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29349,14 +31835,14 @@
+@@ -29349,14 +31840,14 @@
@@ -34207,7 +34472,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29390,24 +31876,36 @@
+@@ -29390,24 +31881,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34252,18 +34517,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29416,8 +31914,9 @@
+@@ -29416,9 +31919,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"
-@@ -29431,8 +31930,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29431,8 +31935,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34274,7 +34541,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29452,8 +31951,8 @@
+@@ -29452,8 +31956,8 @@
@@ -34285,7 +34552,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29489,24 +31988,36 @@
+@@ -29489,24 +31993,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34330,7 +34597,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29515,9 +32026,10 @@
+@@ -29515,10 +32031,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34338,11 +34605,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"
-@@ -29532,19 +32044,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29532,19 +32049,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -34368,7 +34637,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29577,24 +32089,36 @@
+@@ -29577,24 +32094,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34413,18 +34682,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29603,8 +32127,9 @@
+@@ -29603,9 +32132,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"
-@@ -29615,14 +32140,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29615,14 +32145,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34445,7 +34716,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29655,24 +32180,36 @@
+@@ -29655,24 +32185,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34490,18 +34761,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29681,8 +32218,9 @@
+@@ -29681,9 +32223,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"
-@@ -29693,11 +32231,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29693,11 +32236,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34517,16 +34790,16 @@
LIBJPEG=
-@@ -29717,7 +32255,7 @@
+@@ -29717,7 +32260,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29720: $i/$j" >&5
-+ echo "configure: 32258: $i/$j" >&5
++ echo "configure: 32263: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29764,14 +32302,14 @@
+@@ -29764,14 +32307,14 @@
@@ -34544,7 +34817,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29814,8 +32352,8 @@
+@@ -29814,8 +32357,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34555,7 +34828,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29824,8 +32362,8 @@
+@@ -29824,8 +32367,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34566,7 +34839,7 @@
PERL=$kde_cv_path
fi
-@@ -29839,10 +32377,9 @@
+@@ -29839,10 +32382,9 @@
@@ -34579,7 +34852,7 @@
else
if test $kde_qtver = 3; then
-@@ -29852,7 +32389,8 @@
+@@ -29852,7 +32394,8 @@
fi
@@ -34589,7 +34862,7 @@
USING_QT_MT=""
-@@ -29872,13 +32410,13 @@
+@@ -29872,13 +32415,13 @@
else
kde_check_threading_default=yes
fi
@@ -34607,7 +34880,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29950,8 +32488,8 @@
+@@ -29950,8 +32493,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -34618,7 +34891,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"
-@@ -29960,34 +32498,34 @@
+@@ -29960,34 +32503,34 @@
qt_libraries=""
qt_includes=""
@@ -34665,16 +34938,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30015,7 +32553,7 @@
+@@ -30015,7 +32558,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30018: $i/$j" >&5
-+ echo "configure: 32556: $i/$j" >&5
++ echo "configure: 32561: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30052,8 +32590,7 @@
+@@ -30052,8 +32595,7 @@
ac_qt_libraries="$qt_libdir"
@@ -34684,7 +34957,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30190,13 +32727,13 @@
+@@ -30190,13 +32732,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -34702,7 +34975,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30205,15 +32742,14 @@
+@@ -30205,15 +32747,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -34721,7 +34994,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30334,12 +32870,12 @@
+@@ -30334,12 +32875,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34738,7 +35011,7 @@
fi
-@@ -30377,14 +32913,14 @@
+@@ -30377,14 +32918,14 @@
fi
@@ -34756,7 +35029,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30427,8 +32963,8 @@
+@@ -30427,8 +32968,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34767,7 +35040,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30449,22 +32985,22 @@
+@@ -30449,22 +32990,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34795,7 +35068,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30507,12 +33043,12 @@
+@@ -30507,12 +33048,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34812,7 +35085,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30542,10 +33078,10 @@
+@@ -30542,10 +33083,10 @@
if test $kde_qtver = 3; then
@@ -34826,7 +35099,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30568,22 +33104,22 @@
+@@ -30568,22 +33109,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34856,7 +35129,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30606,13 +33142,13 @@
+@@ -30606,13 +33147,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34874,7 +35147,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30643,15 +33179,14 @@
+@@ -30643,15 +33184,14 @@
if test -n "$LIBJPEG"; then
@@ -34893,7 +35166,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30684,24 +33219,36 @@
+@@ -30684,24 +33224,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34938,18 +35211,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30710,8 +33257,9 @@
+@@ -30710,9 +33262,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"
-@@ -30728,12 +33276,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30728,12 +33281,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34966,7 +35241,7 @@
LIBJPEG_QT=
fi
-@@ -30764,15 +33312,15 @@
+@@ -30764,15 +33317,15 @@
@@ -34988,7 +35263,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30796,11 +33344,11 @@
+@@ -30796,11 +33349,11 @@
@@ -35004,34 +35279,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30852,7 +33400,7 @@
+@@ -30852,7 +33405,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30855: $i/$j" >&5
-+ echo "configure: 33403: $i/$j" >&5
++ echo "configure: 33408: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30882,7 +33430,7 @@
+@@ -30882,7 +33435,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30885: $i/$j" >&5
-+ echo "configure: 33433: $i/$j" >&5
++ echo "configure: 33438: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30900,7 +33448,7 @@
+@@ -30900,7 +33453,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30903: $i/$j" >&5
-+ echo "configure: 33451: $i/$j" >&5
++ echo "configure: 33456: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30959,12 +33507,12 @@
+@@ -30959,12 +33512,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35048,7 +35323,7 @@
fi
kde_libraries="${libdir}"
-@@ -30973,8 +33521,8 @@
+@@ -30973,8 +33526,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35059,7 +35334,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31012,8 +33560,8 @@
+@@ -31012,8 +33565,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -35070,7 +35345,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31056,8 +33604,8 @@
+@@ -31056,8 +33609,8 @@
fi
@@ -35081,7 +35356,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31089,10 +33637,9 @@
+@@ -31089,10 +33642,9 @@
@@ -35094,7 +35369,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31106,13 +33653,14 @@
+@@ -31106,13 +33658,14 @@
fi
@@ -35112,7 +35387,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31223,15 +33771,14 @@
+@@ -31223,15 +33776,14 @@
else
if test $kde_qtver = 1; then
@@ -35133,7 +35408,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31283,8 +33830,8 @@
+@@ -31283,8 +33835,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35144,7 +35419,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.
-@@ -31323,8 +33870,8 @@
+@@ -31323,8 +33875,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35155,7 +35430,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
-@@ -31332,8 +33879,8 @@
+@@ -31332,8 +33884,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35166,7 +35441,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
-@@ -31526,15 +34073,14 @@
+@@ -31526,15 +34078,14 @@
else
if test $kde_qtver = 1; then
@@ -35187,7 +35462,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31586,8 +34132,8 @@
+@@ -31586,8 +34137,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35198,7 +35473,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.
-@@ -31626,8 +34172,8 @@
+@@ -31626,8 +34177,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35209,7 +35484,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
-@@ -31635,8 +34181,8 @@
+@@ -31635,8 +34186,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35220,7 +35495,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
-@@ -31728,22 +34274,22 @@
+@@ -31728,22 +34279,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35249,7 +35524,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31776,14 +34322,14 @@
+@@ -31776,14 +34327,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35267,7 +35542,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31826,8 +34372,8 @@
+@@ -31826,8 +34377,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35278,7 +35553,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31838,21 +34384,21 @@
+@@ -31838,21 +34389,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35305,7 +35580,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31895,8 +34441,8 @@
+@@ -31895,8 +34446,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35316,7 +35591,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31907,22 +34453,22 @@
+@@ -31907,22 +34458,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35344,7 +35619,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31965,8 +34511,8 @@
+@@ -31965,8 +34516,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35355,7 +35630,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31979,21 +34525,21 @@
+@@ -31979,21 +34530,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35382,7 +35657,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32036,8 +34582,8 @@
+@@ -32036,8 +34587,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35393,7 +35668,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32050,22 +34596,22 @@
+@@ -32050,22 +34601,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35421,7 +35696,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32108,12 +34654,12 @@
+@@ -32108,12 +34659,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35438,7 +35713,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32142,14 +34688,14 @@
+@@ -32142,14 +34693,14 @@
if test -n "$kde32ornewer"; then
@@ -35456,7 +35731,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32192,8 +34738,8 @@
+@@ -32192,8 +34743,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35467,7 +35742,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32204,21 +34750,21 @@
+@@ -32204,21 +34755,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35494,7 +35769,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32261,8 +34807,8 @@
+@@ -32261,8 +34812,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35505,7 +35780,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32273,8 +34819,8 @@
+@@ -32273,8 +34824,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35516,7 +35791,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32282,14 +34828,14 @@
+@@ -32282,14 +34833,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -35534,7 +35809,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32332,8 +34878,8 @@
+@@ -32332,8 +34883,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35545,7 +35820,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32344,8 +34890,8 @@
+@@ -32344,8 +34895,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35556,7 +35831,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32353,14 +34899,14 @@
+@@ -32353,14 +34904,14 @@
fi
@@ -35574,7 +35849,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32403,12 +34949,12 @@
+@@ -32403,12 +34954,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35591,16 +35866,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32423,7 +34969,7 @@
+@@ -32423,7 +34974,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32426: $i/$j" >&5
-+ echo "configure: 34972: $i/$j" >&5
++ echo "configure: 34977: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32585,13 +35131,12 @@
+@@ -32585,13 +35136,12 @@
@@ -35617,7 +35892,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32612,13 +35157,13 @@
+@@ -32612,13 +35162,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -35635,7 +35910,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32638,16 +35183,15 @@
+@@ -32638,16 +35188,15 @@
kde_have_gcc_visibility=no
@@ -35656,7 +35931,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32674,24 +35218,36 @@
+@@ -32674,24 +35223,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35701,17 +35976,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32700,7 +35256,9 @@
+@@ -32700,8 +35261,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"
-@@ -32714,28 +35272,27 @@
+ ac_ext=c
+@@ -32714,28 +35277,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35749,7 +36026,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32770,24 +35327,36 @@
+@@ -32770,24 +35332,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35794,18 +36071,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32796,8 +35365,9 @@
+@@ -32796,9 +35370,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_qt_gcc_visibility_patched=yes
+ kde_cv_val_qt_gcc_visibility_patched=yes
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32810,21 +35380,20 @@
+ ac_ext=c
+@@ -32810,21 +35385,20 @@
fi
@@ -35832,7 +36111,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32864,24 +35433,36 @@
+@@ -32864,24 +35438,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35877,18 +36156,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32890,8 +35471,9 @@
+@@ -32890,9 +35476,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_gcc_visibility_bug=yes
+ kde_cv_val_gcc_visibility_bug=yes
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -32906,8 +35488,8 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -32906,8 +35493,8 @@
fi
@@ -35899,7 +36180,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32923,8 +35505,8 @@
+@@ -32923,8 +35510,8 @@
fi
else
@@ -35910,7 +36191,7 @@
:
fi
-@@ -32933,15 +35515,14 @@
+@@ -32933,15 +35520,14 @@
@@ -35929,7 +36210,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32953,9 +35534,6 @@
+@@ -32953,9 +35539,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -35939,7 +36220,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32978,24 +35556,36 @@
+@@ -32978,24 +35561,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35984,18 +36265,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33004,8 +35594,9 @@
+@@ -33004,9 +35599,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_setenv=no
+ kde_cv_func_setenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -33019,11 +35610,11 @@
+ ac_ext=c
+@@ -33019,11 +35615,11 @@
fi
@@ -36011,7 +36294,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33044,8 +35635,7 @@
+@@ -33044,8 +35640,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -36021,7 +36304,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33080,24 +35670,36 @@
+@@ -33080,24 +35675,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36066,7 +36349,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33107,9 +35709,10 @@
+@@ -33107,10 +35714,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36074,11 +36357,13 @@
+ kde_cv_proto_setenv="setenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -33123,8 +35726,8 @@
+ ac_ext=c
+@@ -33123,8 +35731,8 @@
fi
@@ -36089,7 +36374,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -33148,15 +35751,14 @@
+@@ -33148,15 +35756,14 @@
@@ -36108,7 +36393,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33168,9 +35770,6 @@
+@@ -33168,9 +35775,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36118,7 +36403,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33193,24 +35792,36 @@
+@@ -33193,24 +35797,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36163,18 +36448,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33219,8 +35830,9 @@
+@@ -33219,9 +35835,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_unsetenv=no
+ kde_cv_func_unsetenv=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -33234,11 +35846,11 @@
+ ac_ext=c
+@@ -33234,11 +35851,11 @@
fi
@@ -36190,7 +36477,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33259,8 +35871,7 @@
+@@ -33259,8 +35876,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -36200,7 +36487,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33295,24 +35906,36 @@
+@@ -33295,24 +35911,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36245,7 +36532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33322,9 +35945,10 @@
+@@ -33322,10 +35950,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36253,11 +36540,13 @@
+ kde_cv_proto_unsetenv="unsetenv unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -33338,8 +35962,8 @@
+ ac_ext=c
+@@ -33338,8 +35967,8 @@
fi
@@ -36268,7 +36557,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -33373,8 +35997,7 @@
+@@ -33373,8 +36002,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36278,7 +36567,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33384,17 +36007,17 @@
+@@ -33384,17 +36012,17 @@
if test "${ac_cv_header_kspeech_h+set}" = set; then
@@ -36302,7 +36591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33405,24 +36028,36 @@
+@@ -33405,24 +36033,36 @@
#include <kspeech.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36347,17 +36636,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33431,15 +36066,16 @@
+@@ -33431,15 +36071,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; }
@@ -36369,7 +36659,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33448,8 +36084,13 @@
+@@ -33448,8 +36089,13 @@
/* end confdefs.h. */
#include <kspeech.h>
_ACEOF
@@ -36385,7 +36675,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33473,9 +36114,10 @@
+@@ -33473,9 +36119,10 @@
ac_header_preproc=no
fi
@@ -36398,7 +36688,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33499,25 +36141,18 @@
+@@ -33499,25 +36146,18 @@
echo "$as_me: WARNING: kspeech.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kspeech.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kspeech.h: in the future, the compiler will take precedence" >&2;}
@@ -36429,7 +36719,7 @@
fi
if test $ac_cv_header_kspeech_h = yes; then
-@@ -33537,13 +36172,12 @@
+@@ -33537,13 +36177,12 @@
have_latest_kspeech=no
if test "x$ktts_have_kspeech_h" = xyes; then
@@ -36446,7 +36736,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33570,24 +36204,36 @@
+@@ -33570,24 +36209,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36491,23 +36781,24 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33596,11 +36242,12 @@
+@@ -33596,11 +36247,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-have_latest_kspeech=no
+ have_latest_kspeech=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: $have_latest_kspeech" >&5
-echo "${ECHO_T}$have_latest_kspeech" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $have_latest_kspeech" >&5
+echo "${ECHO_T}$have_latest_kspeech" >&6; }
CPPFLAGS=$ktts_save_cppflags
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -33631,8 +36278,7 @@
+@@ -33631,8 +36283,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36517,7 +36808,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33642,17 +36288,17 @@
+@@ -33642,17 +36293,17 @@
if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -36541,7 +36832,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33663,24 +36309,36 @@
+@@ -33663,24 +36314,36 @@
#include <X11/Xlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36586,17 +36877,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33689,15 +36347,16 @@
+@@ -33689,15 +36352,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; }
@@ -36608,7 +36900,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33706,8 +36365,13 @@
+@@ -33706,8 +36370,13 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
_ACEOF
@@ -36624,7 +36916,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33731,9 +36395,10 @@
+@@ -33731,9 +36400,10 @@
ac_header_preproc=no
fi
@@ -36637,7 +36929,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33757,25 +36422,18 @@
+@@ -33757,25 +36427,18 @@
echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
@@ -36668,7 +36960,7 @@
fi
-@@ -33792,8 +36450,7 @@
+@@ -33792,8 +36455,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36678,7 +36970,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33802,8 +36459,8 @@
+@@ -33802,8 +36464,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -36689,7 +36981,7 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33820,24 +36477,36 @@
+@@ -33820,24 +36482,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36734,15 +37026,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33846,12 +36515,13 @@
+@@ -33846,12 +36520,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_X11_extensions_XKBstr_h=no
+ ac_cv_header_X11_extensions_XKBstr_h=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_header_X11_extensions_XKBstr_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
@@ -36751,7 +37044,7 @@
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
:
else
-@@ -33872,8 +36542,7 @@
+@@ -33872,8 +36547,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36761,7 +37054,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33882,8 +36551,8 @@
+@@ -33882,8 +36556,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -36772,7 +37065,7 @@
if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33900,24 +36569,36 @@
+@@ -33900,24 +36574,36 @@
#include <X11/XKBlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36817,15 +37110,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33926,12 +36607,13 @@
+@@ -33926,12 +36612,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_X11_XKBlib_h=no
+ ac_cv_header_X11_XKBlib_h=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_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
@@ -36834,7 +37128,7 @@
if test $ac_cv_header_X11_XKBlib_h = yes; then
:
else
-@@ -33952,8 +36634,7 @@
+@@ -33952,8 +36639,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36844,7 +37138,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33962,8 +36643,8 @@
+@@ -33962,8 +36648,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -36855,7 +37149,7 @@
if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33982,24 +36663,36 @@
+@@ -33982,24 +36668,36 @@
#include <X11/extensions/XKB.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36900,15 +37194,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34008,12 +36701,13 @@
+@@ -34008,12 +36706,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_X11_extensions_XKB_h=no
+ ac_cv_header_X11_extensions_XKB_h=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_header_X11_extensions_XKB_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKB_h" >&6
@@ -36917,7 +37212,7 @@
if test $ac_cv_header_X11_extensions_XKB_h = yes; then
:
else
-@@ -34031,13 +36725,13 @@
+@@ -34031,13 +36730,13 @@
@@ -36935,7 +37230,7 @@
compile_ksayit_audio_plugins="no"
-@@ -34061,8 +36755,8 @@
+@@ -34061,8 +36760,8 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE ksayit"
fi
@@ -36946,7 +37241,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34088,24 +36782,36 @@
+@@ -34088,24 +36787,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36991,7 +37286,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34131,24 +36837,36 @@
+@@ -34131,24 +36842,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37036,15 +37331,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34157,14 +36875,15 @@
+@@ -34157,14 +36880,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37054,7 +37350,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -34174,11 +36893,11 @@
+@@ -34174,11 +36898,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37070,7 +37366,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -34189,24 +36908,36 @@
+@@ -34189,24 +36913,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37115,17 +37411,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34225,7 +36956,9 @@
+@@ -34225,8 +36961,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34234,27 +36967,41 @@
+ /* confdefs.h. */
+@@ -34234,27 +36972,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37174,7 +37472,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34267,13 +37014,16 @@
+@@ -34267,13 +37019,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -37184,8 +37482,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -37194,7 +37493,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -34292,8 +37042,8 @@
+@@ -34292,8 +37047,8 @@
esac
@@ -37205,7 +37504,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34329,8 +37079,8 @@
+@@ -34329,8 +37084,8 @@
fi
@@ -37216,7 +37515,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34351,13 +37101,13 @@
+@@ -34351,13 +37106,13 @@
@@ -37234,7 +37533,7 @@
have_gst=no
if test "x$with_gstreamer" != xno; then
-@@ -34376,8 +37126,8 @@
+@@ -34376,8 +37131,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -37245,7 +37544,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34392,28 +37142,29 @@
+@@ -34392,28 +37147,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37281,7 +37580,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -34424,40 +37175,40 @@
+@@ -34424,40 +37180,40 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -37334,7 +37633,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -34558,13 +37309,13 @@
+@@ -34558,13 +37314,13 @@
@@ -37352,7 +37651,7 @@
have_alsa=no
if test "x$with_alsa" != xno; then
-@@ -34576,10 +37327,9 @@
+@@ -34576,10 +37332,9 @@
@@ -37364,7 +37663,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34593,18 +37343,19 @@
+@@ -34593,18 +37348,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37392,7 +37691,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34615,24 +37366,36 @@
+@@ -34615,24 +37371,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37437,17 +37736,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34641,15 +37404,16 @@
+@@ -34641,15 +37409,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; }
@@ -37459,7 +37759,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34658,8 +37422,13 @@
+@@ -34658,8 +37427,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37475,7 +37775,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34683,9 +37452,10 @@
+@@ -34683,9 +37457,10 @@
ac_header_preproc=no
fi
@@ -37488,7 +37788,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34709,25 +37479,19 @@
+@@ -34709,25 +37484,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;}
@@ -37521,7 +37821,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34757,8 +37521,8 @@
+@@ -34757,8 +37526,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -37532,7 +37832,7 @@
if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34771,40 +37535,52 @@
+@@ -34771,40 +37540,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37597,15 +37897,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34813,14 +37589,15 @@
+@@ -34813,14 +37594,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_asound_snd_seq_create_simple_port=no
+ ac_cv_lib_asound_snd_seq_create_simple_port=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
@@ -37616,7 +37917,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
:
else
-@@ -34832,7 +37609,6 @@
+@@ -34832,7 +37614,6 @@
@@ -37624,7 +37925,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -34870,24 +37646,36 @@
+@@ -34870,24 +37651,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37669,17 +37970,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34896,7 +37684,9 @@
+@@ -34896,8 +37689,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
cat >conftest.$ac_ext <<_ACEOF
-@@ -34929,24 +37719,36 @@
+ /* confdefs.h. */
+@@ -34929,24 +37724,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37724,17 +38027,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34955,7 +37757,9 @@
+@@ -34955,8 +37762,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
cat >conftest.$ac_ext <<_ACEOF
-@@ -34988,24 +37792,36 @@
+ /* confdefs.h. */
+@@ -34988,24 +37797,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37779,17 +38084,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35014,7 +37830,9 @@
+@@ -35014,8 +37835,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
fi
ac_ext=c
-@@ -35079,21 +37897,21 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -35079,21 +37902,21 @@
@@ -37817,7 +38124,7 @@
if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35109,29 +37927,30 @@
+@@ -35109,29 +37932,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37854,7 +38161,7 @@
if test "x$AKODE_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -35171,8 +37990,8 @@
+@@ -35171,8 +37995,8 @@
@@ -37865,7 +38172,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35196,24 +38015,36 @@
+@@ -35196,24 +38020,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37910,15 +38217,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35222,12 +38053,13 @@
+@@ -35222,12 +38058,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- 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_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -37927,7 +38235,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35240,18 +38072,19 @@
+@@ -35240,18 +38077,19 @@
for ac_header in sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37955,7 +38263,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35262,24 +38095,36 @@
+@@ -35262,24 +38100,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38000,17 +38308,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35288,15 +38133,16 @@
+@@ -35288,15 +38138,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; }
@@ -38022,7 +38331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35305,8 +38151,13 @@
+@@ -35305,8 +38156,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38038,7 +38347,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35330,9 +38181,10 @@
+@@ -35330,9 +38186,10 @@
ac_header_preproc=no
fi
@@ -38051,7 +38360,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35356,25 +38208,19 @@
+@@ -35356,25 +38213,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;}
@@ -38084,7 +38393,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35394,8 +38240,7 @@
+@@ -35394,8 +38245,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38094,7 +38403,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35405,17 +38250,17 @@
+@@ -35405,17 +38255,17 @@
if test "${ac_cv_header_kspeech_h+set}" = set; then
@@ -38118,7 +38427,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35426,24 +38271,36 @@
+@@ -35426,24 +38276,36 @@
#include <kspeech.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38163,17 +38472,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35452,15 +38309,16 @@
+@@ -35452,15 +38314,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; }
@@ -38185,7 +38495,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35469,8 +38327,13 @@
+@@ -35469,8 +38332,13 @@
/* end confdefs.h. */
#include <kspeech.h>
_ACEOF
@@ -38201,7 +38511,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35494,9 +38357,10 @@
+@@ -35494,9 +38362,10 @@
ac_header_preproc=no
fi
@@ -38214,7 +38524,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35520,25 +38384,18 @@
+@@ -35520,25 +38389,18 @@
echo "$as_me: WARNING: kspeech.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kspeech.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kspeech.h: in the future, the compiler will take precedence" >&2;}
@@ -38245,7 +38555,7 @@
fi
if test $ac_cv_header_kspeech_h = yes; then
-@@ -35558,13 +38415,12 @@
+@@ -35558,13 +38420,12 @@
have_latest_kspeech=no
if test "x$ktts_have_kspeech_h" = xyes; then
@@ -38262,7 +38572,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35591,24 +38447,36 @@
+@@ -35591,24 +38452,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38307,23 +38617,24 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35617,11 +38485,12 @@
+@@ -35617,11 +38490,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-have_latest_kspeech=no
+ have_latest_kspeech=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: $have_latest_kspeech" >&5
-echo "${ECHO_T}$have_latest_kspeech" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $have_latest_kspeech" >&5
+echo "${ECHO_T}$have_latest_kspeech" >&6; }
CPPFLAGS=$ktts_save_cppflags
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -35651,12 +38520,11 @@
+@@ -35651,12 +38525,11 @@
# --- Check for KDE < 3.5 ---
# If so, install icons.
@@ -38339,7 +38650,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35679,24 +38547,36 @@
+@@ -35679,24 +38552,36 @@
_ACEOF
rm -f conftest.$ac_objext
@@ -38384,7 +38695,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35706,9 +38586,10 @@
+@@ -35706,10 +38591,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38392,11 +38703,13 @@
+ KTTS_ICONS_DIR="icons"
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="$kdeversion_save_CXXFLAGS"
-@@ -35721,23 +38602,23 @@
+ LIBS="$kdeversion_save_LIBS"
+@@ -35721,23 +38607,23 @@
if test "$KTTS_ICONS_DIR" = ""; then
@@ -38428,7 +38741,7 @@
compile_command_plugin="no"
-@@ -35757,13 +38638,13 @@
+@@ -35757,13 +38643,13 @@
@@ -38446,7 +38759,7 @@
compile_epos_plugin="yes"
-@@ -35773,8 +38654,8 @@
+@@ -35773,8 +38659,8 @@
# Extract the first word of ""epos"", so it can be a program name with args.
set dummy "epos"; ac_word=$2
@@ -38457,7 +38770,7 @@
if test "${ac_cv_path_epos_bindir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35789,31 +38670,32 @@
+@@ -35789,31 +38675,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38496,7 +38809,7 @@
if test "x$compile_epos_plugin" != "xno"; then
include_kttsd_epos_TRUE=
include_kttsd_epos_FALSE='#'
-@@ -35824,13 +38706,13 @@
+@@ -35824,13 +38711,13 @@
@@ -38514,7 +38827,7 @@
compile_festivalint_plugin="yes"
-@@ -35840,8 +38722,8 @@
+@@ -35840,8 +38727,8 @@
# Extract the first word of ""festival"", so it can be a program name with args.
set dummy "festival"; ac_word=$2
@@ -38525,7 +38838,7 @@
if test "${ac_cv_path_festival_bindir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35856,31 +38738,32 @@
+@@ -35856,31 +38743,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38564,7 +38877,7 @@
if test "x$compile_festivalint_plugin" = "xyes"; then
include_kttsd_festivalint_TRUE=
include_kttsd_festivalint_FALSE='#'
-@@ -35891,13 +38774,13 @@
+@@ -35891,13 +38779,13 @@
@@ -38582,7 +38895,7 @@
compile_flite_plugin="yes"
-@@ -35907,8 +38790,8 @@
+@@ -35907,8 +38795,8 @@
# Extract the first word of ""flite"", so it can be a program name with args.
set dummy "flite"; ac_word=$2
@@ -38593,7 +38906,7 @@
if test "${ac_cv_path_flite_bindir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35923,31 +38806,32 @@
+@@ -35923,31 +38811,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38632,7 +38945,7 @@
if test "x$compile_flite_plugin" != "xno"; then
include_kttsd_flite_TRUE=
include_kttsd_flite_FALSE='#'
-@@ -35958,13 +38842,13 @@
+@@ -35958,13 +38847,13 @@
@@ -38650,7 +38963,7 @@
compile_freetts_plugin="yes"
-@@ -35974,8 +38858,8 @@
+@@ -35974,8 +38863,8 @@
# Extract the first word of ""freetts.jar"", so it can be a program name with args.
set dummy "freetts.jar"; ac_word=$2
@@ -38661,7 +38974,7 @@
if test "${ac_cv_path_freetts_bindir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35990,31 +38874,32 @@
+@@ -35990,31 +38879,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38700,7 +39013,7 @@
if test "x$compile_freetts_plugin" = "xyes"; then
include_kttsd_freetts_TRUE=
include_kttsd_freetts_FALSE='#'
-@@ -36025,13 +38910,13 @@
+@@ -36025,13 +38915,13 @@
@@ -38718,7 +39031,7 @@
compile_hadifix_plugin="no"
-@@ -36042,8 +38927,8 @@
+@@ -36042,8 +38932,8 @@
if test "x$compile_hadifix_plugin" = "xyes"; then
# Extract the first word of ""mbrola"", so it can be a program name with args.
set dummy "mbrola"; ac_word=$2
@@ -38729,7 +39042,7 @@
if test "${ac_cv_path_hadifix_mbrola_bin+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36059,32 +38944,33 @@
+@@ -36059,32 +38949,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38771,7 +39084,7 @@
if test "${ac_cv_path_hadifix_txt2pho_bin+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36100,29 +38986,30 @@
+@@ -36100,29 +38991,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38808,7 +39121,7 @@
hadifix_inst="yes"
if test "x$hadifix_mbrola_bin" = "xno"; then
hadifix_inst="no"
-@@ -36132,8 +39019,8 @@
+@@ -36132,8 +39024,8 @@
fi
if test "x$hadifix_inst" = "xyes"; then
@@ -38819,7 +39132,7 @@
if test "${ac_cv_file__etc_txt2pho+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36147,8 +39034,8 @@
+@@ -36147,8 +39039,8 @@
ac_cv_file__etc_txt2pho=no
fi
fi
@@ -38830,7 +39143,7 @@
if test $ac_cv_file__etc_txt2pho = yes; then
hadifix_txt2pho="yes"
else
-@@ -36189,8 +39076,8 @@
+@@ -36189,8 +39081,8 @@
fi
for i in $ac_topsubdirs; do
@@ -38841,7 +39154,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -36201,8 +39088,8 @@
+@@ -36201,8 +39093,8 @@
else
install_it="no"
fi
@@ -38852,7 +39165,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -36294,117 +39181,117 @@
+@@ -36294,117 +39186,117 @@
kttsd_SUBDIR_included_FALSE=
fi
@@ -39026,7 +39339,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -36424,39 +39311,58 @@
+@@ -36424,39 +39316,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -39101,7 +39414,7 @@
fi
fi
rm -f confcache
-@@ -36465,38 +39371,31 @@
+@@ -36465,38 +39376,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -39153,7 +39466,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
-@@ -36703,11 +39602,35 @@
+@@ -36703,11 +39607,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -39191,7 +39504,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -36716,8 +39639,43 @@
+@@ -36716,8 +39644,43 @@
fi
@@ -39236,7 +39549,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -36731,18 +39689,19 @@
+@@ -36731,18 +39694,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -39259,7 +39572,7 @@
as_basename=basename
else
as_basename=false
-@@ -36750,159 +39709,120 @@
+@@ -36750,159 +39714,120 @@
# Name of the executable.
@@ -39490,7 +39803,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -36911,7 +39831,19 @@
+@@ -36911,7 +39836,19 @@
as_mkdir_p=false
fi
@@ -39511,7 +39824,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'"
-@@ -36920,31 +39852,14 @@
+@@ -36920,31 +39857,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -39543,11 +39856,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
-@@ -36952,30 +39867,20 @@
+@@ -36952,30 +39872,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -39586,7 +39899,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -37002,19 +39907,21 @@
+@@ -37002,19 +39912,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -39598,7 +39911,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.
@@ -39614,7 +39927,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -37025,39 +39932,24 @@
+@@ -37025,39 +39937,24 @@
do
case $1 in
--*=*)
@@ -39660,7 +39973,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -37067,18 +39959,24 @@
+@@ -37067,18 +39964,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -39690,7 +40003,7 @@
esac
shift
-@@ -37094,92 +39992,104 @@
+@@ -37094,92 +39997,104 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -39861,7 +40174,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
-@@ -37191,551 +40101,743 @@
+@@ -37191,551 +40106,743 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -41095,7 +41408,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -37743,248 +40845,129 @@
+@@ -37743,248 +40850,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -41136,6 +41449,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'
@@ -41443,7 +41757,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -37995,135 +40978,39 @@
+@@ -37995,135 +40984,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -41605,7 +41919,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.
-@@ -38133,18 +41020,29 @@
+@@ -38133,18 +41026,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
@@ -41643,7 +41957,7 @@
else
continue
fi
-@@ -38166,53 +41064,79 @@
+@@ -38166,53 +41070,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -47534,7 +47848,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -437,7 +446,7 @@
+@@ -438,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -47543,7 +47857,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +484,9 @@
+@@ -476,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list