rev 4242 - trunk/packages/kdetoys/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 01:04:05 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 01:04:02 +0000 (Sun, 30 Jul 2006)
New Revision: 4242
Modified:
trunk/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/98_buildprep.diff 2006-07-30 01:00:27 UTC (rev 4241)
+++ trunk/packages/kdetoys/debian/patches/98_buildprep.diff 2006-07-30 01:04:02 UTC (rev 4242)
@@ -5414,7 +5414,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,
@@ -5696,8 +5696,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
@@ -7013,7 +7013,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,
@@ -7032,7 +7032,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 $@
@@ -7666,7 +7666,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
@@ -8768,8 +8768,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
@@ -8960,18 +8961,19 @@
-ac_cv_prog_cc_g=no
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
@@ -8994,7 +8996,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3155,10 +4020,10 @@
+@@ -3155,12 +4020,17 @@
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -9006,8 +9008,15 @@
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
int test (int i, double x);
-@@ -3175,205 +4040,74 @@
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3175,205 +4045,74 @@
return 0;
}
_ACEOF
@@ -9074,8 +9083,9 @@
+
fi
+-rm -f conftest.err conftest.$ac_objext
+
- rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
@@ -9251,7 +9261,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3382,8 +4116,8 @@
+@@ -3382,8 +4121,8 @@
depcc="$CC" am_compiler_list=
@@ -9262,7 +9272,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3472,8 +4206,8 @@
+@@ -3472,8 +4211,8 @@
fi
fi
@@ -9273,7 +9283,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3495,8 +4229,8 @@
+@@ -3495,8 +4234,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
@@ -9284,7 +9294,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3530,8 +4264,13 @@
+@@ -3530,8 +4269,13 @@
#endif
Syntax error
_ACEOF
@@ -9300,7 +9310,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3556,9 +4295,10 @@
+@@ -3556,9 +4300,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9312,7 +9322,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3568,8 +4308,13 @@
+@@ -3568,8 +4313,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -9328,7 +9338,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3596,6 +4341,7 @@
+@@ -3596,6 +4346,7 @@
ac_preproc_ok=:
break
fi
@@ -9336,7 +9346,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3613,8 +4359,8 @@
+@@ -3613,8 +4364,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -9347,7 +9357,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3637,8 +4383,13 @@
+@@ -3637,8 +4388,13 @@
#endif
Syntax error
_ACEOF
@@ -9363,7 +9373,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3663,9 +4414,10 @@
+@@ -3663,9 +4419,10 @@
# Broken: fails on valid input.
continue
fi
@@ -9375,7 +9385,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3675,8 +4427,13 @@
+@@ -3675,8 +4432,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -9391,7 +9401,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3703,6 +4460,7 @@
+@@ -3703,6 +4465,7 @@
ac_preproc_ok=:
break
fi
@@ -9399,7 +9409,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3753,18 +4511,22 @@
+@@ -3753,18 +4516,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -9427,7 +9437,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3777,36 +4539,38 @@
+@@ -3777,36 +4544,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9474,7 +9484,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3819,55 +4583,85 @@
+@@ -3819,55 +4588,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9578,7 +9588,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3890,24 +4684,36 @@
+@@ -3890,24 +4689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9623,15 +9633,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3916,24 +4722,28 @@
+@@ -3916,24 +4727,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
@@ -9659,7 +9670,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3949,24 +4759,36 @@
+@@ -3949,24 +4764,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9704,7 +9715,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3975,70 +4797,53 @@
+@@ -3975,70 +4802,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9799,7 +9810,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4047,61 +4852,91 @@
+@@ -4047,61 +4857,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9876,20 +9887,21 @@
+
fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -9912,7 +9924,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4110,8 +4945,8 @@
+@@ -4110,8 +4950,8 @@
depcc="$CXX" am_compiler_list=
@@ -9923,7 +9935,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4200,8 +5035,8 @@
+@@ -4200,8 +5040,8 @@
fi
fi
@@ -9934,7 +9946,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4219,8 +5054,8 @@
+@@ -4219,8 +5059,8 @@
@@ -9945,7 +9957,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4245,24 +5080,36 @@
+@@ -4245,24 +5085,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9990,7 +10002,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4271,13 +5118,14 @@
+@@ -4271,13 +5123,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9998,17 +10010,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:
-@@ -4319,17 +5167,16 @@
+@@ -4319,17 +5172,16 @@
fi
fi
@@ -10030,7 +10043,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4357,24 +5204,36 @@
+@@ -4357,24 +5209,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10075,17 +10088,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4383,7 +5242,9 @@
+@@ -4383,8 +5247,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"
-@@ -4397,29 +5258,28 @@
+ ac_ext=c
+@@ -4397,29 +5263,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10123,7 +10138,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4446,24 +5306,36 @@
+@@ -4446,24 +5311,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10168,17 +10183,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4472,7 +5344,9 @@
+@@ -4472,8 +5349,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"
-@@ -4486,13 +5360,13 @@
+ ac_ext=c
+@@ -4486,13 +5365,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10196,7 +10213,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4513,16 +5387,15 @@
+@@ -4513,16 +5392,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -10217,7 +10234,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4549,24 +5422,36 @@
+@@ -4549,24 +5427,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10262,17 +10279,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4575,7 +5460,9 @@
+@@ -4575,8 +5465,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"
-@@ -4589,16 +5476,16 @@
+ ac_ext=c
+@@ -4589,16 +5481,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10293,7 +10312,7 @@
:
fi
-@@ -4613,16 +5500,15 @@
+@@ -4613,16 +5505,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"
@@ -10314,7 +10333,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4649,24 +5535,36 @@
+@@ -4649,24 +5540,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10359,17 +10378,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4675,7 +5573,9 @@
+@@ -4675,8 +5578,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"
-@@ -4689,27 +5589,26 @@
+ ac_ext=c
+@@ -4689,27 +5594,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10404,7 +10425,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4734,24 +5633,36 @@
+@@ -4734,24 +5638,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10449,17 +10470,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4760,7 +5671,9 @@
+@@ -4760,8 +5676,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"
-@@ -4774,13 +5687,13 @@
+ ac_ext=c
+@@ -4774,13 +5692,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -10477,7 +10500,7 @@
:
fi
-@@ -4788,16 +5701,15 @@
+@@ -4788,16 +5706,15 @@
;;
esac
@@ -10498,7 +10521,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4824,24 +5736,36 @@
+@@ -4824,24 +5741,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10543,17 +10566,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4850,7 +5774,9 @@
+@@ -4850,8 +5779,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"
-@@ -4864,28 +5790,27 @@
+ ac_ext=c
+@@ -4864,28 +5795,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10590,7 +10615,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4912,24 +5837,36 @@
+@@ -4912,24 +5842,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10635,17 +10660,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4938,7 +5875,9 @@
+@@ -4938,8 +5880,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"
-@@ -4952,28 +5891,27 @@
+ ac_ext=c
+@@ -4952,28 +5896,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10682,7 +10709,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5000,24 +5938,36 @@
+@@ -5000,24 +5943,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10727,17 +10754,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5026,7 +5976,9 @@
+@@ -5026,8 +5981,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"
-@@ -5040,13 +5992,13 @@
+ ac_ext=c
+@@ -5040,13 +5997,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10755,7 +10784,7 @@
:
fi
-@@ -5058,13 +6010,13 @@
+@@ -5058,13 +6015,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -10773,7 +10802,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5072,16 +6024,15 @@
+@@ -5072,16 +6029,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -10794,7 +10823,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5108,24 +6059,36 @@
+@@ -5108,24 +6064,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10839,17 +10868,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5134,7 +6097,9 @@
+@@ -5134,8 +6102,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"
-@@ -5148,13 +6113,13 @@
+ ac_ext=c
+@@ -5148,13 +6118,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10867,7 +10898,7 @@
:
fi
-@@ -5166,16 +6131,15 @@
+@@ -5166,16 +6136,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -10888,7 +10919,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5202,24 +6166,36 @@
+@@ -5202,24 +6171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10933,17 +10964,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5228,7 +6204,9 @@
+@@ -5228,8 +6209,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"
-@@ -5242,28 +6220,27 @@
+ ac_ext=c
+@@ -5242,28 +6225,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10980,7 +11013,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5290,24 +6267,36 @@
+@@ -5290,24 +6272,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11025,17 +11058,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5316,7 +6305,9 @@
+@@ -5316,8 +6310,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"
-@@ -5330,28 +6321,27 @@
+ ac_ext=c
+@@ -5330,28 +6326,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11072,7 +11107,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5378,24 +6368,36 @@
+@@ -5378,24 +6373,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11117,17 +11152,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5404,7 +6406,9 @@
+@@ -5404,8 +6411,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"
-@@ -5418,28 +6422,27 @@
+ ac_ext=c
+@@ -5418,28 +6427,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11164,7 +11201,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5466,24 +6469,36 @@
+@@ -5466,24 +6474,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11209,17 +11246,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5492,7 +6507,9 @@
+@@ -5492,8 +6512,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"
-@@ -5506,13 +6523,13 @@
+ ac_ext=c
+@@ -5506,13 +6528,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11237,7 +11276,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5520,37 +6537,37 @@
+@@ -5520,37 +6542,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -11289,7 +11328,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5582,24 +6599,36 @@
+@@ -5582,24 +6604,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11334,7 +11373,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5608,9 +6637,10 @@
+@@ -5608,18 +6642,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11342,11 +11381,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
-@@ -5618,8 +6648,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -11357,7 +11397,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5639,16 +6669,15 @@
+@@ -5639,16 +6674,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -11378,7 +11418,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5675,24 +6704,36 @@
+@@ -5675,24 +6709,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11423,17 +11463,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5701,7 +6742,9 @@
+@@ -5701,8 +6747,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"
-@@ -5715,29 +6758,28 @@
+ ac_ext=c
+@@ -5715,29 +6763,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11471,7 +11513,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5764,24 +6806,36 @@
+@@ -5764,24 +6811,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11516,17 +11558,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5790,7 +6844,9 @@
+@@ -5790,8 +6849,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"
-@@ -5804,28 +6860,27 @@
+ ac_ext=c
+@@ -5804,28 +6865,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11563,7 +11607,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5852,24 +6907,36 @@
+@@ -5852,24 +6912,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11608,17 +11652,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5878,7 +6945,9 @@
+@@ -5878,8 +6950,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"
-@@ -5892,28 +6961,27 @@
+ ac_ext=c
+@@ -5892,28 +6966,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11655,7 +11701,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5940,24 +7008,36 @@
+@@ -5940,24 +7013,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11700,17 +11746,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5966,7 +7046,9 @@
+@@ -5966,8 +7051,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"
-@@ -5980,28 +7062,27 @@
+ ac_ext=c
+@@ -5980,28 +7067,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11747,7 +11795,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6028,24 +7109,36 @@
+@@ -6028,24 +7114,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11792,17 +11840,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6054,7 +7147,9 @@
+@@ -6054,8 +7152,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"
-@@ -6068,28 +7163,27 @@
+ ac_ext=c
+@@ -6068,28 +7168,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11839,7 +11889,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6116,24 +7210,36 @@
+@@ -6116,24 +7215,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11884,17 +11934,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6142,7 +7248,9 @@
+@@ -6142,8 +7253,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"
-@@ -6156,13 +7264,13 @@
+ ac_ext=c
+@@ -6156,13 +7269,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11912,7 +11964,7 @@
:
fi
-@@ -6269,13 +7377,13 @@
+@@ -6269,13 +7382,13 @@
fi
@@ -11929,7 +11981,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6305,8 +7413,13 @@
+@@ -6305,8 +7418,13 @@
#endif
Syntax error
_ACEOF
@@ -11945,7 +11997,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6331,9 +7444,10 @@
+@@ -6331,9 +7449,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11957,7 +12009,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6343,8 +7457,13 @@
+@@ -6343,8 +7462,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11973,7 +12025,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6371,6 +7490,7 @@
+@@ -6371,6 +7495,7 @@
ac_preproc_ok=:
break
fi
@@ -11981,7 +12033,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6388,8 +7508,8 @@
+@@ -6388,8 +7513,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11992,7 +12044,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6412,8 +7532,13 @@
+@@ -6412,8 +7537,13 @@
#endif
Syntax error
_ACEOF
@@ -12008,7 +12060,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6438,9 +7563,10 @@
+@@ -6438,9 +7568,10 @@
# Broken: fails on valid input.
continue
fi
@@ -12020,7 +12072,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6450,8 +7576,13 @@
+@@ -6450,8 +7581,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -12036,7 +12088,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6478,6 +7609,7 @@
+@@ -6478,6 +7614,7 @@
ac_preproc_ok=:
break
fi
@@ -12044,7 +12096,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6504,16 +7636,15 @@
+@@ -6504,16 +7641,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -12065,7 +12117,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6540,24 +7671,36 @@
+@@ -6540,24 +7676,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12110,17 +12162,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6566,7 +7709,9 @@
+@@ -6566,8 +7714,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"
-@@ -6580,22 +7725,21 @@
+ ac_ext=c
+@@ -6580,22 +7730,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12149,7 +12203,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6611,36 +7755,36 @@
+@@ -6611,36 +7760,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -12196,7 +12250,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6667,24 +7811,36 @@
+@@ -6667,24 +7816,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12241,17 +12295,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6693,7 +7849,9 @@
+@@ -6693,8 +7854,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"
-@@ -6707,29 +7865,28 @@
+ ac_ext=c
+@@ -6707,29 +7870,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12289,7 +12345,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6756,24 +7913,36 @@
+@@ -6756,24 +7918,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12334,17 +12390,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6782,7 +7951,9 @@
+@@ -6782,8 +7956,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"
-@@ -6796,13 +7967,13 @@
+ ac_ext=c
+@@ -6796,13 +7972,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12362,7 +12420,7 @@
:
fi
-@@ -6812,13 +7983,13 @@
+@@ -6812,13 +7988,13 @@
@@ -12380,7 +12438,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6831,13 +8002,13 @@
+@@ -6831,13 +8007,13 @@
@@ -12398,7 +12456,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6848,272 +8019,93 @@
+@@ -6848,278 +8024,99 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -12428,15 +12486,6 @@
+else
+ kde_use_nmcheck=no
+fi
-+
-+
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -12447,6 +12496,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 ()
@@ -12494,6 +12551,7 @@
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
@@ -12577,7 +12635,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -12734,10 +12792,21 @@
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
-fi;
-
- if test "$kdelibsuff" = "auto"; then
-
-@@ -7134,8 +8126,8 @@
+-
+- if test "$kdelibsuff" = "auto"; then
+-
+-cat > conftest.c << EOF
+-#include <stdio.h>
+-int main() {
++ if test "$kdelibsuff" = "auto"; then
++
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
+ return 0;
+ }
+ EOF
+@@ -7134,8 +8131,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -12748,7 +12817,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7151,14 +8143,13 @@
+@@ -7151,14 +8148,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -12767,7 +12836,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7177,10 +8168,11 @@
+@@ -7177,10 +8173,11 @@
esac
else
enable_fast_install=yes
@@ -12782,7 +12851,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7204,7 +8196,7 @@
+@@ -7204,7 +8201,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
@@ -12791,7 +12860,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7233,37 +8225,184 @@
+@@ -7233,37 +8230,184 @@
fi
SED=$lt_cv_path_SED
@@ -12993,7 +13062,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7292,11 +8431,11 @@
+@@ -7292,11 +8436,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -13009,7 +13078,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7309,7 +8448,7 @@
+@@ -7309,7 +8453,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,
@@ -13018,7 +13087,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'*)
-@@ -7329,21 +8468,21 @@
+@@ -7329,21 +8473,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -13047,7 +13116,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7353,29 +8492,38 @@
+@@ -7353,29 +8497,38 @@
;;
esac
fi
@@ -13094,7 +13163,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7383,56 +8531,63 @@
+@@ -7383,56 +8536,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -13192,7 +13261,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7459,44 +8614,36 @@
+@@ -7459,44 +8619,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -13247,7 +13316,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7512,7 +8659,7 @@
+@@ -7512,7 +8664,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -13256,7 +13325,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
-@@ -7528,43 +8675,27 @@
+@@ -7528,43 +8680,27 @@
esac
;;
@@ -13313,7 +13382,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
-@@ -7583,32 +8714,22 @@
+@@ -7583,32 +8719,22 @@
;;
openbsd*)
@@ -13349,7 +13418,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]'
-@@ -7629,17 +8750,20 @@
+@@ -7629,17 +8755,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -13373,7 +13442,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
-@@ -7648,14 +8772,17 @@
+@@ -7648,14 +8777,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -13394,16 +13463,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7682,7 +8809,7 @@
+@@ -7682,7 +8814,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7685 "configure"' > conftest.$ac_ext
-+ echo '#line 8812 "configure"' > conftest.$ac_ext
++ echo '#line 8817 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7725,14 +8852,13 @@
+@@ -7725,14 +8857,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -13420,7 +13489,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7744,7 +8870,6 @@
+@@ -7744,7 +8875,6 @@
esac
;;
*64-bit*)
@@ -13428,7 +13497,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7769,8 +8894,8 @@
+@@ -7769,8 +8899,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -13439,7 +13508,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7796,24 +8921,36 @@
+@@ -7796,24 +8926,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13484,18 +13553,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7822,8 +8959,9 @@
+@@ -7822,9 +8964,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
-@@ -7833,22 +8971,42 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7833,22 +8976,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -13545,7 +13616,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7872,24 +9030,36 @@
+@@ -7872,24 +9035,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -13590,18 +13661,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7898,8 +9068,9 @@
+@@ -7898,9 +9073,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
-@@ -7956,6 +9127,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7956,6 +9132,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -13609,7 +13682,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7975,18 +9147,27 @@
+@@ -7975,18 +9152,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -13643,7 +13716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7999,12 +9180,14 @@
+@@ -7999,12 +9185,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -13661,7 +13734,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8027,9 +9210,9 @@
+@@ -8027,9 +9215,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13674,7 +13747,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8043,24 +9226,36 @@
+@@ -8043,24 +9231,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -13719,15 +13792,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8069,12 +9264,14 @@
+@@ -8069,12 +9269,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
@@ -13737,7 +13811,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8089,18 +9286,19 @@
+@@ -8089,18 +9291,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13765,7 +13839,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8111,24 +9309,36 @@
+@@ -8111,24 +9314,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -13810,17 +13884,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8137,15 +9347,16 @@
+@@ -8137,15 +9352,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; }
@@ -13832,7 +13907,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8154,8 +9365,13 @@
+@@ -8154,8 +9370,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -13848,7 +13923,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8179,9 +9395,10 @@
+@@ -8179,9 +9400,10 @@
ac_header_preproc=no
fi
@@ -13861,7 +13936,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8205,25 +9422,19 @@
+@@ -8205,25 +9427,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;}
@@ -13894,7 +13969,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8235,364 +9446,746 @@
+@@ -8235,364 +9451,746 @@
done
@@ -14554,6 +14629,8 @@
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
+- fi
+- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
@@ -14648,7 +14725,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
@@ -14711,7 +14788,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
@@ -14896,8 +14973,8 @@
+hpux*) # Its linker distinguishes data from code symbols
+ if test "$host_cpu" = ia64; then
+ symcode='[ABCDEGRST]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ fi
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
+linux* | k*bsd*-gnu)
@@ -14929,7 +15006,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8610,14 +10203,17 @@
+@@ -8610,14 +10208,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -14949,7 +15026,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8735,15 +10331,15 @@
+@@ -8735,15 +10336,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
@@ -14971,7 +15048,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8757,8 +10353,8 @@
+@@ -8757,8 +10358,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -14982,7 +15059,7 @@
objdir=$lt_cv_objdir
-@@ -8779,7 +10375,7 @@
+@@ -8779,7 +10380,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -14991,7 +15068,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8799,7 +10395,7 @@
+@@ -8799,7 +10400,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -15000,7 +15077,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8809,8 +10405,8 @@
+@@ -8809,8 +10410,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
@@ -15011,7 +15088,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8823,32 +10419,34 @@
+@@ -8823,32 +10424,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15053,7 +15130,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8861,27 +10459,41 @@
+@@ -8861,27 +10464,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15102,7 +15179,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8889,8 +10501,8 @@
+@@ -8889,8 +10506,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
@@ -15113,7 +15190,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8903,32 +10515,34 @@
+@@ -8903,32 +10520,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15155,7 +15232,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8941,27 +10555,41 @@
+@@ -8941,27 +10560,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15204,7 +15281,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8969,8 +10597,8 @@
+@@ -8969,8 +10602,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
@@ -15215,7 +15292,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8983,32 +10611,34 @@
+@@ -8983,32 +10616,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15257,7 +15334,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9021,27 +10651,41 @@
+@@ -9021,27 +10656,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15306,7 +15383,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9056,6 +10700,7 @@
+@@ -9056,6 +10705,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -15314,7 +15391,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9075,21 +10720,32 @@
+@@ -9075,21 +10725,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -15351,7 +15428,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9109,7 +10765,7 @@
+@@ -9109,7 +10770,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -15360,7 +15437,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
-@@ -9141,17 +10797,17 @@
+@@ -9141,17 +10802,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15384,7 +15461,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9171,7 +10827,7 @@
+@@ -9171,7 +10832,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -15393,7 +15470,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
-@@ -9203,11 +10859,11 @@
+@@ -9203,11 +10864,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15409,7 +15486,7 @@
fi
else
-@@ -9222,21 +10878,21 @@
+@@ -9222,21 +10883,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -15438,7 +15515,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9266,68 +10922,25 @@
+@@ -9266,68 +10927,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -15522,7 +15599,7 @@
## CAVEAT EMPTOR:
-@@ -9341,8 +10954,8 @@
+@@ -9341,8 +10959,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -15533,7 +15610,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9356,26 +10969,28 @@
+@@ -9356,26 +10974,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 \
@@ -15542,12 +15619,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9362: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10975: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9366: \$? = $ac_status" >&5
-+ echo "$as_me:10979: \$? = $ac_status" >&5
++ echo "$as_me:10984: \$? = $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
@@ -15569,7 +15646,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"
-@@ -9389,8 +11004,8 @@
+@@ -9389,8 +11009,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -15580,7 +15657,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9428,6 +11043,11 @@
+@@ -9428,6 +11048,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -15592,7 +15669,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9444,7 +11064,7 @@
+@@ -9444,7 +11069,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -15601,7 +15678,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9470,6 +11090,16 @@
+@@ -9470,6 +11095,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -15618,7 +15695,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9481,7 +11111,7 @@
+@@ -9481,7 +11116,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.
@@ -15627,7 +15704,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9504,13 +11134,20 @@
+@@ -9504,13 +11139,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -15650,7 +15727,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9525,15 +11162,15 @@
+@@ -9525,15 +11167,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -15672,7 +15749,7 @@
;;
sunos4*)
-@@ -9542,7 +11179,7 @@
+@@ -9542,7 +11184,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -15681,7 +15758,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9555,6 +11192,17 @@
+@@ -9555,6 +11197,17 @@
fi
;;
@@ -15699,7 +15776,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9566,16 +11214,16 @@
+@@ -9566,16 +11219,16 @@
esac
fi
@@ -15720,7 +15797,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9589,26 +11237,28 @@
+@@ -9589,26 +11242,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 \
@@ -15729,12 +15806,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9595: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11243: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11248: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9599: \$? = $ac_status" >&5
-+ echo "$as_me:11247: \$? = $ac_status" >&5
++ echo "$as_me:11252: \$? = $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
@@ -15756,7 +15833,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9621,7 +11271,7 @@
+@@ -9621,7 +11276,7 @@
fi
fi
@@ -15765,7 +15842,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9631,8 +11281,50 @@
+@@ -9631,8 +11286,50 @@
;;
esac
@@ -15818,7 +15895,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9643,60 +11335,58 @@
+@@ -9643,60 +11340,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -15840,12 +15917,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11347: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9666: \$? = $ac_status" >&5
-+ echo "$as_me:11351: \$? = $ac_status" >&5
++ echo "$as_me:11356: \$? = $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
@@ -15897,7 +15974,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;}
-@@ -9706,8 +11396,8 @@
+@@ -9706,8 +11401,8 @@
need_locks=no
fi
@@ -15908,7 +15985,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9745,6 +11435,16 @@
+@@ -9745,6 +11440,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -15925,7 +16002,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9755,6 +11455,10 @@
+@@ -9755,6 +11460,10 @@
with_gnu_ld=no
fi
;;
@@ -15936,7 +16013,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9765,6 +11469,27 @@
+@@ -9765,6 +11474,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -15964,7 +16041,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9802,7 +11527,7 @@
+@@ -9802,7 +11532,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -15973,7 +16050,7 @@
else
ld_shlibs=no
fi
-@@ -9812,13 +11537,13 @@
+@@ -9812,13 +11542,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'
@@ -15990,7 +16067,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
-@@ -9827,23 +11552,70 @@
+@@ -9827,23 +11557,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -16066,7 +16143,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9857,13 +11629,40 @@
+@@ -9857,13 +11634,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16109,7 +16186,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9873,24 +11672,19 @@
+@@ -9873,24 +11677,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16141,7 +16218,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9902,7 +11696,7 @@
+@@ -9902,7 +11701,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -16150,7 +16227,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9924,9 +11718,21 @@
+@@ -9924,9 +11723,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
@@ -16174,7 +16251,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9943,7 +11749,7 @@
+@@ -9943,7 +11754,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -16183,7 +16260,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`
-@@ -9962,8 +11768,12 @@
+@@ -9962,8 +11773,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -16196,7 +16273,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9971,22 +11781,23 @@
+@@ -9971,22 +11786,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -16227,7 +16304,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10002,24 +11813,36 @@
+@@ -10002,24 +11818,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16272,14 +16349,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10033,19 +11856,20 @@
+@@ -10033,19 +11861,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
@@ -16297,7 +16375,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10064,24 +11888,36 @@
+@@ -10064,24 +11893,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16342,17 +16420,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10095,7 +11931,9 @@
+@@ -10095,8 +11936,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
-@@ -10105,13 +11943,11 @@
+
+@@ -10105,13 +11948,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -16369,7 +16449,7 @@
fi
fi
;;
-@@ -10124,7 +11960,7 @@
+@@ -10124,7 +11965,7 @@
ld_shlibs=no
;;
@@ -16378,7 +16458,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10134,13 +11970,13 @@
+@@ -10134,13 +11975,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -16395,7 +16475,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.
-@@ -10150,52 +11986,52 @@
+@@ -10150,52 +11991,52 @@
;;
darwin* | rhapsody*)
@@ -16488,7 +16568,7 @@
fi
;;
-@@ -10229,8 +12065,8 @@
+@@ -10229,8 +12070,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16499,7 +16579,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10238,7 +12074,7 @@
+@@ -10238,7 +12079,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -16508,7 +16588,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
-@@ -10252,47 +12088,62 @@
+@@ -10252,47 +12093,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -16595,7 +16675,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10306,7 +12157,7 @@
+@@ -10306,7 +12162,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -16604,7 +16684,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'
-@@ -10316,7 +12167,7 @@
+@@ -10316,7 +12172,7 @@
link_all_deplibs=yes
;;
@@ -16613,7 +16693,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10339,7 +12190,8 @@
+@@ -10339,7 +12195,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
@@ -16623,7 +16703,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10349,7 +12201,7 @@
+@@ -10349,7 +12206,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -16632,7 +16712,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10360,14 +12212,14 @@
+@@ -10360,14 +12217,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -16649,7 +16729,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'
-@@ -10379,13 +12231,13 @@
+@@ -10379,13 +12236,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -16665,7 +16745,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10393,21 +12245,15 @@
+@@ -10393,21 +12250,15 @@
hardcode_libdir_separator=:
;;
@@ -16691,7 +16771,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'
-@@ -10416,8 +12262,18 @@
+@@ -10416,8 +12267,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -16712,7 +16792,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10426,7 +12282,7 @@
+@@ -10426,7 +12287,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.
@@ -16721,7 +16801,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10474,36 +12330,45 @@
+@@ -10474,36 +12335,45 @@
fi
;;
@@ -16788,7 +16868,7 @@
;;
uts4*)
-@@ -10518,15 +12383,10 @@
+@@ -10518,15 +12388,10 @@
esac
fi
@@ -16806,7 +16886,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10544,8 +12404,8 @@
+@@ -10544,8 +12409,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.
@@ -16817,7 +16897,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10559,6 +12419,7 @@
+@@ -10559,6 +12424,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -16825,7 +16905,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10581,20 +12442,20 @@
+@@ -10581,20 +12447,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -16851,7 +16931,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10604,7 +12465,20 @@
+@@ -10604,7 +12470,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16873,7 +16953,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10669,7 +12543,7 @@
+@@ -10669,7 +12548,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16882,7 +16962,7 @@
;;
beos*)
-@@ -10678,7 +12552,7 @@
+@@ -10678,7 +12557,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -16891,7 +16971,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10694,7 +12568,7 @@
+@@ -10694,7 +12573,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -16900,7 +16980,7 @@
need_version=no
need_lib_prefix=no
-@@ -10706,7 +12580,8 @@
+@@ -10706,7 +12585,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -16910,7 +16990,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10736,7 +12611,7 @@
+@@ -10736,7 +12616,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16919,7 +16999,7 @@
;;
esac
;;
-@@ -10759,7 +12634,7 @@
+@@ -10759,7 +12639,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -16928,7 +17008,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"`
-@@ -10782,20 +12657,17 @@
+@@ -10782,20 +12662,17 @@
dynamic_linker=no
;;
@@ -16960,7 +17040,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10813,14 +12685,19 @@
+@@ -10813,14 +12690,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -16982,7 +17062,7 @@
esac
;;
-@@ -10840,9 +12717,9 @@
+@@ -10840,9 +12722,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -16994,7 +17074,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10857,7 +12734,7 @@
+@@ -10857,7 +12739,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -17003,7 +17083,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10868,7 +12745,7 @@
+@@ -10868,7 +12750,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -17012,7 +17092,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10880,6 +12757,18 @@
+@@ -10880,6 +12762,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17031,7 +17111,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10923,29 +12812,26 @@
+@@ -10923,29 +12817,26 @@
;;
# This must be Linux ELF.
@@ -17068,7 +17148,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,
-@@ -10955,6 +12841,18 @@
+@@ -10955,6 +12846,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17087,7 +17167,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10964,7 +12862,7 @@
+@@ -10964,7 +12867,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -17096,7 +17176,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10992,8 +12890,13 @@
+@@ -10992,8 +12895,13 @@
openbsd*)
version_type=sunos
@@ -17111,7 +17191,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
-@@ -11013,7 +12916,7 @@
+@@ -11013,7 +12921,7 @@
os2*)
libname_spec='$name'
@@ -17120,7 +17200,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11031,13 +12934,6 @@
+@@ -11031,13 +12939,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17134,7 +17214,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11063,7 +12959,7 @@
+@@ -11063,7 +12964,7 @@
need_version=yes
;;
@@ -17143,7 +17223,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'
-@@ -11096,6 +12992,29 @@
+@@ -11096,6 +12997,29 @@
fi
;;
@@ -17173,7 +17253,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11107,16 +13026,21 @@
+@@ -11107,16 +13031,21 @@
dynamic_linker=no
;;
esac
@@ -17201,7 +17281,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11136,8 +13060,8 @@
+@@ -11136,8 +13065,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -17212,7 +17292,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11150,29 +13074,29 @@
+@@ -11150,29 +13079,29 @@
striplib=
old_striplib=
@@ -17252,7 +17332,7 @@
;;
esac
fi
-@@ -11204,8 +13128,8 @@
+@@ -11204,8 +13133,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -17263,7 +17343,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11218,40 +13142,52 @@
+@@ -11218,40 +13147,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17328,15 +17408,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11260,14 +13196,15 @@
+@@ -11260,14 +13201,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
@@ -17347,7 +17428,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11281,8 +13218,8 @@
+@@ -11281,8 +13223,8 @@
;;
*)
@@ -17358,7 +17439,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11309,53 +13246,59 @@
+@@ -11309,53 +13251,59 @@
#undef shl_load
@@ -17437,15 +17518,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11364,18 +13307,19 @@
+@@ -11364,18 +13312,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
@@ -17462,7 +17544,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11388,40 +13332,52 @@
+@@ -11388,40 +13337,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17527,15 +17609,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11430,19 +13386,20 @@
+@@ -11430,19 +13391,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
@@ -17553,7 +17636,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11469,53 +13426,59 @@
+@@ -11469,53 +13431,59 @@
#undef dlopen
@@ -17632,15 +17715,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11524,18 +13487,19 @@
+@@ -11524,18 +13492,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
@@ -17657,7 +17741,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11548,40 +13512,52 @@
+@@ -11548,40 +13517,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17722,15 +17806,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11590,19 +13566,20 @@
+@@ -11590,19 +13571,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
@@ -17748,7 +17833,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11615,40 +13592,52 @@
+@@ -11615,40 +13597,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17813,15 +17898,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11657,19 +13646,20 @@
+@@ -11657,19 +13651,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
@@ -17839,7 +17925,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11682,40 +13672,52 @@
+@@ -11682,40 +13677,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17904,15 +17990,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11724,14 +13726,15 @@
+@@ -11724,14 +13731,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
@@ -17923,7 +18010,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11766,13 +13769,13 @@
+@@ -11766,13 +13774,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -17940,16 +18027,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11782,7 +13785,7 @@
+@@ -11782,7 +13790,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11785 "configure"
-+#line 13788 "configure"
++#line 13793 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11839,6 +13842,8 @@
+@@ -11839,6 +13847,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -17958,7 +18045,7 @@
exit (status);
}
-@@ -11848,12 +13853,12 @@
+@@ -11848,12 +13858,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17973,7 +18060,7 @@
esac
else :
# compilation failed
-@@ -11864,13 +13869,13 @@
+@@ -11864,13 +13874,13 @@
fi
@@ -17992,16 +18079,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11880,7 +13885,7 @@
+@@ -11880,7 +13890,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11883 "configure"
-+#line 13888 "configure"
++#line 13893 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11937,6 +13942,8 @@
+@@ -11937,6 +13947,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -18010,7 +18097,7 @@
exit (status);
}
-@@ -11946,12 +13953,12 @@
+@@ -11946,12 +13958,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18025,7 +18112,7 @@
esac
else :
# compilation failed
-@@ -11962,8 +13969,8 @@
+@@ -11962,8 +13974,8 @@
fi
@@ -18036,7 +18123,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11984,19 +13991,19 @@
+@@ -11984,19 +13996,19 @@
fi
@@ -18064,7 +18151,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12005,58 +14012,21 @@
+@@ -12005,58 +14017,21 @@
fi
;;
@@ -18130,7 +18217,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12071,7 +14041,8 @@
+@@ -12071,7 +14046,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.
@@ -18140,7 +18227,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 \
-@@ -12185,11 +14156,11 @@
+@@ -12185,11 +14161,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -18154,7 +18241,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12219,6 +14190,12 @@
+@@ -12219,6 +14195,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -18167,7 +18254,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12230,6 +14207,9 @@
+@@ -12230,6 +14212,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -18177,7 +18264,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12249,7 +14229,7 @@
+@@ -12249,7 +14234,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -18186,7 +18273,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12280,7 +14260,7 @@
+@@ -12280,7 +14265,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -18195,7 +18282,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12295,7 +14275,7 @@
+@@ -12295,7 +14280,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -18204,7 +18291,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12522,7 +14502,10 @@
+@@ -12522,7 +14507,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.
@@ -18216,7 +18303,7 @@
fi
-@@ -12535,11 +14518,11 @@
+@@ -12535,11 +14523,11 @@
CC="$lt_save_CC"
@@ -18232,7 +18319,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12557,6 +14540,9 @@
+@@ -12557,6 +14545,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -18242,7 +18329,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12587,8 +14573,10 @@
+@@ -12587,8 +14578,10 @@
case $tagname in
CXX)
@@ -18255,7 +18342,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12607,6 +14595,7 @@
+@@ -12607,6 +14600,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -18263,7 +18350,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12624,7 +14613,7 @@
+@@ -12624,7 +14618,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -18272,7 +18359,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12634,17 +14623,34 @@
+@@ -12634,17 +14628,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -18308,7 +18395,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12655,18 +14661,27 @@
+@@ -12655,18 +14666,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -18339,7 +18426,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12680,18 +14695,18 @@
+@@ -12680,18 +14700,18 @@
# Set up default GNU C++ configuration
@@ -18364,7 +18451,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12720,11 +14735,11 @@
+@@ -12720,11 +14740,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -18380,7 +18467,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12737,7 +14752,7 @@
+@@ -12737,7 +14757,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,
@@ -18389,7 +18476,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'*)
-@@ -12757,21 +14772,21 @@
+@@ -12757,21 +14777,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -18418,7 +18505,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12781,8 +14796,8 @@
+@@ -12781,8 +14801,8 @@
;;
esac
fi
@@ -18429,7 +18516,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12790,8 +14805,8 @@
+@@ -12790,8 +14810,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
@@ -18440,7 +18527,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12817,7 +14832,7 @@
+@@ -12817,7 +14837,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.
@@ -18449,7 +18536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12832,8 +14847,8 @@
+@@ -12832,8 +14852,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -18460,7 +18547,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12848,8 +14863,23 @@
+@@ -12848,8 +14868,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -18486,7 +18573,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12866,7 +14896,7 @@
+@@ -12866,7 +14901,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -18495,7 +18582,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`
-@@ -12885,8 +14915,12 @@
+@@ -12885,8 +14920,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -18508,7 +18595,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12895,15 +14929,16 @@
+@@ -12895,15 +14934,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -18529,7 +18616,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.
-@@ -12925,24 +14960,36 @@
+@@ -12925,24 +14965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18574,14 +18661,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12956,20 +15003,21 @@
+@@ -12956,20 +15008,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
@@ -18599,7 +18687,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12988,24 +15036,36 @@
+@@ -12988,24 +15041,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18644,17 +18732,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13019,7 +15079,9 @@
+@@ -13019,8 +15084,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
-@@ -13029,16 +15091,26 @@
+
+@@ -13029,16 +15096,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -18686,7 +18776,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13052,12 +15124,12 @@
+@@ -13052,12 +15129,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'
@@ -18701,7 +18791,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
-@@ -13066,70 +15138,81 @@
+@@ -13066,70 +15143,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18835,7 +18925,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13140,14 +15223,14 @@
+@@ -13140,14 +15228,14 @@
;;
esac
;;
@@ -18852,7 +18942,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13164,12 +15247,12 @@
+@@ -13164,12 +15252,12 @@
# location of the library.
case $cc_basename in
@@ -18868,7 +18958,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13178,11 +15261,11 @@
+@@ -13178,11 +15266,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.
@@ -18882,7 +18972,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13192,33 +15275,22 @@
+@@ -13192,33 +15280,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -18923,7 +19013,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13229,17 +15301,20 @@
+@@ -13229,17 +15306,20 @@
esac
case $cc_basename in
@@ -18950,7 +19040,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13255,12 +15330,15 @@
+@@ -13255,12 +15335,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -18970,7 +19060,7 @@
;;
esac
fi
-@@ -13271,11 +15349,25 @@
+@@ -13271,11 +15354,25 @@
;;
esac
;;
@@ -18998,7 +19088,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13286,9 +15378,9 @@
+@@ -13286,9 +15383,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -19010,7 +19100,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13297,16 +15389,16 @@
+@@ -13297,16 +15394,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -19031,7 +19121,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13324,20 +15416,44 @@
+@@ -13324,20 +15421,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -19082,7 +19172,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13365,7 +15481,7 @@
+@@ -13365,7 +15486,7 @@
;;
mvs*)
case $cc_basename in
@@ -19091,7 +19181,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13375,7 +15491,7 @@
+@@ -13375,7 +15496,7 @@
;;
esac
;;
@@ -19100,7 +19190,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=
-@@ -13386,15 +15502,31 @@
+@@ -13386,15 +15507,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::"'
;;
@@ -19134,7 +19224,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13404,14 +15536,14 @@
+@@ -13404,14 +15541,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -19152,7 +19242,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13429,7 +15561,7 @@
+@@ -13429,7 +15566,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19161,7 +19251,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13448,13 +15580,13 @@
+@@ -13448,13 +15585,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -19177,7 +19267,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13463,17 +15595,17 @@
+@@ -13463,17 +15600,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -19199,7 +19289,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13492,7 +15624,7 @@
+@@ -13492,7 +15629,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19208,7 +19298,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13513,27 +15645,14 @@
+@@ -13513,27 +15650,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -19238,7 +19328,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13546,36 +15665,33 @@
+@@ -13546,36 +15670,33 @@
;;
solaris*)
case $cc_basename in
@@ -19287,7 +19377,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13583,9 +15699,9 @@
+@@ -13583,9 +15704,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -19299,7 +19389,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13595,9 +15711,9 @@
+@@ -13595,9 +15716,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
@@ -19311,7 +19401,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13606,9 +15722,9 @@
+@@ -13606,9 +15727,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -19323,7 +19413,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13621,12 +15737,63 @@
+@@ -13621,12 +15742,63 @@
;;
esac
;;
@@ -19389,7 +19479,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13646,8 +15813,8 @@
+@@ -13646,8 +15818,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -19400,7 +19490,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13683,7 +15850,7 @@
+@@ -13683,7 +15855,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.
@@ -19409,7 +19499,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13723,7 +15890,7 @@
+@@ -13723,7 +15895,7 @@
fi
;;
@@ -19418,7 +19508,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13759,6 +15926,29 @@
+@@ -13759,6 +15931,29 @@
$rm -f confest.$objext
@@ -19448,7 +19538,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13767,8 +15957,8 @@
+@@ -13767,8 +15962,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -19459,7 +19549,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13806,6 +15996,10 @@
+@@ -13806,6 +16001,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -19470,7 +19560,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13814,7 +16008,7 @@
+@@ -13814,7 +16013,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -19479,7 +19569,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13839,18 +16033,28 @@
+@@ -13839,18 +16038,28 @@
;;
chorus*)
case $cc_basename in
@@ -19511,7 +19601,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13858,22 +16062,22 @@
+@@ -13858,22 +16067,22 @@
;;
esac
;;
@@ -19540,7 +19630,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13886,9 +16090,13 @@
+@@ -13886,9 +16095,13 @@
;;
esac
;;
@@ -19555,7 +19645,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13897,20 +16105,26 @@
+@@ -13897,20 +16110,26 @@
;;
esac
;;
@@ -19586,7 +19676,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13927,25 +16141,25 @@
+@@ -13927,25 +16146,25 @@
;;
mvs*)
case $cc_basename in
@@ -19617,7 +19707,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13959,24 +16173,15 @@
+@@ -13959,24 +16178,15 @@
;;
psos*)
;;
@@ -19644,7 +19734,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13986,12 +16191,12 @@
+@@ -13986,12 +16196,12 @@
;;
sunos4*)
case $cc_basename in
@@ -19659,7 +19749,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14001,7 +16206,7 @@
+@@ -14001,7 +16211,7 @@
;;
tandem*)
case $cc_basename in
@@ -19668,7 +19758,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14009,7 +16214,14 @@
+@@ -14009,7 +16219,14 @@
;;
esac
;;
@@ -19684,7 +19774,7 @@
;;
vxworks*)
;;
-@@ -14019,16 +16231,16 @@
+@@ -14019,16 +16236,16 @@
esac
fi
@@ -19705,7 +19795,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14042,26 +16254,28 @@
+@@ -14042,26 +16259,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 \
@@ -19714,12 +19804,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16260: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14052: \$? = $ac_status" >&5
-+ echo "$as_me:16264: \$? = $ac_status" >&5
++ echo "$as_me:16269: \$? = $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
@@ -19741,7 +19831,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14074,7 +16288,7 @@
+@@ -14074,7 +16293,7 @@
fi
fi
@@ -19750,7 +19840,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14084,8 +16298,50 @@
+@@ -14084,8 +16303,50 @@
;;
esac
@@ -19803,7 +19893,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14096,60 +16352,58 @@
+@@ -14096,60 +16357,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -19825,12 +19915,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14115: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16364: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14119: \$? = $ac_status" >&5
-+ echo "$as_me:16368: \$? = $ac_status" >&5
++ echo "$as_me:16373: \$? = $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
@@ -19882,7 +19972,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;}
-@@ -14159,8 +16413,8 @@
+@@ -14159,8 +16418,8 @@
need_locks=no
fi
@@ -19893,7 +19983,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14177,22 +16431,20 @@
+@@ -14177,22 +16436,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -19922,7 +20012,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14210,8 +16462,8 @@
+@@ -14210,8 +16467,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.
@@ -19933,7 +20023,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14225,6 +16477,7 @@
+@@ -14225,6 +16482,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -19941,7 +20031,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14247,20 +16500,20 @@
+@@ -14247,20 +16505,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -19967,7 +20057,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14270,7 +16523,20 @@
+@@ -14270,7 +16528,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19989,7 +20079,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14335,7 +16601,7 @@
+@@ -14335,7 +16606,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19998,7 +20088,7 @@
;;
beos*)
-@@ -14344,7 +16610,7 @@
+@@ -14344,7 +16615,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -20007,7 +20097,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14360,7 +16626,7 @@
+@@ -14360,7 +16631,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -20016,7 +20106,7 @@
need_version=no
need_lib_prefix=no
-@@ -14372,7 +16638,8 @@
+@@ -14372,7 +16643,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -20026,7 +20116,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14402,7 +16669,7 @@
+@@ -14402,7 +16674,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20035,7 +20125,7 @@
;;
esac
;;
-@@ -14425,7 +16692,7 @@
+@@ -14425,7 +16697,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -20044,7 +20134,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"`
-@@ -14448,20 +16715,17 @@
+@@ -14448,20 +16720,17 @@
dynamic_linker=no
;;
@@ -20076,7 +20166,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14479,14 +16743,19 @@
+@@ -14479,14 +16748,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -20098,7 +20188,7 @@
esac
;;
-@@ -14506,9 +16775,9 @@
+@@ -14506,9 +16780,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -20110,7 +20200,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14523,7 +16792,7 @@
+@@ -14523,7 +16797,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -20119,7 +20209,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14534,7 +16803,7 @@
+@@ -14534,7 +16808,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -20128,7 +20218,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14546,6 +16815,18 @@
+@@ -14546,6 +16820,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -20147,7 +20237,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14589,29 +16870,26 @@
+@@ -14589,29 +16875,26 @@
;;
# This must be Linux ELF.
@@ -20184,7 +20274,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,
-@@ -14621,6 +16899,18 @@
+@@ -14621,6 +16904,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -20203,7 +20293,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14630,7 +16920,7 @@
+@@ -14630,7 +16925,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -20212,7 +20302,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14658,8 +16948,13 @@
+@@ -14658,8 +16953,13 @@
openbsd*)
version_type=sunos
@@ -20227,7 +20317,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
-@@ -14679,7 +16974,7 @@
+@@ -14679,7 +16979,7 @@
os2*)
libname_spec='$name'
@@ -20236,7 +20326,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14697,13 +16992,6 @@
+@@ -14697,13 +16997,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -20250,7 +20340,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14729,7 +17017,7 @@
+@@ -14729,7 +17022,7 @@
need_version=yes
;;
@@ -20259,7 +20349,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'
-@@ -14762,6 +17050,29 @@
+@@ -14762,6 +17055,29 @@
fi
;;
@@ -20289,7 +20379,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14773,16 +17084,21 @@
+@@ -14773,16 +17089,21 @@
dynamic_linker=no
;;
esac
@@ -20317,7 +20407,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14802,8 +17118,8 @@
+@@ -14802,8 +17123,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -20328,7 +20418,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14814,1266 +17130,444 @@
+@@ -14814,1266 +17135,444 @@
enable_fast_install=needless
fi
@@ -21454,9 +21544,7 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
+-
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
@@ -21478,169 +21566,174 @@
- ;;
- esac
- done
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+
+-cfgfile="$ofile"
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
--cfgfile="$ofile"
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
--# The host system.
--host_alias=$host_alias
--host=$host
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# A C compiler.
+-LTCC=$lt_LTCC
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--# A C compiler.
--LTCC=$lt_LTCC
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# A symbol stripping program
+-STRIP=$STRIP
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--# A symbol stripping program
--STRIP=$STRIP
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: assembler.
+-AS="$AS"
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
--# Used on cygwin: assembler.
--AS="$AS"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# ### END LIBTOOL TAG CONFIG: $tagname
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+__EOF__
++# ### END LIBTOOL TAG CONFIG: $tagname
-# Old archive suffix (normally "a").
-libext="$libext"
++__EOF__
-# Shared library suffix (normally ".so").
-shrext='$shrext'
+
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+else
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
@@ -21651,20 +21744,20 @@
+ fi
+fi
--# Executable file suffix (normally "").
--exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
+
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
@@ -21676,21 +21769,18 @@
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+ else
+ tagname=""
+ fi
+ ;;
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ F77)
+ if test -n "$F77" && test "X$F77" != "Xno"; then
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
-# Do we need a version for libraries?
-need_version=$need_version
-
@@ -21927,7 +22017,7 @@
archive_cmds_need_lc_F77=no
-@@ -16113,29 +17607,55 @@
+@@ -16113,29 +17612,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -21967,19 +22057,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
@@ -21991,7 +22081,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16143,21 +17663,21 @@
+@@ -16143,21 +17668,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -22023,7 +22113,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16166,8 +17686,8 @@
+@@ -16166,8 +17691,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -22034,7 +22124,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16205,6 +17725,11 @@
+@@ -16205,6 +17730,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -22046,7 +22136,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16221,7 +17746,7 @@
+@@ -16221,7 +17751,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22055,7 +22145,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16247,6 +17772,16 @@
+@@ -16247,6 +17777,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22072,7 +22162,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16258,7 +17793,7 @@
+@@ -16258,7 +17798,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.
@@ -22081,7 +22171,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16281,13 +17816,20 @@
+@@ -16281,13 +17821,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22104,7 +22194,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16302,15 +17844,15 @@
+@@ -16302,15 +17849,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -22126,7 +22216,7 @@
;;
sunos4*)
-@@ -16319,7 +17861,7 @@
+@@ -16319,7 +17866,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22135,32 +22225,39 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16332,7 +17874,18 @@
+@@ -16332,27 +17879,38 @@
fi
;;
- uts4*)
+- lt_prog_compiler_pic_F77='-pic'
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- *)
++ unicos*)
++ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+- esac
+- fi
+
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++ uts4*)
++ lt_prog_compiler_pic_F77='-pic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
-+ unicos*)
-+ lt_prog_compiler_wl_F77='-Wl,'
++ *)
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
++ esac
++ fi
+
-+ uts4*)
- lt_prog_compiler_pic_F77='-pic'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-@@ -16343,16 +17896,16 @@
- esac
- fi
-
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
@@ -22176,7 +22273,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16366,26 +17919,28 @@
+@@ -16366,26 +17924,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 \
@@ -22185,12 +22282,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16372: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17925: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17930: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16376: \$? = $ac_status" >&5
-+ echo "$as_me:17929: \$? = $ac_status" >&5
++ echo "$as_me:17934: \$? = $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
@@ -22212,7 +22309,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16398,7 +17953,7 @@
+@@ -16398,7 +17958,7 @@
fi
fi
@@ -22221,7 +22318,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16408,8 +17963,50 @@
+@@ -16408,8 +17968,50 @@
;;
esac
@@ -22274,7 +22371,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16420,60 +18017,58 @@
+@@ -16420,60 +18022,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22296,12 +22393,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16439: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18029: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18034: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16443: \$? = $ac_status" >&5
-+ echo "$as_me:18033: \$? = $ac_status" >&5
++ echo "$as_me:18038: \$? = $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
@@ -22353,7 +22450,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;}
-@@ -16483,8 +18078,8 @@
+@@ -16483,8 +18083,8 @@
need_locks=no
fi
@@ -22364,7 +22461,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16522,6 +18117,16 @@
+@@ -16522,6 +18122,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22381,7 +22478,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16532,6 +18137,10 @@
+@@ -16532,6 +18142,10 @@
with_gnu_ld=no
fi
;;
@@ -22392,7 +22489,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16542,6 +18151,27 @@
+@@ -16542,6 +18156,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22420,7 +22517,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16579,7 +18209,7 @@
+@@ -16579,7 +18214,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22429,7 +22526,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16589,13 +18219,13 @@
+@@ -16589,13 +18224,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'
@@ -22446,7 +22543,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
-@@ -16604,23 +18234,70 @@
+@@ -16604,23 +18239,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22523,7 +22620,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16634,13 +18311,40 @@
+@@ -16634,13 +18316,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22566,7 +22663,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16650,24 +18354,19 @@
+@@ -16650,24 +18359,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22598,7 +22695,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16679,7 +18378,7 @@
+@@ -16679,7 +18383,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -22607,7 +22704,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16701,9 +18400,21 @@
+@@ -16701,9 +18405,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
@@ -22631,7 +22728,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16720,7 +18431,7 @@
+@@ -16720,7 +18436,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -22640,7 +22737,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`
-@@ -16739,8 +18450,12 @@
+@@ -16739,8 +18455,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -22653,7 +22750,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16748,45 +18463,58 @@
+@@ -16748,45 +18468,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22727,14 +22824,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16800,19 +18528,20 @@
+@@ -16800,19 +18533,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
@@ -22752,7 +22850,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16821,24 +18550,36 @@
+@@ -16821,24 +18555,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22797,17 +22895,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16852,7 +18593,9 @@
+@@ -16852,8 +18598,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
-@@ -16862,13 +18605,11 @@
+
+@@ -16862,13 +18610,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -22824,7 +22924,7 @@
fi
fi
;;
-@@ -16881,7 +18622,7 @@
+@@ -16881,7 +18627,7 @@
ld_shlibs_F77=no
;;
@@ -22833,7 +22933,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16891,68 +18632,68 @@
+@@ -16891,68 +18637,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -22946,7 +23046,7 @@
fi
;;
-@@ -16986,8 +18727,8 @@
+@@ -16986,8 +18732,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22957,7 +23057,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16995,7 +18736,7 @@
+@@ -16995,7 +18741,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -22966,7 +23066,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
-@@ -17009,47 +18750,62 @@
+@@ -17009,47 +18755,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -23035,25 +23135,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17063,7 +18819,7 @@
+@@ -17063,7 +18824,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23062,7 +23162,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'
-@@ -17073,7 +18829,7 @@
+@@ -17073,7 +18834,7 @@
link_all_deplibs_F77=yes
;;
@@ -23071,7 +23171,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
-@@ -17096,7 +18852,8 @@
+@@ -17096,7 +18857,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
@@ -23081,7 +23181,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17106,7 +18863,7 @@
+@@ -17106,7 +18868,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -23090,7 +23190,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17117,14 +18874,14 @@
+@@ -17117,14 +18879,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -23107,7 +23207,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'
-@@ -17136,13 +18893,13 @@
+@@ -17136,13 +18898,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -23123,7 +23223,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17150,21 +18907,15 @@
+@@ -17150,21 +18912,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -23149,7 +23249,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'
-@@ -17173,8 +18924,18 @@
+@@ -17173,8 +18929,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23170,7 +23270,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17183,7 +18944,7 @@
+@@ -17183,7 +18949,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.
@@ -23179,7 +23279,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17231,36 +18992,45 @@
+@@ -17231,36 +18997,45 @@
fi
;;
@@ -23246,7 +23346,7 @@
;;
uts4*)
-@@ -17275,15 +19045,10 @@
+@@ -17275,15 +19050,10 @@
esac
fi
@@ -23264,7 +23364,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17301,8 +19066,8 @@
+@@ -17301,8 +19071,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.
@@ -23275,7 +23375,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17316,6 +19081,7 @@
+@@ -17316,6 +19086,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -23283,7 +23383,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17338,20 +19104,20 @@
+@@ -17338,20 +19109,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23309,7 +23409,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17361,7 +19127,20 @@
+@@ -17361,7 +19132,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23331,7 +23431,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17426,7 +19205,7 @@
+@@ -17426,7 +19210,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23340,7 +23440,7 @@
;;
beos*)
-@@ -17435,7 +19214,7 @@
+@@ -17435,7 +19219,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23349,7 +23449,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17451,7 +19230,7 @@
+@@ -17451,7 +19235,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23358,7 +23458,7 @@
need_version=no
need_lib_prefix=no
-@@ -17463,7 +19242,8 @@
+@@ -17463,7 +19247,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23368,7 +23468,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17493,7 +19273,7 @@
+@@ -17493,7 +19278,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23377,7 +23477,7 @@
;;
esac
;;
-@@ -17516,7 +19296,7 @@
+@@ -17516,7 +19301,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23386,7 +23486,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"`
-@@ -17539,20 +19319,17 @@
+@@ -17539,20 +19324,17 @@
dynamic_linker=no
;;
@@ -23418,7 +23518,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17570,14 +19347,19 @@
+@@ -17570,14 +19352,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23440,7 +23540,7 @@
esac
;;
-@@ -17597,9 +19379,9 @@
+@@ -17597,9 +19384,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23452,7 +23552,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17614,7 +19396,7 @@
+@@ -17614,7 +19401,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -23461,7 +23561,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17625,7 +19407,7 @@
+@@ -17625,7 +19412,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -23470,7 +23570,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17637,6 +19419,18 @@
+@@ -17637,6 +19424,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -23489,7 +23589,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17680,29 +19474,26 @@
+@@ -17680,29 +19479,26 @@
;;
# This must be Linux ELF.
@@ -23526,7 +23626,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,
-@@ -17712,6 +19503,18 @@
+@@ -17712,6 +19508,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -23545,7 +23645,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17721,7 +19524,7 @@
+@@ -17721,7 +19529,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -23554,7 +23654,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17749,8 +19552,13 @@
+@@ -17749,8 +19557,13 @@
openbsd*)
version_type=sunos
@@ -23569,7 +23669,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
-@@ -17770,7 +19578,7 @@
+@@ -17770,7 +19583,7 @@
os2*)
libname_spec='$name'
@@ -23578,7 +23678,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17788,13 +19596,6 @@
+@@ -17788,13 +19601,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -23592,7 +23692,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17820,7 +19621,7 @@
+@@ -17820,7 +19626,7 @@
need_version=yes
;;
@@ -23601,7 +23701,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'
-@@ -17853,27 +19654,55 @@
+@@ -17853,27 +19659,55 @@
fi
;;
@@ -23613,13 +23713,8 @@
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-- ;;
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -23639,9 +23734,13 @@
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+
+*)
+ dynamic_linker=no
@@ -23671,7 +23770,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17893,8 +19722,8 @@
+@@ -17893,8 +19727,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -23682,7 +23781,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17905,36 +19734,6 @@
+@@ -17905,36 +19739,6 @@
enable_fast_install=needless
fi
@@ -23719,7 +23818,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17949,7 +19748,8 @@
+@@ -17949,7 +19753,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.
@@ -23729,7 +23828,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 \
-@@ -18049,6 +19849,12 @@
+@@ -18049,6 +19854,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -23742,7 +23841,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18060,6 +19866,9 @@
+@@ -18060,6 +19871,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -23752,7 +23851,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18079,7 +19888,7 @@
+@@ -18079,7 +19893,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -23761,7 +23860,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18110,7 +19919,7 @@
+@@ -18110,7 +19924,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -23770,7 +23869,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18125,7 +19934,7 @@
+@@ -18125,7 +19939,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -23779,7 +23878,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18327,7 +20136,10 @@
+@@ -18327,7 +20141,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.
@@ -23791,7 +23890,7 @@
fi
-@@ -18348,7 +20160,6 @@
+@@ -18348,7 +20165,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -23799,7 +23898,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18360,26 +20171,55 @@
+@@ -18360,26 +20176,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -23856,7 +23955,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
-@@ -18391,8 +20231,8 @@
+@@ -18391,8 +20236,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -23867,7 +23966,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18406,26 +20246,28 @@
+@@ -18406,26 +20251,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 \
@@ -23876,12 +23975,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20252: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20257: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18416: \$? = $ac_status" >&5
-+ echo "$as_me:20256: \$? = $ac_status" >&5
++ echo "$as_me:20261: \$? = $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
@@ -23903,7 +24002,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"
-@@ -18439,8 +20281,8 @@
+@@ -18439,8 +20286,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -23914,7 +24013,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18478,6 +20320,11 @@
+@@ -18478,6 +20325,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -23926,7 +24025,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18494,7 +20341,7 @@
+@@ -18494,7 +20346,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -23935,7 +24034,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18520,6 +20367,16 @@
+@@ -18520,6 +20372,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -23952,7 +24051,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18531,7 +20388,7 @@
+@@ -18531,7 +20393,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.
@@ -23961,7 +24060,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18554,13 +20411,20 @@
+@@ -18554,13 +20416,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -23984,7 +24083,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18575,15 +20439,15 @@
+@@ -18575,15 +20444,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -24006,7 +24105,7 @@
;;
sunos4*)
-@@ -18592,7 +20456,7 @@
+@@ -18592,7 +20461,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -24015,7 +24114,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18605,6 +20469,17 @@
+@@ -18605,6 +20474,17 @@
fi
;;
@@ -24033,7 +24132,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18616,16 +20491,16 @@
+@@ -18616,16 +20496,16 @@
esac
fi
@@ -24054,7 +24153,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18639,26 +20514,28 @@
+@@ -18639,26 +20519,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 \
@@ -24063,12 +24162,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18645: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20520: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20525: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18649: \$? = $ac_status" >&5
-+ echo "$as_me:20524: \$? = $ac_status" >&5
++ echo "$as_me:20529: \$? = $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
@@ -24090,7 +24189,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18671,7 +20548,7 @@
+@@ -18671,7 +20553,7 @@
fi
fi
@@ -24099,7 +24198,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18681,8 +20558,50 @@
+@@ -18681,8 +20563,50 @@
;;
esac
@@ -24152,7 +24251,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18693,60 +20612,58 @@
+@@ -18693,60 +20617,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -24174,12 +24273,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18712: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20624: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20629: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18716: \$? = $ac_status" >&5
-+ echo "$as_me:20628: \$? = $ac_status" >&5
++ echo "$as_me:20633: \$? = $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
@@ -24231,7 +24330,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;}
-@@ -18756,8 +20673,8 @@
+@@ -18756,8 +20678,8 @@
need_locks=no
fi
@@ -24242,7 +24341,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18795,6 +20712,16 @@
+@@ -18795,6 +20717,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -24259,7 +24358,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18805,6 +20732,10 @@
+@@ -18805,6 +20737,10 @@
with_gnu_ld=no
fi
;;
@@ -24270,7 +24369,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18815,6 +20746,27 @@
+@@ -18815,6 +20751,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -24298,7 +24397,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18852,7 +20804,7 @@
+@@ -18852,7 +20809,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -24307,7 +24406,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18862,13 +20814,13 @@
+@@ -18862,13 +20819,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'
@@ -24324,7 +24423,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
-@@ -18877,23 +20829,70 @@
+@@ -18877,23 +20834,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -24401,7 +24500,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18907,13 +20906,40 @@
+@@ -18907,13 +20911,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -24444,7 +24543,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18923,24 +20949,19 @@
+@@ -18923,24 +20954,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -24476,7 +24575,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18952,7 +20973,7 @@
+@@ -18952,7 +20978,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -24485,7 +24584,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18974,9 +20995,21 @@
+@@ -18974,9 +21000,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
@@ -24509,7 +24608,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18993,7 +21026,7 @@
+@@ -18993,7 +21031,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -24518,7 +24617,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`
-@@ -19012,8 +21045,12 @@
+@@ -19012,8 +21050,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -24531,7 +24630,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19021,22 +21058,23 @@
+@@ -19021,22 +21063,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -24562,7 +24661,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19052,24 +21090,36 @@
+@@ -19052,24 +21095,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24607,14 +24706,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19083,19 +21133,20 @@
+@@ -19083,19 +21138,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
@@ -24632,7 +24732,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19114,24 +21165,36 @@
+@@ -19114,24 +21170,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24677,17 +24777,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19145,7 +21208,9 @@
+@@ -19145,8 +21213,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
-@@ -19155,13 +21220,11 @@
+
+@@ -19155,13 +21225,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -24704,7 +24806,7 @@
fi
fi
;;
-@@ -19174,7 +21237,7 @@
+@@ -19174,7 +21242,7 @@
ld_shlibs_GCJ=no
;;
@@ -24713,7 +24815,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19184,68 +21247,68 @@
+@@ -19184,68 +21252,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -24826,7 +24928,7 @@
fi
;;
-@@ -19279,8 +21342,8 @@
+@@ -19279,8 +21347,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -24837,7 +24939,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19288,7 +21351,7 @@
+@@ -19288,7 +21356,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -24846,7 +24948,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
-@@ -19302,47 +21365,62 @@
+@@ -19302,47 +21370,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -24933,7 +25035,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19356,7 +21434,7 @@
+@@ -19356,7 +21439,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -24942,7 +25044,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'
-@@ -19366,7 +21444,7 @@
+@@ -19366,7 +21449,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -24951,7 +25053,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
-@@ -19389,7 +21467,8 @@
+@@ -19389,7 +21472,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
@@ -24961,7 +25063,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19399,7 +21478,7 @@
+@@ -19399,7 +21483,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -24970,7 +25072,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19410,14 +21489,14 @@
+@@ -19410,14 +21494,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -24987,7 +25089,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'
-@@ -19429,13 +21508,13 @@
+@@ -19429,13 +21513,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -25003,7 +25105,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19443,21 +21522,15 @@
+@@ -19443,21 +21527,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -25029,7 +25131,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'
-@@ -19466,8 +21539,18 @@
+@@ -19466,8 +21544,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -25050,7 +25152,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19476,7 +21559,7 @@
+@@ -19476,7 +21564,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.
@@ -25059,7 +25161,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19524,1513 +21607,746 @@
+@@ -19524,1513 +21612,746 @@
fi
;;
@@ -25106,17 +25208,7 @@
- uts4*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ 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_shlibpath_var_GCJ=no
- ;;
-
- *)
@@ -26154,12 +26246,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ 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'
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -26201,14 +26288,22 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ 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
-+ ;;
++ 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'
-ac_cv_lib_dl_dlopen=no
-fi
@@ -26234,10 +26329,13 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ 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
++ 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
+ ;;
-/* Override any gcc2 internal prototype to avoid an error. */
@@ -26281,11 +26379,11 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ *)
-+ ld_shlibs_GCJ=no
++ 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
+ ;;
-+ esac
-+ fi
-ac_cv_lib_svld_dlopen=no
-fi
@@ -26311,9 +26409,11 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+{ 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
++ *)
++ ld_shlibs_GCJ=no
++ ;;
++ esac
++ fi
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -26343,6 +26443,10 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&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
++
+#
+# Do we need to explicitly link libc?
+#
@@ -27247,7 +27351,7 @@
fi
-@@ -21047,7 +22363,8 @@
+@@ -21047,7 +22368,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.
@@ -27257,7 +27361,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 \
-@@ -21147,6 +22464,12 @@
+@@ -21147,6 +22469,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27270,7 +27374,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21158,6 +22481,9 @@
+@@ -21158,6 +22486,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27280,7 +27384,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21177,7 +22503,7 @@
+@@ -21177,7 +22508,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27289,7 +27393,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21208,7 +22534,7 @@
+@@ -21208,7 +22539,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27298,7 +27402,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21223,7 +22549,7 @@
+@@ -21223,7 +22554,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -27307,7 +27411,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21425,7 +22751,10 @@
+@@ -21425,7 +22756,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.
@@ -27319,7 +27423,7 @@
fi
-@@ -21445,7 +22774,6 @@
+@@ -21445,7 +22779,6 @@
RC)
@@ -27327,7 +27431,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21464,15 +22792,42 @@
+@@ -21464,15 +22797,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -27370,7 +27474,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21488,7 +22843,8 @@
+@@ -21488,7 +22848,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.
@@ -27380,7 +27484,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 \
-@@ -21588,6 +22944,12 @@
+@@ -21588,6 +22949,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27393,7 +27497,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21599,6 +22961,9 @@
+@@ -21599,6 +22966,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27403,7 +27507,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21618,7 +22983,7 @@
+@@ -21618,7 +22988,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27412,7 +27516,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21649,7 +23014,7 @@
+@@ -21649,7 +23019,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27421,7 +27525,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21664,7 +23029,7 @@
+@@ -21664,7 +23034,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -27430,7 +27534,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21866,7 +23231,10 @@
+@@ -21866,7 +23236,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.
@@ -27442,7 +27546,7 @@
fi
-@@ -21913,7 +23281,7 @@
+@@ -21913,7 +23286,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -27451,7 +27555,7 @@
# Prevent multiple expansion
-@@ -21968,8 +23336,8 @@
+@@ -21968,8 +23341,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -27462,7 +27566,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21995,17 +23363,17 @@
+@@ -21995,17 +23368,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -27486,7 +27590,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22020,32 +23388,33 @@
+@@ -22020,32 +23393,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27528,7 +27632,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22054,8 +23423,8 @@
+@@ -22054,8 +23428,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -27539,7 +27643,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22081,11 +23450,11 @@
+@@ -22081,11 +23455,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -27555,7 +27659,7 @@
fi
-@@ -22093,8 +23462,8 @@
+@@ -22093,8 +23467,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -27566,7 +27670,7 @@
XGETTEXT=":"
fi
fi
-@@ -22104,8 +23473,7 @@
+@@ -22104,8 +23478,7 @@
@@ -27576,7 +27680,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22117,8 +23485,8 @@
+@@ -22117,8 +23490,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -27587,7 +27691,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22146,24 +23514,36 @@
+@@ -22146,24 +23519,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27632,15 +27736,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22172,15 +23552,16 @@
+@@ -22172,15 +23557,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
@@ -27652,7 +27757,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22209,15 +23590,14 @@
+@@ -22209,15 +23595,14 @@
@@ -27671,7 +27776,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22229,9 +23609,6 @@
+@@ -22229,9 +23614,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27681,7 +27786,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22257,24 +23634,36 @@
+@@ -22257,24 +23639,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27726,18 +27831,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22283,8 +23672,9 @@
+@@ -22283,9 +23677,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"
-@@ -22298,11 +23688,11 @@
+ ac_ext=c
+@@ -22298,11 +23693,11 @@
fi
@@ -27753,7 +27860,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22323,8 +23713,7 @@
+@@ -22323,8 +23718,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -27763,7 +27870,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22362,24 +23751,36 @@
+@@ -22362,24 +23756,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27808,7 +27915,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22389,9 +23790,10 @@
+@@ -22389,10 +23795,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27816,11 +27923,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
-@@ -22405,8 +23807,8 @@
+ ac_ext=c
+@@ -22405,8 +23812,8 @@
fi
@@ -27831,7 +27940,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22430,15 +23832,14 @@
+@@ -22430,15 +23837,14 @@
@@ -27850,7 +27959,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22450,9 +23851,6 @@
+@@ -22450,9 +23856,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27860,7 +27969,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22477,24 +23875,36 @@
+@@ -22477,24 +23880,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27905,18 +28014,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22503,8 +23913,9 @@
+@@ -22503,9 +23918,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"
-@@ -22518,11 +23929,11 @@
+ ac_ext=c
+@@ -22518,11 +23934,11 @@
fi
@@ -27932,7 +28043,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22543,8 +23954,7 @@
+@@ -22543,8 +23959,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -27942,7 +28053,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22581,24 +23991,36 @@
+@@ -22581,24 +23996,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27987,7 +28098,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22608,9 +24030,10 @@
+@@ -22608,10 +24035,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27995,11 +28106,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
-@@ -22624,8 +24047,8 @@
+ ac_ext=c
+@@ -22624,8 +24052,8 @@
fi
@@ -28010,7 +28123,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22648,8 +24071,8 @@
+@@ -22648,8 +24076,8 @@
@@ -28021,7 +28134,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22666,30 +24089,42 @@
+@@ -22666,30 +24094,42 @@
int
main ()
{
@@ -28073,15 +28186,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22698,20 +24133,21 @@
+@@ -22698,20 +24138,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
@@ -28100,7 +28214,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22728,30 +24164,42 @@
+@@ -22728,30 +24169,42 @@
int
main ()
{
@@ -28152,15 +28266,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22760,21 +24208,22 @@
+@@ -22760,21 +24213,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
@@ -28180,7 +28295,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22787,40 +24236,52 @@
+@@ -22787,40 +24241,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28245,15 +28360,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22829,19 +24290,20 @@
+@@ -22829,19 +24295,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
@@ -28271,7 +28387,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22854,40 +24316,52 @@
+@@ -22854,40 +24321,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28336,15 +28452,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22896,14 +24370,15 @@
+@@ -22896,14 +24375,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
@@ -28355,7 +28472,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22929,13 +24404,13 @@
+@@ -22929,13 +24409,13 @@
fi
@@ -28372,7 +28489,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22964,24 +24439,36 @@
+@@ -22964,24 +24444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28417,17 +28534,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22993,7 +24480,9 @@
+@@ -22993,8 +24485,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'
-@@ -23004,17 +24493,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23004,17 +24498,17 @@
fi
@@ -28450,7 +28569,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23043,24 +24532,36 @@
+@@ -23043,24 +24537,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28495,17 +28614,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23072,7 +24573,9 @@
+@@ -23072,8 +24578,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
-@@ -23084,8 +24587,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23084,8 +24592,8 @@
fi
@@ -28516,7 +28637,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23098,8 +24601,8 @@
+@@ -23098,8 +24606,8 @@
_ACEOF
@@ -28527,7 +28648,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23112,40 +24615,52 @@
+@@ -23112,40 +24620,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28592,15 +28713,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23154,21 +24669,22 @@
+@@ -23154,21 +24674,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
@@ -28620,7 +28742,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23181,40 +24697,52 @@
+@@ -23181,40 +24702,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28685,15 +28807,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23223,21 +24751,22 @@
+@@ -23223,21 +24756,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
@@ -28713,7 +28836,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23264,53 +24793,59 @@
+@@ -23264,53 +24798,59 @@
#undef inet_ntoa
@@ -28792,15 +28915,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23319,17 +24854,18 @@
+@@ -23319,17 +24859,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
@@ -28816,7 +28940,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23342,40 +24878,52 @@
+@@ -23342,40 +24883,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28881,15 +29005,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23384,21 +24932,22 @@
+@@ -23384,21 +24937,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
@@ -28909,7 +29034,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23425,53 +24974,59 @@
+@@ -23425,53 +24979,59 @@
#undef connect
@@ -28988,15 +29113,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23480,17 +25035,18 @@
+@@ -23480,17 +25040,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
@@ -29012,7 +29138,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23503,40 +25059,52 @@
+@@ -23503,40 +25064,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29077,15 +29203,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23545,22 +25113,23 @@
+@@ -23545,22 +25118,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
@@ -29106,7 +29233,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23587,53 +25156,59 @@
+@@ -23587,53 +25161,59 @@
#undef remove
@@ -29185,15 +29312,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23642,17 +25217,18 @@
+@@ -23642,17 +25222,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
@@ -29209,7 +29337,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23665,40 +25241,52 @@
+@@ -23665,40 +25246,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29274,15 +29402,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23707,14 +25295,15 @@
+@@ -23707,14 +25300,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
@@ -29293,7 +29422,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23722,8 +25311,8 @@
+@@ -23722,8 +25316,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -29304,7 +29433,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23750,53 +25339,59 @@
+@@ -23750,53 +25344,59 @@
#undef shmat
@@ -29383,15 +29512,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23805,18 +25400,19 @@
+@@ -23805,18 +25405,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
@@ -29408,7 +29538,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23829,40 +25425,52 @@
+@@ -23829,40 +25430,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29473,15 +29603,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23871,14 +25479,15 @@
+@@ -23871,14 +25484,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
@@ -29492,7 +29623,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23892,18 +25501,19 @@
+@@ -23892,18 +25506,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29520,7 +29651,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23914,24 +25524,36 @@
+@@ -23914,24 +25529,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29565,17 +29696,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23940,15 +25562,16 @@
+@@ -23940,15 +25567,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; }
@@ -29587,7 +29719,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23957,8 +25580,13 @@
+@@ -23957,8 +25585,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29603,7 +29735,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23982,9 +25610,10 @@
+@@ -23982,9 +25615,10 @@
ac_header_preproc=no
fi
@@ -29616,7 +29748,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24008,25 +25637,19 @@
+@@ -24008,25 +25642,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;}
@@ -29649,7 +29781,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24044,18 +25667,19 @@
+@@ -24044,18 +25672,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29677,7 +29809,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24066,24 +25690,36 @@
+@@ -24066,24 +25695,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29722,17 +29854,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24092,15 +25728,16 @@
+@@ -24092,15 +25733,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; }
@@ -29744,7 +29877,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24109,8 +25746,13 @@
+@@ -24109,8 +25751,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29760,7 +29893,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24134,9 +25776,10 @@
+@@ -24134,9 +25781,10 @@
ac_header_preproc=no
fi
@@ -29773,7 +29906,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24160,25 +25803,19 @@
+@@ -24160,25 +25808,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;}
@@ -29806,7 +29939,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24192,8 +25829,8 @@
+@@ -24192,8 +25834,8 @@
# darwin requires a poll emulation library
@@ -29817,7 +29950,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24206,40 +25843,52 @@
+@@ -24206,40 +25848,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29882,15 +30015,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24248,14 +25897,15 @@
+@@ -24248,14 +25902,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
@@ -29901,7 +30035,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24266,18 +25916,19 @@
+@@ -24266,18 +25921,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29929,7 +30063,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24288,24 +25939,36 @@
+@@ -24288,24 +25944,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29974,17 +30108,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24314,15 +25977,16 @@
+@@ -24314,15 +25982,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; }
@@ -29996,7 +30131,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24331,8 +25995,13 @@
+@@ -24331,8 +26000,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -30012,7 +30147,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24356,9 +26025,10 @@
+@@ -24356,9 +26030,10 @@
ac_header_preproc=no
fi
@@ -30025,7 +30160,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24382,25 +26052,19 @@
+@@ -24382,25 +26057,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;}
@@ -30058,7 +30193,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24415,17 +26079,17 @@
+@@ -24415,17 +26084,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -30082,7 +30217,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24436,24 +26100,36 @@
+@@ -24436,24 +26105,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -30127,17 +30262,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24462,15 +26138,16 @@
+@@ -24462,15 +26143,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; }
@@ -30149,7 +30285,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24479,8 +26156,13 @@
+@@ -24479,8 +26161,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -30165,7 +30301,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24504,9 +26186,10 @@
+@@ -24504,9 +26191,10 @@
ac_header_preproc=no
fi
@@ -30178,7 +30314,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24530,25 +26213,18 @@
+@@ -24530,25 +26218,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;}
@@ -30209,7 +30345,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24565,8 +26241,8 @@
+@@ -24565,8 +26246,8 @@
@@ -30220,7 +30356,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24592,31 +26268,43 @@
+@@ -24592,31 +26273,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30274,7 +30410,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24627,25 +26315,25 @@
+@@ -24627,25 +26320,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30284,8 +30420,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
@@ -30306,7 +30443,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24657,9 +26345,6 @@
+@@ -24657,9 +26350,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -30316,7 +30453,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24685,24 +26370,36 @@
+@@ -24685,24 +26375,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30361,18 +30498,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24711,8 +26408,9 @@
+@@ -24711,9 +26413,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"
-@@ -24726,11 +26424,11 @@
+ ac_ext=c
+@@ -24726,11 +26429,11 @@
fi
@@ -30388,7 +30527,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24751,8 +26449,7 @@
+@@ -24751,8 +26454,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -30398,7 +30537,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24790,24 +26487,36 @@
+@@ -24790,24 +26492,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30443,7 +30582,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24817,9 +26526,10 @@
+@@ -24817,10 +26531,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30451,11 +30590,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
-@@ -24833,8 +26543,8 @@
+ ac_ext=c
+@@ -24833,8 +26548,8 @@
fi
@@ -30466,7 +30607,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24861,8 +26571,8 @@
+@@ -24861,8 +26576,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -30477,7 +30618,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24875,40 +26585,52 @@
+@@ -24875,40 +26590,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30542,15 +30683,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24917,27 +26639,28 @@
+@@ -24917,27 +26644,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
@@ -30580,7 +30722,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24950,40 +26673,52 @@
+@@ -24950,40 +26678,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30645,15 +30787,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24992,22 +26727,23 @@
+@@ -24992,22 +26732,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
@@ -30674,7 +30817,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25018,36 +26754,49 @@
+@@ -25018,36 +26759,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30734,15 +30877,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25056,20 +26805,21 @@
+@@ -25056,20 +26810,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
@@ -30762,7 +30906,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.
-@@ -25082,10 +26832,11 @@
+@@ -25082,10 +26837,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30775,7 +30919,7 @@
test_array [0] = 0
;
-@@ -25093,24 +26844,36 @@
+@@ -25093,24 +26849,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30820,7 +30964,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25123,10 +26886,11 @@
+@@ -25123,10 +26891,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30833,7 +30977,7 @@
test_array [0] = 0
;
-@@ -25134,24 +26898,36 @@
+@@ -25134,24 +26903,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30878,7 +31022,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25160,30 +26936,32 @@
+@@ -25160,30 +26941,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30895,8 +31039,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
@@ -30919,7 +31064,7 @@
test_array [0] = 0
;
-@@ -25191,24 +26969,36 @@
+@@ -25191,24 +26974,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30964,7 +31109,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25221,10 +27011,11 @@
+@@ -25221,10 +27016,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30977,7 +31122,7 @@
test_array [0] = 0
;
-@@ -25232,24 +27023,36 @@
+@@ -25232,24 +27028,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31022,7 +31167,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25258,23 +27061,26 @@
+@@ -25258,24 +27066,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31039,8 +31184,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
@@ -31049,14 +31195,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
-@@ -25286,10 +27092,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25286,10 +27097,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31069,7 +31218,7 @@
test_array [0] = 0
;
-@@ -25297,24 +27104,36 @@
+@@ -25297,24 +27109,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31114,15 +31263,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25323,26 +27142,20 @@
+@@ -25323,26 +27147,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;;
@@ -31146,7 +31296,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25350,8 +27163,9 @@
+@@ -25350,8 +27168,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31158,7 +31308,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25360,35 +27174,44 @@
+@@ -25360,35 +27179,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31216,7 +31366,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25399,28 +27222,27 @@
+@@ -25399,28 +27227,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31253,7 +31403,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25431,36 +27253,49 @@
+@@ -25431,36 +27258,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31313,15 +31463,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25469,20 +27304,21 @@
+@@ -25469,20 +27309,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
@@ -31341,7 +31492,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.
-@@ -25495,10 +27331,11 @@
+@@ -25495,10 +27336,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31354,7 +31505,7 @@
test_array [0] = 0
;
-@@ -25506,24 +27343,36 @@
+@@ -25506,24 +27348,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31399,7 +31550,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25536,10 +27385,11 @@
+@@ -25536,10 +27390,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31412,7 +31563,7 @@
test_array [0] = 0
;
-@@ -25547,24 +27397,36 @@
+@@ -25547,24 +27402,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31457,7 +31608,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25573,30 +27435,32 @@
+@@ -25573,30 +27440,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31474,8 +31625,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
@@ -31498,7 +31650,7 @@
test_array [0] = 0
;
-@@ -25604,24 +27468,36 @@
+@@ -25604,24 +27473,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31543,7 +31695,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25634,10 +27510,11 @@
+@@ -25634,10 +27515,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31556,7 +31708,7 @@
test_array [0] = 0
;
-@@ -25645,24 +27522,36 @@
+@@ -25645,24 +27527,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31601,7 +31753,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25671,23 +27560,26 @@
+@@ -25671,24 +27565,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31618,8 +31770,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
@@ -31628,14 +31781,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
-@@ -25699,10 +27591,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25699,10 +27596,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31648,7 +31804,7 @@
test_array [0] = 0
;
-@@ -25710,24 +27603,36 @@
+@@ -25710,24 +27608,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31693,15 +31849,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25736,26 +27641,20 @@
+@@ -25736,26 +27646,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;;
@@ -31725,7 +31882,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25763,8 +27662,9 @@
+@@ -25763,8 +27667,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31737,7 +31894,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25773,35 +27673,44 @@
+@@ -25773,35 +27678,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31795,7 +31952,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25812,28 +27721,27 @@
+@@ -25812,28 +27726,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31832,7 +31989,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25844,36 +27752,49 @@
+@@ -25844,36 +27757,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31892,15 +32049,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25882,20 +27803,21 @@
+@@ -25882,20 +27808,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
@@ -31920,7 +32078,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.
-@@ -25908,10 +27830,11 @@
+@@ -25908,10 +27835,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31933,7 +32091,7 @@
test_array [0] = 0
;
-@@ -25919,24 +27842,36 @@
+@@ -25919,24 +27847,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31978,7 +32136,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25949,10 +27884,11 @@
+@@ -25949,10 +27889,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31991,7 +32149,7 @@
test_array [0] = 0
;
-@@ -25960,24 +27896,36 @@
+@@ -25960,24 +27901,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32036,7 +32194,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25986,30 +27934,32 @@
+@@ -25986,30 +27939,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32053,8 +32211,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
@@ -32077,7 +32236,7 @@
test_array [0] = 0
;
-@@ -26017,24 +27967,36 @@
+@@ -26017,24 +27972,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32122,7 +32281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26047,10 +28009,11 @@
+@@ -26047,10 +28014,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32135,7 +32294,7 @@
test_array [0] = 0
;
-@@ -26058,24 +28021,36 @@
+@@ -26058,24 +28026,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32180,7 +32339,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26084,23 +28059,26 @@
+@@ -26084,24 +28064,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32197,8 +32356,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
@@ -32207,14 +32367,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
-@@ -26112,10 +28090,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26112,10 +28095,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32227,7 +32390,7 @@
test_array [0] = 0
;
-@@ -26123,24 +28102,36 @@
+@@ -26123,24 +28107,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32272,15 +32435,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26149,26 +28140,20 @@
+@@ -26149,26 +28145,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;;
@@ -32304,7 +32468,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26176,8 +28161,9 @@
+@@ -26176,8 +28166,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32316,7 +32480,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26186,35 +28172,44 @@
+@@ -26186,35 +28177,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32374,7 +32538,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26225,28 +28220,27 @@
+@@ -26225,28 +28225,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32411,7 +32575,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26257,36 +28251,49 @@
+@@ -26257,36 +28256,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32471,15 +32635,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26295,20 +28302,21 @@
+@@ -26295,20 +28307,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
@@ -32499,7 +32664,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.
-@@ -26321,10 +28329,11 @@
+@@ -26321,10 +28334,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32512,7 +32677,7 @@
test_array [0] = 0
;
-@@ -26332,24 +28341,36 @@
+@@ -26332,24 +28346,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32557,7 +32722,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26362,10 +28383,11 @@
+@@ -26362,10 +28388,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32570,7 +32735,7 @@
test_array [0] = 0
;
-@@ -26373,24 +28395,36 @@
+@@ -26373,24 +28400,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32615,7 +32780,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26399,30 +28433,32 @@
+@@ -26399,30 +28438,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32632,8 +32797,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
@@ -32656,7 +32822,7 @@
test_array [0] = 0
;
-@@ -26430,24 +28466,36 @@
+@@ -26430,24 +28471,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32701,7 +32867,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26460,10 +28508,11 @@
+@@ -26460,10 +28513,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32714,7 +32880,7 @@
test_array [0] = 0
;
-@@ -26471,24 +28520,36 @@
+@@ -26471,24 +28525,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32759,7 +32925,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26497,23 +28558,26 @@
+@@ -26497,24 +28563,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32776,8 +32942,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
@@ -32786,14 +32953,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
-@@ -26525,10 +28589,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26525,10 +28594,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32806,7 +32976,7 @@
test_array [0] = 0
;
-@@ -26536,24 +28601,36 @@
+@@ -26536,24 +28606,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32851,15 +33021,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26562,26 +28639,20 @@
+@@ -26562,26 +28644,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;;
@@ -32883,7 +33054,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26589,8 +28660,9 @@
+@@ -26589,8 +28665,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32895,7 +33066,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26599,35 +28671,44 @@
+@@ -26599,35 +28676,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32953,7 +33124,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26638,30 +28719,29 @@
+@@ -26638,30 +28724,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32992,7 +33163,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26674,40 +28754,52 @@
+@@ -26674,40 +28759,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33057,15 +33228,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26716,14 +28808,15 @@
+@@ -26716,14 +28813,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
@@ -33076,7 +33248,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26732,8 +28825,8 @@
+@@ -26732,8 +28830,8 @@
fi
@@ -33087,7 +33259,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26746,40 +28839,52 @@
+@@ -26746,40 +28844,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33152,15 +33324,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26788,14 +28893,15 @@
+@@ -26788,14 +28898,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
@@ -33171,7 +33344,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26809,8 +28915,8 @@
+@@ -26809,8 +28920,8 @@
@@ -33182,7 +33355,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26821,36 +28927,49 @@
+@@ -26821,36 +28932,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33242,15 +33415,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26859,20 +28978,21 @@
+@@ -26859,20 +28983,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
@@ -33270,7 +33444,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.
-@@ -26885,10 +29005,11 @@
+@@ -26885,10 +29010,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33283,7 +33457,7 @@
test_array [0] = 0
;
-@@ -26896,24 +29017,36 @@
+@@ -26896,24 +29022,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33328,7 +33502,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26926,10 +29059,11 @@
+@@ -26926,10 +29064,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33341,7 +33515,7 @@
test_array [0] = 0
;
-@@ -26937,24 +29071,36 @@
+@@ -26937,24 +29076,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33386,7 +33560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26963,30 +29109,32 @@
+@@ -26963,30 +29114,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33403,8 +33577,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
@@ -33427,7 +33602,7 @@
test_array [0] = 0
;
-@@ -26994,24 +29142,36 @@
+@@ -26994,24 +29147,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33472,7 +33647,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27024,10 +29184,11 @@
+@@ -27024,10 +29189,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33485,7 +33660,7 @@
test_array [0] = 0
;
-@@ -27035,24 +29196,36 @@
+@@ -27035,24 +29201,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33530,7 +33705,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27061,23 +29234,26 @@
+@@ -27061,24 +29239,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33547,8 +33722,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
@@ -33557,14 +33733,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
-@@ -27089,10 +29265,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27089,10 +29270,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33577,7 +33756,7 @@
test_array [0] = 0
;
-@@ -27100,24 +29277,36 @@
+@@ -27100,24 +29282,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33622,15 +33801,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27126,26 +29315,20 @@
+@@ -27126,26 +29320,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;;
@@ -33654,7 +33834,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27153,8 +29336,9 @@
+@@ -27153,8 +29341,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33666,7 +33846,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27163,35 +29347,44 @@
+@@ -27163,35 +29352,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33724,7 +33904,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27202,29 +29395,28 @@
+@@ -27202,29 +29400,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -33762,7 +33942,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27235,36 +29427,49 @@
+@@ -27235,36 +29432,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33822,15 +34002,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27273,20 +29478,21 @@
+@@ -27273,20 +29483,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
@@ -33850,7 +34031,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.
-@@ -27299,10 +29505,11 @@
+@@ -27299,10 +29510,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33863,7 +34044,7 @@
test_array [0] = 0
;
-@@ -27310,24 +29517,36 @@
+@@ -27310,24 +29522,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33908,7 +34089,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27340,10 +29559,11 @@
+@@ -27340,10 +29564,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33921,7 +34102,7 @@
test_array [0] = 0
;
-@@ -27351,24 +29571,36 @@
+@@ -27351,24 +29576,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33966,7 +34147,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27377,30 +29609,32 @@
+@@ -27377,30 +29614,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33983,8 +34164,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
@@ -34007,7 +34189,7 @@
test_array [0] = 0
;
-@@ -27408,24 +29642,36 @@
+@@ -27408,24 +29647,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34052,7 +34234,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27438,10 +29684,11 @@
+@@ -27438,10 +29689,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34065,7 +34247,7 @@
test_array [0] = 0
;
-@@ -27449,24 +29696,36 @@
+@@ -27449,24 +29701,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34110,7 +34292,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27475,23 +29734,26 @@
+@@ -27475,24 +29739,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34127,8 +34309,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
@@ -34137,14 +34320,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
-@@ -27503,10 +29765,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27503,10 +29770,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34157,7 +34343,7 @@
test_array [0] = 0
;
-@@ -27514,24 +29777,36 @@
+@@ -27514,24 +29782,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34202,15 +34388,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27540,26 +29815,20 @@
+@@ -27540,26 +29820,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;;
@@ -34234,7 +34421,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27567,8 +29836,9 @@
+@@ -27567,8 +29841,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34246,7 +34433,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27577,35 +29847,44 @@
+@@ -27577,35 +29852,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -34304,7 +34491,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27616,30 +29895,29 @@
+@@ -27616,30 +29900,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -34343,7 +34530,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27660,36 +29938,48 @@
+@@ -27660,36 +29943,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34404,16 +34591,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!
-@@ -27701,18 +29991,18 @@
+@@ -27701,18 +29996,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
@@ -34427,7 +34615,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27742,24 +30032,36 @@
+@@ -27742,24 +30037,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34472,18 +34660,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27768,8 +30070,9 @@
+@@ -27768,9 +30075,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
-@@ -27783,26 +30086,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27783,26 +30091,26 @@
fi
@@ -34520,7 +34710,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27821,18 +30124,19 @@
+@@ -27821,18 +30129,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34548,7 +34738,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27843,24 +30147,36 @@
+@@ -27843,24 +30152,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -34593,17 +34783,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27869,15 +30185,16 @@
+@@ -27869,15 +30190,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; }
@@ -34615,7 +34806,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27886,8 +30203,13 @@
+@@ -27886,8 +30208,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -34631,7 +34822,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27911,9 +30233,10 @@
+@@ -27911,9 +30238,10 @@
ac_header_preproc=no
fi
@@ -34644,7 +34835,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27937,25 +30260,19 @@
+@@ -27937,25 +30265,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;}
@@ -34677,7 +34868,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27967,8 +30284,8 @@
+@@ -27967,8 +30289,8 @@
done
@@ -34688,7 +34879,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27995,53 +30312,59 @@
+@@ -27995,53 +30317,59 @@
#undef _NSGetEnviron
@@ -34767,15 +34958,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28050,13 +30373,14 @@
+@@ -28050,13 +30378,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
@@ -34785,7 +34977,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28077,9 +30401,9 @@
+@@ -28077,9 +30406,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34798,7 +34990,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28105,53 +30429,59 @@
+@@ -28105,53 +30434,59 @@
#undef $ac_func
@@ -34877,15 +35069,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28160,13 +30490,15 @@
+@@ -28160,13 +30495,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
@@ -34896,7 +35089,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28183,32 +30515,32 @@
+@@ -28183,32 +30520,32 @@
@@ -34941,7 +35134,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28224,8 +30556,8 @@
+@@ -28224,8 +30561,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -34952,7 +35145,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28262,8 +30594,13 @@
+@@ -28262,8 +30599,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -34968,7 +35161,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28330,6 +30667,7 @@
+@@ -28330,6 +30672,7 @@
fi
done
fi
@@ -34976,7 +35169,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28359,24 +30697,36 @@
+@@ -28359,24 +30702,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35021,7 +35214,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28387,7 +30737,7 @@
+@@ -28387,7 +30742,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35030,15 +35223,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}/` \
-@@ -28435,6 +30785,7 @@
+@@ -28435,7 +30790,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
-@@ -28445,21 +30796,26 @@
+
+@@ -28445,21 +30801,26 @@
*-*-solaris*)
;;
*)
@@ -35073,7 +35268,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28467,7 +30823,7 @@
+@@ -28467,7 +30828,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
@@ -35082,7 +35277,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28476,7 +30832,7 @@
+@@ -28476,7 +30837,7 @@
esac
fi
cd ..
@@ -35091,7 +35286,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28520,12 +30876,12 @@
+@@ -28520,12 +30881,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -35108,7 +35303,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28553,8 +30909,8 @@
+@@ -28553,8 +30914,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.
@@ -35119,7 +35314,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28567,40 +30923,52 @@
+@@ -28567,40 +30928,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35184,15 +35379,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28609,14 +30977,15 @@
+@@ -28609,14 +30982,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
@@ -35203,7 +35399,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28625,8 +30994,8 @@
+@@ -28625,8 +30999,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -35214,7 +35410,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28660,24 +31029,36 @@
+@@ -28660,24 +31034,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35259,7 +35455,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28686,9 +31067,10 @@
+@@ -28686,10 +31072,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35267,11 +35463,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
-@@ -28698,8 +31080,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28698,8 +31085,8 @@
fi
@@ -35282,7 +35480,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28845,8 +31227,8 @@
+@@ -28845,8 +31232,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -35293,7 +35491,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28857,9 +31239,9 @@
+@@ -28857,9 +31244,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -35306,7 +35504,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28871,40 +31253,52 @@
+@@ -28871,40 +31258,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35371,15 +35569,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28913,14 +31307,16 @@
+@@ -28913,14 +31312,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
@@ -35391,7 +35590,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28933,8 +31329,8 @@
+@@ -28933,8 +31334,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -35402,7 +35601,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28947,40 +31343,52 @@
+@@ -28947,40 +31348,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35467,15 +35666,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28989,14 +31397,15 @@
+@@ -28989,14 +31402,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
@@ -35486,7 +35686,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29004,8 +31413,8 @@
+@@ -29004,8 +31418,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -35497,7 +35697,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29024,39 +31433,52 @@
+@@ -29024,40 +31438,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35558,11 +35758,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
-@@ -29072,16 +31494,15 @@
+ fi
+@@ -29072,16 +31499,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -35583,7 +35785,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29108,24 +31529,36 @@
+@@ -29108,24 +31534,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35628,17 +35830,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29134,7 +31567,9 @@
+@@ -29134,8 +31572,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"
-@@ -29148,13 +31583,13 @@
+ ac_ext=c
+@@ -29148,13 +31588,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35656,7 +35860,7 @@
:
fi
-@@ -29166,16 +31601,15 @@
+@@ -29166,16 +31606,15 @@
case $host_os in
solaris*)
@@ -35677,7 +35881,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29202,24 +31636,36 @@
+@@ -29202,24 +31641,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35722,17 +35926,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29228,7 +31674,9 @@
+@@ -29228,8 +31679,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"
-@@ -29242,13 +31690,13 @@
+ ac_ext=c
+@@ -29242,13 +31695,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35750,7 +35956,7 @@
:
fi
-@@ -29275,17 +31723,17 @@
+@@ -29275,17 +31728,17 @@
@@ -35774,7 +35980,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29303,21 +31751,21 @@
+@@ -29303,21 +31756,21 @@
fi
@@ -35804,7 +36010,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29336,14 +31784,14 @@
+@@ -29336,14 +31789,14 @@
@@ -35823,7 +36029,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29377,24 +31825,36 @@
+@@ -29377,24 +31830,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35868,18 +36074,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29403,8 +31863,9 @@
+@@ -29403,9 +31868,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"
-@@ -29418,8 +31879,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29418,8 +31884,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -35890,7 +36098,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29439,8 +31900,8 @@
+@@ -29439,8 +31905,8 @@
@@ -35901,7 +36109,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29476,24 +31937,36 @@
+@@ -29476,24 +31942,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35946,7 +36154,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29502,9 +31975,10 @@
+@@ -29502,10 +31980,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35954,11 +36162,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"
-@@ -29519,19 +31993,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29519,19 +31998,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -35984,7 +36194,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29564,24 +32038,36 @@
+@@ -29564,24 +32043,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36029,18 +36239,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29590,8 +32076,9 @@
+@@ -29590,9 +32081,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"
-@@ -29602,14 +32089,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29602,14 +32094,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -36061,7 +36273,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29642,24 +32129,36 @@
+@@ -29642,24 +32134,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36106,18 +36318,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29668,8 +32167,9 @@
+@@ -29668,9 +32172,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"
-@@ -29680,11 +32180,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29680,11 +32185,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -36133,16 +36347,16 @@
LIBJPEG=
-@@ -29704,7 +32204,7 @@
+@@ -29704,7 +32209,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29707: $i/$j" >&5
-+ echo "configure: 32207: $i/$j" >&5
++ echo "configure: 32212: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29751,14 +32251,14 @@
+@@ -29751,14 +32256,14 @@
@@ -36160,7 +36374,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29801,8 +32301,8 @@
+@@ -29801,8 +32306,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36171,7 +36385,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29811,8 +32311,8 @@
+@@ -29811,8 +32316,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36182,7 +36396,7 @@
PERL=$kde_cv_path
fi
-@@ -29826,10 +32326,9 @@
+@@ -29826,10 +32331,9 @@
@@ -36195,7 +36409,7 @@
else
if test $kde_qtver = 3; then
-@@ -29839,7 +32338,8 @@
+@@ -29839,7 +32343,8 @@
fi
@@ -36205,7 +36419,7 @@
USING_QT_MT=""
-@@ -29859,13 +32359,13 @@
+@@ -29859,13 +32364,13 @@
else
kde_check_threading_default=yes
fi
@@ -36223,7 +36437,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29937,8 +32437,8 @@
+@@ -29937,8 +32442,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -36234,7 +36448,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"
-@@ -29947,34 +32447,34 @@
+@@ -29947,34 +32452,34 @@
qt_libraries=""
qt_includes=""
@@ -36281,16 +36495,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30002,7 +32502,7 @@
+@@ -30002,7 +32507,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30005: $i/$j" >&5
-+ echo "configure: 32505: $i/$j" >&5
++ echo "configure: 32510: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30039,8 +32539,7 @@
+@@ -30039,8 +32544,7 @@
ac_qt_libraries="$qt_libdir"
@@ -36300,7 +36514,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30177,13 +32676,13 @@
+@@ -30177,13 +32681,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -36318,7 +36532,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30192,15 +32691,14 @@
+@@ -30192,15 +32696,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -36337,7 +36551,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30321,12 +32819,12 @@
+@@ -30321,12 +32824,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -36354,7 +36568,7 @@
fi
-@@ -30364,14 +32862,14 @@
+@@ -30364,14 +32867,14 @@
fi
@@ -36372,7 +36586,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30414,8 +32912,8 @@
+@@ -30414,8 +32917,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36383,7 +36597,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30436,22 +32934,22 @@
+@@ -30436,22 +32939,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36411,7 +36625,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30494,12 +32992,12 @@
+@@ -30494,12 +32997,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36428,7 +36642,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30529,10 +33027,10 @@
+@@ -30529,10 +33032,10 @@
if test $kde_qtver = 3; then
@@ -36442,7 +36656,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30555,22 +33053,22 @@
+@@ -30555,22 +33058,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36472,7 +36686,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30593,13 +33091,13 @@
+@@ -30593,13 +33096,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36490,7 +36704,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30630,15 +33128,14 @@
+@@ -30630,15 +33133,14 @@
if test -n "$LIBJPEG"; then
@@ -36509,7 +36723,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30671,24 +33168,36 @@
+@@ -30671,24 +33173,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36554,18 +36768,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30697,8 +33206,9 @@
+@@ -30697,9 +33211,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"
-@@ -30715,12 +33225,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30715,12 +33230,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -36582,7 +36798,7 @@
LIBJPEG_QT=
fi
-@@ -30751,15 +33261,15 @@
+@@ -30751,15 +33266,15 @@
@@ -36604,7 +36820,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30783,11 +33293,11 @@
+@@ -30783,11 +33298,11 @@
@@ -36620,34 +36836,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30839,7 +33349,7 @@
+@@ -30839,7 +33354,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30842: $i/$j" >&5
-+ echo "configure: 33352: $i/$j" >&5
++ echo "configure: 33357: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30869,7 +33379,7 @@
+@@ -30869,7 +33384,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30872: $i/$j" >&5
-+ echo "configure: 33382: $i/$j" >&5
++ echo "configure: 33387: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30887,7 +33397,7 @@
+@@ -30887,7 +33402,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30890: $i/$j" >&5
-+ echo "configure: 33400: $i/$j" >&5
++ echo "configure: 33405: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30946,12 +33456,12 @@
+@@ -30946,12 +33461,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -36664,7 +36880,7 @@
fi
kde_libraries="${libdir}"
-@@ -30960,8 +33470,8 @@
+@@ -30960,8 +33475,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -36675,7 +36891,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -30999,8 +33509,8 @@
+@@ -30999,8 +33514,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -36686,7 +36902,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31043,8 +33553,8 @@
+@@ -31043,8 +33558,8 @@
fi
@@ -36697,7 +36913,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31076,10 +33586,9 @@
+@@ -31076,10 +33591,9 @@
@@ -36710,7 +36926,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31093,13 +33602,14 @@
+@@ -31093,13 +33607,14 @@
fi
@@ -36728,7 +36944,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31210,15 +33720,14 @@
+@@ -31210,15 +33725,14 @@
else
if test $kde_qtver = 1; then
@@ -36749,7 +36965,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31270,8 +33779,8 @@
+@@ -31270,8 +33784,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -36760,7 +36976,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.
-@@ -31310,8 +33819,8 @@
+@@ -31310,8 +33824,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -36771,7 +36987,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
-@@ -31319,8 +33828,8 @@
+@@ -31319,8 +33833,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -36782,7 +36998,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
-@@ -31513,15 +34022,14 @@
+@@ -31513,15 +34027,14 @@
else
if test $kde_qtver = 1; then
@@ -36803,7 +37019,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31573,8 +34081,8 @@
+@@ -31573,8 +34086,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -36814,7 +37030,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.
-@@ -31613,8 +34121,8 @@
+@@ -31613,8 +34126,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -36825,7 +37041,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
-@@ -31622,8 +34130,8 @@
+@@ -31622,8 +34135,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -36836,7 +37052,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
-@@ -31715,22 +34223,22 @@
+@@ -31715,22 +34228,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -36865,7 +37081,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31763,14 +34271,14 @@
+@@ -31763,14 +34276,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -36883,7 +37099,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31813,8 +34321,8 @@
+@@ -31813,8 +34326,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36894,7 +37110,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31825,21 +34333,21 @@
+@@ -31825,21 +34338,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36921,7 +37137,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31882,8 +34390,8 @@
+@@ -31882,8 +34395,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36932,7 +37148,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31894,22 +34402,22 @@
+@@ -31894,22 +34407,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36960,7 +37176,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31952,8 +34460,8 @@
+@@ -31952,8 +34465,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36971,7 +37187,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31966,21 +34474,21 @@
+@@ -31966,21 +34479,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36998,7 +37214,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32023,8 +34531,8 @@
+@@ -32023,8 +34536,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37009,7 +37225,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32037,22 +34545,22 @@
+@@ -32037,22 +34550,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37037,7 +37253,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32095,12 +34603,12 @@
+@@ -32095,12 +34608,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37054,7 +37270,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32129,14 +34637,14 @@
+@@ -32129,14 +34642,14 @@
if test -n "$kde32ornewer"; then
@@ -37072,7 +37288,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32179,8 +34687,8 @@
+@@ -32179,8 +34692,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37083,7 +37299,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32191,21 +34699,21 @@
+@@ -32191,21 +34704,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37110,7 +37326,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32248,8 +34756,8 @@
+@@ -32248,8 +34761,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37121,7 +37337,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32260,8 +34768,8 @@
+@@ -32260,8 +34773,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37132,7 +37348,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32269,14 +34777,14 @@
+@@ -32269,14 +34782,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -37150,7 +37366,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32319,8 +34827,8 @@
+@@ -32319,8 +34832,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37161,7 +37377,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32331,8 +34839,8 @@
+@@ -32331,8 +34844,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37172,7 +37388,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32340,14 +34848,14 @@
+@@ -32340,14 +34853,14 @@
fi
@@ -37190,7 +37406,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32390,12 +34898,12 @@
+@@ -32390,12 +34903,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37207,16 +37423,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32410,7 +34918,7 @@
+@@ -32410,7 +34923,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32413: $i/$j" >&5
-+ echo "configure: 34921: $i/$j" >&5
++ echo "configure: 34926: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32571,13 +35079,12 @@
+@@ -32571,13 +35084,12 @@
@@ -37233,7 +37449,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32598,13 +35105,13 @@
+@@ -32598,13 +35110,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -37251,7 +37467,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
-@@ -32624,16 +35131,15 @@
+@@ -32624,16 +35136,15 @@
kde_have_gcc_visibility=no
@@ -37272,7 +37488,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32660,24 +35166,36 @@
+@@ -32660,24 +35171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37317,17 +37533,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32686,7 +35204,9 @@
+@@ -32686,8 +35209,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"
-@@ -32700,28 +35220,27 @@
+ ac_ext=c
+@@ -32700,28 +35225,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -37365,7 +37583,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32756,24 +35275,36 @@
+@@ -32756,24 +35280,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37410,18 +37628,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32782,8 +35313,9 @@
+@@ -32782,9 +35318,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
-@@ -32796,21 +35328,20 @@
+ ac_ext=c
+@@ -32796,21 +35333,20 @@
fi
@@ -37448,7 +37668,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32850,24 +35381,36 @@
+@@ -32850,24 +35386,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37493,18 +37713,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32876,8 +35419,9 @@
+@@ -32876,9 +35424,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
-@@ -32892,8 +35436,8 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -32892,8 +35441,8 @@
fi
@@ -37515,7 +37737,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32909,8 +35453,8 @@
+@@ -32909,8 +35458,8 @@
fi
else
@@ -37526,7 +37748,7 @@
:
fi
-@@ -32920,15 +35464,14 @@
+@@ -32920,15 +35469,14 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -37545,7 +37767,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32940,9 +35483,6 @@
+@@ -32940,9 +35488,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37555,7 +37777,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32965,24 +35505,36 @@
+@@ -32965,24 +35510,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37600,18 +37822,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32991,8 +35543,9 @@
+@@ -32991,9 +35548,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"
-@@ -33006,11 +35559,11 @@
+ ac_ext=c
+@@ -33006,11 +35564,11 @@
fi
@@ -37627,7 +37851,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33031,8 +35584,7 @@
+@@ -33031,8 +35589,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -37637,7 +37861,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33067,24 +35619,36 @@
+@@ -33067,24 +35624,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37682,7 +37906,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33094,9 +35658,10 @@
+@@ -33094,10 +35663,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37690,11 +37914,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
-@@ -33110,8 +35675,8 @@
+ ac_ext=c
+@@ -33110,8 +35680,8 @@
fi
@@ -37705,7 +37931,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -33135,15 +35700,14 @@
+@@ -33135,15 +35705,14 @@
@@ -37724,7 +37950,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33155,9 +35719,6 @@
+@@ -33155,9 +35724,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37734,7 +37960,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33180,24 +35741,36 @@
+@@ -33180,24 +35746,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37779,18 +38005,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33206,8 +35779,9 @@
+@@ -33206,9 +35784,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"
-@@ -33221,11 +35795,11 @@
+ ac_ext=c
+@@ -33221,11 +35800,11 @@
fi
@@ -37806,7 +38034,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33246,8 +35820,7 @@
+@@ -33246,8 +35825,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -37816,7 +38044,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33282,24 +35855,36 @@
+@@ -33282,24 +35860,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37861,7 +38089,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33309,9 +35894,10 @@
+@@ -33309,10 +35899,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37869,11 +38097,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
-@@ -33325,8 +35911,8 @@
+ ac_ext=c
+@@ -33325,8 +35916,8 @@
fi
@@ -37884,7 +38114,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -33350,15 +35936,14 @@
+@@ -33350,15 +35941,14 @@
@@ -37903,7 +38133,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33370,9 +35955,6 @@
+@@ -33370,9 +35960,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37913,7 +38143,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33400,24 +35982,36 @@
+@@ -33400,24 +35987,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37958,18 +38188,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33426,8 +36020,9 @@
+@@ -33426,9 +36025,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_initgroups=no
+ kde_cv_func_initgroups=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"
-@@ -33441,11 +36036,11 @@
+ ac_ext=c
+@@ -33441,11 +36041,11 @@
fi
@@ -37985,7 +38217,7 @@
if test "${kde_cv_proto_initgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33466,8 +36061,7 @@
+@@ -33466,8 +36066,7 @@
if test "x$kde_cv_proto_initgroups" = xunknown; then
@@ -37995,7 +38227,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33507,24 +36101,36 @@
+@@ -33507,24 +36106,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38040,7 +38272,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33534,9 +36140,10 @@
+@@ -33534,10 +36145,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38048,11 +38280,13 @@
+ kde_cv_proto_initgroups="initgroups 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
-@@ -33550,8 +36157,8 @@
+ ac_ext=c
+@@ -33550,8 +36162,8 @@
fi
@@ -38063,7 +38297,7 @@
if test "x$kde_cv_func_initgroups" = xyes; then
-@@ -33608,8 +36215,8 @@
+@@ -33608,8 +36220,8 @@
fi
for i in $ac_topsubdirs; do
@@ -38074,7 +38308,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -33620,8 +36227,8 @@
+@@ -33620,8 +36232,8 @@
else
install_it="no"
fi
@@ -38085,7 +38319,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -33733,79 +36340,79 @@
+@@ -33733,79 +36345,79 @@
kworldwatch_SUBDIR_included_FALSE=
fi
@@ -38202,7 +38436,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -33825,39 +36432,58 @@
+@@ -33825,39 +36437,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -38277,7 +38511,7 @@
fi
fi
rm -f confcache
-@@ -33866,38 +36492,31 @@
+@@ -33866,38 +36497,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -38329,7 +38563,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
-@@ -34041,11 +36660,35 @@
+@@ -34041,11 +36665,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -38367,7 +38601,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -34054,8 +36697,43 @@
+@@ -34054,8 +36702,43 @@
fi
@@ -38412,7 +38646,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -34069,18 +36747,19 @@
+@@ -34069,18 +36752,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -38435,7 +38669,7 @@
as_basename=basename
else
as_basename=false
-@@ -34088,159 +36767,120 @@
+@@ -34088,159 +36772,120 @@
# Name of the executable.
@@ -38666,7 +38900,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -34249,7 +36889,19 @@
+@@ -34249,7 +36894,19 @@
as_mkdir_p=false
fi
@@ -38687,7 +38921,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'"
-@@ -34258,31 +36910,14 @@
+@@ -34258,31 +36915,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -38719,11 +38953,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
-@@ -34290,30 +36925,20 @@
+@@ -34290,30 +36930,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -38762,7 +38996,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -34340,19 +36965,21 @@
+@@ -34340,19 +36970,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -38774,7 +39008,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.
@@ -38790,7 +39024,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -34363,39 +36990,24 @@
+@@ -34363,39 +36995,24 @@
do
case $1 in
--*=*)
@@ -38836,7 +39070,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -34405,18 +37017,24 @@
+@@ -34405,18 +37022,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -38866,7 +39100,7 @@
esac
shift
-@@ -34432,73 +37050,85 @@
+@@ -34432,73 +37055,85 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -38999,7 +39233,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
-@@ -34510,513 +37140,664 @@
+@@ -34510,513 +37145,664 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -40116,7 +40350,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -35024,248 +37805,129 @@
+@@ -35024,248 +37810,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -40157,6 +40391,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'
@@ -40464,7 +40699,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -35276,135 +37938,39 @@
+@@ -35276,135 +37944,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -40626,7 +40861,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.
-@@ -35414,18 +37980,29 @@
+@@ -35414,18 +37986,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
@@ -40664,7 +40899,7 @@
else
continue
fi
-@@ -35447,53 +38024,79 @@
+@@ -35447,53 +38030,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -40777,7 +41012,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdetoys, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdetoys, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
More information about the pkg-kde-commits
mailing list