rev 4422 - trunk/packages/kdeaddons/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Aug 26 21:23:22 UTC 2006
Author: chrsmrtn
Date: 2006-08-26 21:23:16 +0000 (Sat, 26 Aug 2006)
New Revision: 4422
Modified:
trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
Log:
buildprep update for kdeaddons.
Modified: trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaddons/debian/patches/98_buildprep.diff 2006-08-26 21:22:30 UTC (rev 4421)
+++ trunk/packages/kdeaddons/debian/patches/98_buildprep.diff 2006-08-26 21:23:16 UTC (rev 4422)
@@ -3997,7 +3997,7 @@
#>+ 3
designer.moc: $(srcdir)/designer.h
-@@ -824,7 +833,7 @@
+@@ -824,10 +833,10 @@
#>+ 3
clean-metasources:
@@ -4005,7 +4005,11 @@
+ -rm -f group.moc boardinfo.moc editor.moc designer.moc
#>+ 2
- KDE_DIST=editor.h Makefile.in designer.h Makefile.am group.h boardinfo.h
+-KDE_DIST=editor.h Makefile.in designer.h Makefile.am group.h boardinfo.h
++KDE_DIST=Makefile.in group.h editor.h designer.h Makefile.am boardinfo.h
+
+ #>+ 2
+ docs-am:
@@ -871,7 +880,7 @@
@@ -4269,7 +4273,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,
@@ -4551,8 +4555,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
@@ -5900,7 +5904,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,
@@ -5919,7 +5923,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 $@
@@ -6553,7 +6557,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
@@ -7655,8 +7659,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
@@ -7729,7 +7734,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3105,285 +3869,273 @@
+@@ -3105,285 +3869,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8005,15 +8010,16 @@
-continue
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -8079,6 +8085,11 @@
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
@@ -8151,7 +8162,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
@@ -8186,7 +8197,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3392,8 +4144,8 @@
+@@ -3392,8 +4149,8 @@
depcc="$CC" am_compiler_list=
@@ -8197,7 +8208,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3482,8 +4234,8 @@
+@@ -3482,8 +4239,8 @@
fi
fi
@@ -8208,7 +8219,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3505,8 +4257,8 @@
+@@ -3505,8 +4262,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
@@ -8219,7 +8230,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3540,8 +4292,13 @@
+@@ -3540,8 +4297,13 @@
#endif
Syntax error
_ACEOF
@@ -8235,7 +8246,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3566,9 +4323,10 @@
+@@ -3566,9 +4328,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8247,7 +8258,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3578,8 +4336,13 @@
+@@ -3578,8 +4341,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8263,7 +8274,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3606,6 +4369,7 @@
+@@ -3606,6 +4374,7 @@
ac_preproc_ok=:
break
fi
@@ -8271,7 +8282,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3623,8 +4387,8 @@
+@@ -3623,8 +4392,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8282,7 +8293,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3647,8 +4411,13 @@
+@@ -3647,8 +4416,13 @@
#endif
Syntax error
_ACEOF
@@ -8298,7 +8309,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3673,9 +4442,10 @@
+@@ -3673,9 +4447,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8310,7 +8321,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3685,8 +4455,13 @@
+@@ -3685,8 +4460,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8326,7 +8337,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3713,6 +4488,7 @@
+@@ -3713,6 +4493,7 @@
ac_preproc_ok=:
break
fi
@@ -8334,7 +8345,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3763,18 +4539,22 @@
+@@ -3763,18 +4544,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8362,7 +8373,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3787,36 +4567,38 @@
+@@ -3787,36 +4572,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8409,7 +8420,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3829,55 +4611,85 @@
+@@ -3829,55 +4616,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8513,7 +8524,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3900,24 +4712,36 @@
+@@ -3900,24 +4717,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8558,15 +8569,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3926,24 +4750,28 @@
+@@ -3926,24 +4755,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
@@ -8594,7 +8606,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3959,24 +4787,36 @@
+@@ -3959,24 +4792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8639,7 +8651,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3985,70 +4825,53 @@
+@@ -3985,70 +4830,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8734,7 +8746,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4057,61 +4880,91 @@
+@@ -4057,61 +4885,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8811,20 +8823,21 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8847,7 +8860,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4120,8 +4973,8 @@
+@@ -4120,8 +4978,8 @@
depcc="$CXX" am_compiler_list=
@@ -8858,7 +8871,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4210,8 +5063,8 @@
+@@ -4210,8 +5068,8 @@
fi
fi
@@ -8869,7 +8882,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4229,8 +5082,8 @@
+@@ -4229,8 +5087,8 @@
@@ -8880,7 +8893,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4255,24 +5108,36 @@
+@@ -4255,24 +5113,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8925,7 +8938,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4281,13 +5146,14 @@
+@@ -4281,13 +5151,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8933,17 +8946,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:
-@@ -4329,17 +5195,16 @@
+@@ -4329,17 +5200,16 @@
fi
fi
@@ -8965,7 +8979,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4367,24 +5232,36 @@
+@@ -4367,24 +5237,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9010,17 +9024,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4393,7 +5270,9 @@
+@@ -4393,8 +5275,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"
-@@ -4407,29 +5286,28 @@
+ ac_ext=c
+@@ -4407,29 +5291,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9058,7 +9074,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4456,24 +5334,36 @@
+@@ -4456,24 +5339,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9103,17 +9119,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4482,7 +5372,9 @@
+@@ -4482,8 +5377,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"
-@@ -4496,13 +5388,13 @@
+ ac_ext=c
+@@ -4496,13 +5393,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9131,7 +9149,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4523,16 +5415,15 @@
+@@ -4523,16 +5420,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9152,7 +9170,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4559,24 +5450,36 @@
+@@ -4559,24 +5455,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9197,17 +9215,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4585,7 +5488,9 @@
+@@ -4585,8 +5493,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"
-@@ -4599,16 +5504,16 @@
+ ac_ext=c
+@@ -4599,16 +5509,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9228,7 +9248,7 @@
:
fi
-@@ -4623,16 +5528,15 @@
+@@ -4623,16 +5533,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"
@@ -9249,7 +9269,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4659,24 +5563,36 @@
+@@ -4659,24 +5568,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9294,17 +9314,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4685,7 +5601,9 @@
+@@ -4685,8 +5606,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"
-@@ -4699,27 +5617,26 @@
+ ac_ext=c
+@@ -4699,27 +5622,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9339,7 +9361,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4744,24 +5661,36 @@
+@@ -4744,24 +5666,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9384,17 +9406,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4770,7 +5699,9 @@
+@@ -4770,8 +5704,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"
-@@ -4784,13 +5715,13 @@
+ ac_ext=c
+@@ -4784,13 +5720,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9412,7 +9436,7 @@
:
fi
-@@ -4798,16 +5729,15 @@
+@@ -4798,16 +5734,15 @@
;;
esac
@@ -9433,7 +9457,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4834,24 +5764,36 @@
+@@ -4834,24 +5769,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9478,17 +9502,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4860,7 +5802,9 @@
+@@ -4860,8 +5807,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"
-@@ -4874,28 +5818,27 @@
+ ac_ext=c
+@@ -4874,28 +5823,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9525,7 +9551,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4922,24 +5865,36 @@
+@@ -4922,24 +5870,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9570,17 +9596,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4948,7 +5903,9 @@
+@@ -4948,8 +5908,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"
-@@ -4962,28 +5919,27 @@
+ ac_ext=c
+@@ -4962,28 +5924,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9617,7 +9645,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5010,24 +5966,36 @@
+@@ -5010,24 +5971,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9662,17 +9690,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5036,7 +6004,9 @@
+@@ -5036,8 +6009,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"
-@@ -5050,13 +6020,13 @@
+ ac_ext=c
+@@ -5050,13 +6025,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9690,7 +9720,7 @@
:
fi
-@@ -5068,13 +6038,13 @@
+@@ -5068,13 +6043,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9708,7 +9738,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5082,16 +6052,15 @@
+@@ -5082,16 +6057,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9729,7 +9759,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5118,24 +6087,36 @@
+@@ -5118,24 +6092,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9774,17 +9804,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5144,7 +6125,9 @@
+@@ -5144,8 +6130,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"
-@@ -5158,13 +6141,13 @@
+ ac_ext=c
+@@ -5158,13 +6146,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9802,7 +9834,7 @@
:
fi
-@@ -5176,16 +6159,15 @@
+@@ -5176,16 +6164,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9823,7 +9855,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5212,24 +6194,36 @@
+@@ -5212,24 +6199,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9868,17 +9900,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5238,7 +6232,9 @@
+@@ -5238,8 +6237,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"
-@@ -5252,28 +6248,27 @@
+ ac_ext=c
+@@ -5252,28 +6253,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9915,7 +9949,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5300,24 +6295,36 @@
+@@ -5300,24 +6300,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9960,17 +9994,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5326,7 +6333,9 @@
+@@ -5326,8 +6338,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"
-@@ -5340,28 +6349,27 @@
+ ac_ext=c
+@@ -5340,28 +6354,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10007,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'
-@@ -5388,24 +6396,36 @@
+@@ -5388,24 +6401,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10052,17 +10088,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5414,7 +6434,9 @@
+@@ -5414,8 +6439,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"
-@@ -5428,28 +6450,27 @@
+ ac_ext=c
+@@ -5428,28 +6455,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10099,7 +10137,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5476,24 +6497,36 @@
+@@ -5476,24 +6502,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10144,17 +10182,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5502,7 +6535,9 @@
+@@ -5502,8 +6540,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"
-@@ -5516,13 +6551,13 @@
+ ac_ext=c
+@@ -5516,13 +6556,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10172,7 +10212,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5530,37 +6565,37 @@
+@@ -5530,37 +6570,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10224,7 +10264,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5592,24 +6627,36 @@
+@@ -5592,24 +6632,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10269,7 +10309,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5618,9 +6665,10 @@
+@@ -5618,18 +6670,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10277,11 +10317,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
-@@ -5628,8 +6676,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -10292,7 +10333,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5649,16 +6697,15 @@
+@@ -5649,16 +6702,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10313,7 +10354,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5685,24 +6732,36 @@
+@@ -5685,24 +6737,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10358,17 +10399,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5711,7 +6770,9 @@
+@@ -5711,8 +6775,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"
-@@ -5725,29 +6786,28 @@
+ ac_ext=c
+@@ -5725,29 +6791,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10406,7 +10449,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5774,24 +6834,36 @@
+@@ -5774,24 +6839,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10451,17 +10494,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5800,7 +6872,9 @@
+@@ -5800,8 +6877,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"
-@@ -5814,28 +6888,27 @@
+ ac_ext=c
+@@ -5814,28 +6893,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10498,7 +10543,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5862,24 +6935,36 @@
+@@ -5862,24 +6940,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10543,17 +10588,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5888,7 +6973,9 @@
+@@ -5888,8 +6978,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"
-@@ -5902,28 +6989,27 @@
+ ac_ext=c
+@@ -5902,28 +6994,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10590,7 +10637,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5950,24 +7036,36 @@
+@@ -5950,24 +7041,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10635,17 +10682,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5976,7 +7074,9 @@
+@@ -5976,8 +7079,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"
-@@ -5990,28 +7090,27 @@
+ ac_ext=c
+@@ -5990,28 +7095,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10682,7 +10731,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6038,24 +7137,36 @@
+@@ -6038,24 +7142,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10727,17 +10776,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6064,7 +7175,9 @@
+@@ -6064,8 +7180,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"
-@@ -6078,28 +7191,27 @@
+ ac_ext=c
+@@ -6078,28 +7196,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10774,7 +10825,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6126,24 +7238,36 @@
+@@ -6126,24 +7243,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10819,17 +10870,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6152,7 +7276,9 @@
+@@ -6152,8 +7281,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"
-@@ -6166,13 +7292,13 @@
+ ac_ext=c
+@@ -6166,13 +7297,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10847,7 +10900,7 @@
:
fi
-@@ -6279,13 +7405,13 @@
+@@ -6279,13 +7410,13 @@
fi
@@ -10864,7 +10917,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6315,8 +7441,13 @@
+@@ -6315,8 +7446,13 @@
#endif
Syntax error
_ACEOF
@@ -10880,7 +10933,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6341,9 +7472,10 @@
+@@ -6341,9 +7477,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10892,7 +10945,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6353,8 +7485,13 @@
+@@ -6353,8 +7490,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10908,7 +10961,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6381,6 +7518,7 @@
+@@ -6381,6 +7523,7 @@
ac_preproc_ok=:
break
fi
@@ -10916,7 +10969,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6398,8 +7536,8 @@
+@@ -6398,8 +7541,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10927,7 +10980,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6422,8 +7560,13 @@
+@@ -6422,8 +7565,13 @@
#endif
Syntax error
_ACEOF
@@ -10943,7 +10996,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6448,9 +7591,10 @@
+@@ -6448,9 +7596,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10955,7 +11008,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6460,8 +7604,13 @@
+@@ -6460,8 +7609,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10971,7 +11024,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6488,6 +7637,7 @@
+@@ -6488,6 +7642,7 @@
ac_preproc_ok=:
break
fi
@@ -10979,7 +11032,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6514,16 +7664,15 @@
+@@ -6514,16 +7669,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11000,7 +11053,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6550,24 +7699,36 @@
+@@ -6550,24 +7704,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11045,17 +11098,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6576,7 +7737,9 @@
+@@ -6576,8 +7742,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"
-@@ -6590,22 +7753,21 @@
+ ac_ext=c
+@@ -6590,22 +7758,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11084,7 +11139,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6621,36 +7783,36 @@
+@@ -6621,36 +7788,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11131,7 +11186,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6677,24 +7839,36 @@
+@@ -6677,24 +7844,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11176,17 +11231,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6703,7 +7877,9 @@
+@@ -6703,8 +7882,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"
-@@ -6717,29 +7893,28 @@
+ ac_ext=c
+@@ -6717,29 +7898,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11224,7 +11281,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6766,24 +7941,36 @@
+@@ -6766,24 +7946,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11269,17 +11326,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6792,7 +7979,9 @@
+@@ -6792,8 +7984,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"
-@@ -6806,13 +7995,13 @@
+ ac_ext=c
+@@ -6806,13 +8000,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11297,7 +11356,7 @@
:
fi
-@@ -6822,13 +8011,13 @@
+@@ -6822,13 +8016,13 @@
@@ -11315,7 +11374,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6841,13 +8030,13 @@
+@@ -6841,13 +8035,13 @@
@@ -11333,7 +11392,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6858,216 +8047,36 @@
+@@ -6858,216 +8052,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11346,25 +11405,9 @@
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+ # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-+ kde_use_nmcheck=no
-+fi
+-else
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11373,6 +11416,12 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -11383,7 +11432,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 ()
-{
@@ -11554,12 +11610,12 @@
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
--
+
+
+
-
--
--
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11569,7 +11625,7 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7086,12 +8095,12 @@
+@@ -7086,12 +8100,12 @@
esac
else
enable_shared=yes
@@ -11586,7 +11642,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7110,7 +8119,8 @@
+@@ -7110,7 +8124,8 @@
esac
else
enable_static=no
@@ -11596,7 +11652,7 @@
-@@ -7119,11 +8129,11 @@
+@@ -7119,11 +8134,11 @@
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -11612,7 +11668,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7144,8 +8154,8 @@
+@@ -7144,8 +8159,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11623,7 +11679,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7161,14 +8171,13 @@
+@@ -7161,14 +8176,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11642,7 +11698,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7187,10 +8196,11 @@
+@@ -7187,10 +8201,11 @@
esac
else
enable_fast_install=yes
@@ -11657,7 +11713,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7214,7 +8224,7 @@
+@@ -7214,7 +8229,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
@@ -11666,7 +11722,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7243,37 +8253,184 @@
+@@ -7243,37 +8258,184 @@
fi
SED=$lt_cv_path_SED
@@ -11742,7 +11798,10 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -11752,11 +11811,8 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
+
++
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
@@ -11829,25 +11885,25 @@
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
@@ -11868,7 +11924,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7302,11 +8459,11 @@
+@@ -7302,11 +8464,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11884,7 +11940,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7319,7 +8476,7 @@
+@@ -7319,7 +8481,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,
@@ -11893,7 +11949,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'*)
-@@ -7339,21 +8496,21 @@
+@@ -7339,21 +8501,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11922,7 +11978,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7363,29 +8520,38 @@
+@@ -7363,29 +8525,38 @@
;;
esac
fi
@@ -11969,7 +12025,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7393,56 +8559,63 @@
+@@ -7393,56 +8564,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12067,7 +12123,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7469,44 +8642,36 @@
+@@ -7469,44 +8647,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12122,7 +12178,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7522,7 +8687,7 @@
+@@ -7522,7 +8692,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12131,7 +12187,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
-@@ -7538,43 +8703,27 @@
+@@ -7538,43 +8708,27 @@
esac
;;
@@ -12188,7 +12244,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
-@@ -7593,32 +8742,22 @@
+@@ -7593,32 +8747,22 @@
;;
openbsd*)
@@ -12224,7 +12280,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]'
-@@ -7639,17 +8778,20 @@
+@@ -7639,17 +8783,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12248,7 +12304,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
-@@ -7658,14 +8800,17 @@
+@@ -7658,14 +8805,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12269,16 +12325,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7692,7 +8837,7 @@
+@@ -7692,7 +8842,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7695 "configure"' > conftest.$ac_ext
-+ echo '#line 8840 "configure"' > conftest.$ac_ext
++ echo '#line 8845 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7735,14 +8880,13 @@
+@@ -7735,14 +8885,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12295,7 +12351,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7754,7 +8898,6 @@
+@@ -7754,7 +8903,6 @@
esac
;;
*64-bit*)
@@ -12303,7 +12359,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7779,8 +8922,8 @@
+@@ -7779,8 +8927,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12314,7 +12370,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7806,24 +8949,36 @@
+@@ -7806,24 +8954,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12359,18 +12415,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7832,8 +8987,9 @@
+@@ -7832,9 +8992,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
-@@ -7843,13 +8999,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7843,25 +9004,45 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12383,6 +12441,18 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
+-
+-esac
+-
+-need_locks="$enable_libtool_lock"
+-
+-
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
@@ -12403,21 +12473,22 @@
+ rm -rf conftest*
+ ;;
+
-
- esac
-
-@@ -7857,8 +9033,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7882,24 +9058,36 @@
++if test "${ac_cv_header_stdc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -7882,24 +9063,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12462,18 +12533,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7908,8 +9096,9 @@
+@@ -7908,9 +9101,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
-@@ -7966,6 +9155,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7966,6 +9160,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12481,7 +12554,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7985,18 +9175,27 @@
+@@ -7985,18 +9180,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12515,7 +12588,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8009,12 +9208,14 @@
+@@ -8009,12 +9213,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12533,7 +12606,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8037,9 +9238,9 @@
+@@ -8037,9 +9243,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12546,7 +12619,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8053,24 +9254,36 @@
+@@ -8053,24 +9259,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12591,15 +12664,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8079,12 +9292,14 @@
+@@ -8079,12 +9297,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
@@ -12609,7 +12683,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8099,18 +9314,19 @@
+@@ -8099,18 +9319,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12637,7 +12711,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8121,24 +9337,36 @@
+@@ -8121,24 +9342,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12682,17 +12756,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8147,15 +9375,16 @@
+@@ -8147,15 +9380,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; }
@@ -12704,7 +12779,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8164,8 +9393,13 @@
+@@ -8164,8 +9398,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12720,7 +12795,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8189,9 +9423,10 @@
+@@ -8189,9 +9428,10 @@
ac_header_preproc=no
fi
@@ -12733,7 +12808,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8215,25 +9450,19 @@
+@@ -8215,25 +9455,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;}
@@ -12766,7 +12841,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8245,324 +9474,693 @@
+@@ -8245,324 +9479,693 @@
done
@@ -13497,7 +13572,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
@@ -13560,7 +13635,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
@@ -13723,7 +13798,7 @@
# [They come from Ultrix. What could be older than Ultrix?!! ;)]
# Character class describing NM global symbol codes.
-@@ -8571,9 +10169,6 @@
+@@ -8571,9 +10174,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13733,7 +13808,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8595,14 +10190,30 @@
+@@ -8595,14 +10195,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -13766,7 +13841,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8620,14 +10231,17 @@
+@@ -8620,14 +10236,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13786,7 +13861,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8745,15 +10359,15 @@
+@@ -8745,15 +10364,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
@@ -13808,7 +13883,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8767,8 +10381,8 @@
+@@ -8767,8 +10386,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13819,7 +13894,7 @@
objdir=$lt_cv_objdir
-@@ -8789,7 +10403,7 @@
+@@ -8789,7 +10408,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13828,7 +13903,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8809,7 +10423,7 @@
+@@ -8809,7 +10428,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13837,7 +13912,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8819,8 +10433,8 @@
+@@ -8819,8 +10438,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
@@ -13848,7 +13923,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8833,32 +10447,34 @@
+@@ -8833,32 +10452,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13890,7 +13965,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8871,27 +10487,41 @@
+@@ -8871,27 +10492,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13939,7 +14014,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8899,8 +10529,8 @@
+@@ -8899,8 +10534,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
@@ -13950,7 +14025,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8913,32 +10543,34 @@
+@@ -8913,32 +10548,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13992,7 +14067,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8951,27 +10583,41 @@
+@@ -8951,27 +10588,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14041,7 +14116,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8979,8 +10625,8 @@
+@@ -8979,8 +10630,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
@@ -14052,7 +14127,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8993,32 +10639,34 @@
+@@ -8993,32 +10644,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14094,7 +14169,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9031,27 +10679,41 @@
+@@ -9031,27 +10684,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14143,7 +14218,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9066,6 +10728,7 @@
+@@ -9066,6 +10733,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14151,7 +14226,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9085,21 +10748,32 @@
+@@ -9085,21 +10753,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14188,7 +14263,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9119,7 +10793,7 @@
+@@ -9119,7 +10798,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14197,7 +14272,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
-@@ -9151,17 +10825,17 @@
+@@ -9151,17 +10830,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14221,7 +14296,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9181,7 +10855,7 @@
+@@ -9181,7 +10860,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14230,7 +14305,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
-@@ -9213,11 +10887,11 @@
+@@ -9213,11 +10892,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14246,7 +14321,7 @@
fi
else
-@@ -9232,21 +10906,21 @@
+@@ -9232,21 +10911,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14275,7 +14350,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9276,68 +10950,25 @@
+@@ -9276,68 +10955,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14359,7 +14434,7 @@
## CAVEAT EMPTOR:
-@@ -9351,8 +10982,8 @@
+@@ -9351,8 +10987,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14370,7 +14445,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9366,26 +10997,28 @@
+@@ -9366,26 +11002,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 \
@@ -14379,12 +14454,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9372: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11003: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11008: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9376: \$? = $ac_status" >&5
-+ echo "$as_me:11007: \$? = $ac_status" >&5
++ echo "$as_me:11012: \$? = $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
@@ -14406,7 +14481,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"
-@@ -9399,8 +11032,8 @@
+@@ -9399,8 +11037,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14417,7 +14492,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9438,6 +11071,11 @@
+@@ -9438,6 +11076,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14429,7 +14504,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9454,7 +11092,7 @@
+@@ -9454,7 +11097,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14438,7 +14513,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9480,6 +11118,16 @@
+@@ -9480,6 +11123,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14455,7 +14530,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9491,7 +11139,7 @@
+@@ -9491,7 +11144,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.
@@ -14464,7 +14539,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9514,13 +11162,20 @@
+@@ -9514,13 +11167,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14487,7 +14562,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9535,15 +11190,15 @@
+@@ -9535,15 +11195,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14509,7 +14584,7 @@
;;
sunos4*)
-@@ -9552,7 +11207,7 @@
+@@ -9552,7 +11212,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14518,7 +14593,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9565,6 +11220,17 @@
+@@ -9565,6 +11225,17 @@
fi
;;
@@ -14536,7 +14611,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9576,16 +11242,16 @@
+@@ -9576,16 +11247,16 @@
esac
fi
@@ -14557,7 +14632,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9599,26 +11265,28 @@
+@@ -9599,26 +11270,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 \
@@ -14566,12 +14641,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9605: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11271: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9609: \$? = $ac_status" >&5
-+ echo "$as_me:11275: \$? = $ac_status" >&5
++ echo "$as_me:11280: \$? = $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
@@ -14593,7 +14668,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9631,7 +11299,7 @@
+@@ -9631,7 +11304,7 @@
fi
fi
@@ -14602,7 +14677,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9641,8 +11309,50 @@
+@@ -9641,8 +11314,50 @@
;;
esac
@@ -14655,7 +14730,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9653,60 +11363,58 @@
+@@ -9653,60 +11368,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14677,12 +14752,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9672: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11375: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11380: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9676: \$? = $ac_status" >&5
-+ echo "$as_me:11379: \$? = $ac_status" >&5
++ echo "$as_me:11384: \$? = $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
@@ -14734,7 +14809,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;}
-@@ -9716,8 +11424,8 @@
+@@ -9716,8 +11429,8 @@
need_locks=no
fi
@@ -14745,7 +14820,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9755,6 +11463,16 @@
+@@ -9755,6 +11468,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14762,7 +14837,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9765,6 +11483,10 @@
+@@ -9765,6 +11488,10 @@
with_gnu_ld=no
fi
;;
@@ -14773,7 +14848,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9775,6 +11497,27 @@
+@@ -9775,6 +11502,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14801,7 +14876,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9812,7 +11555,7 @@
+@@ -9812,7 +11560,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14810,7 +14885,7 @@
else
ld_shlibs=no
fi
-@@ -9822,13 +11565,13 @@
+@@ -9822,13 +11570,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'
@@ -14827,7 +14902,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
-@@ -9837,23 +11580,70 @@
+@@ -9837,23 +11585,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14903,7 +14978,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9867,13 +11657,40 @@
+@@ -9867,13 +11662,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14946,7 +15021,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9883,24 +11700,19 @@
+@@ -9883,24 +11705,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14978,7 +15053,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9912,7 +11724,7 @@
+@@ -9912,7 +11729,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14987,7 +15062,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9934,9 +11746,21 @@
+@@ -9934,9 +11751,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
@@ -15011,7 +15086,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9953,7 +11777,7 @@
+@@ -9953,7 +11782,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15020,7 +15095,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`
-@@ -9972,8 +11796,12 @@
+@@ -9972,8 +11801,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15033,7 +15108,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9981,22 +11809,23 @@
+@@ -9981,22 +11814,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15064,7 +15139,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10012,24 +11841,36 @@
+@@ -10012,24 +11846,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15109,14 +15184,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10043,19 +11884,20 @@
+@@ -10043,19 +11889,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
@@ -15134,7 +15210,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10074,24 +11916,36 @@
+@@ -10074,24 +11921,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15179,17 +15255,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10105,7 +11959,9 @@
+@@ -10105,8 +11964,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
-@@ -10115,13 +11971,11 @@
+
+@@ -10115,13 +11976,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15206,7 +15284,7 @@
fi
fi
;;
-@@ -10134,7 +11988,7 @@
+@@ -10134,7 +11993,7 @@
ld_shlibs=no
;;
@@ -15215,7 +15293,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10144,13 +11998,13 @@
+@@ -10144,13 +12003,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15232,7 +15310,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.
-@@ -10160,52 +12014,52 @@
+@@ -10160,52 +12019,52 @@
;;
darwin* | rhapsody*)
@@ -15325,7 +15403,7 @@
fi
;;
-@@ -10239,8 +12093,8 @@
+@@ -10239,8 +12098,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15336,7 +15414,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10248,7 +12102,7 @@
+@@ -10248,7 +12107,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15345,7 +15423,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
-@@ -10262,47 +12116,62 @@
+@@ -10262,47 +12121,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15432,7 +15510,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10316,7 +12185,7 @@
+@@ -10316,7 +12190,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15441,7 +15519,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'
-@@ -10326,7 +12195,7 @@
+@@ -10326,7 +12200,7 @@
link_all_deplibs=yes
;;
@@ -15450,7 +15528,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10349,7 +12218,8 @@
+@@ -10349,7 +12223,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
@@ -15460,7 +15538,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10359,7 +12229,7 @@
+@@ -10359,7 +12234,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15469,7 +15547,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10370,14 +12240,14 @@
+@@ -10370,14 +12245,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15486,7 +15564,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'
-@@ -10389,13 +12259,13 @@
+@@ -10389,13 +12264,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15502,7 +15580,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10403,21 +12273,15 @@
+@@ -10403,21 +12278,15 @@
hardcode_libdir_separator=:
;;
@@ -15528,7 +15606,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'
-@@ -10426,8 +12290,18 @@
+@@ -10426,8 +12295,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15549,7 +15627,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10436,7 +12310,7 @@
+@@ -10436,7 +12315,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.
@@ -15558,7 +15636,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10484,36 +12358,45 @@
+@@ -10484,36 +12363,45 @@
fi
;;
@@ -15625,7 +15703,7 @@
;;
uts4*)
-@@ -10528,15 +12411,10 @@
+@@ -10528,15 +12416,10 @@
esac
fi
@@ -15643,7 +15721,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10554,8 +12432,8 @@
+@@ -10554,8 +12437,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.
@@ -15654,7 +15732,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10569,6 +12447,7 @@
+@@ -10569,6 +12452,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15662,7 +15740,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10591,20 +12470,20 @@
+@@ -10591,20 +12475,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15688,7 +15766,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10614,7 +12493,20 @@
+@@ -10614,7 +12498,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15710,7 +15788,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10679,7 +12571,7 @@
+@@ -10679,7 +12576,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15719,7 +15797,7 @@
;;
beos*)
-@@ -10688,7 +12580,7 @@
+@@ -10688,7 +12585,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15728,7 +15806,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10704,7 +12596,7 @@
+@@ -10704,7 +12601,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15737,7 +15815,7 @@
need_version=no
need_lib_prefix=no
-@@ -10716,7 +12608,8 @@
+@@ -10716,7 +12613,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15747,7 +15825,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10746,7 +12639,7 @@
+@@ -10746,7 +12644,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15756,7 +15834,7 @@
;;
esac
;;
-@@ -10769,7 +12662,7 @@
+@@ -10769,7 +12667,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15765,7 +15843,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"`
-@@ -10792,20 +12685,17 @@
+@@ -10792,20 +12690,17 @@
dynamic_linker=no
;;
@@ -15797,7 +15875,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10823,14 +12713,19 @@
+@@ -10823,14 +12718,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15819,7 +15897,7 @@
esac
;;
-@@ -10850,9 +12745,9 @@
+@@ -10850,9 +12750,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15831,7 +15909,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10867,7 +12762,7 @@
+@@ -10867,7 +12767,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15840,7 +15918,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10878,7 +12773,7 @@
+@@ -10878,7 +12778,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15849,7 +15927,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10890,11 +12785,23 @@
+@@ -10890,13 +12790,25 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15858,6 +15936,8 @@
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
@@ -15875,10 +15955,12 @@
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
++ version_type=linux
++ else
version_type=irix
-@@ -10933,29 +12840,26 @@
+ fi ;;
+ esac
+@@ -10933,29 +12845,26 @@
;;
# This must be Linux ELF.
@@ -15915,7 +15997,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,
-@@ -10965,6 +12869,18 @@
+@@ -10965,6 +12874,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15934,7 +16016,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10974,7 +12890,7 @@
+@@ -10974,7 +12895,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15943,7 +16025,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11002,8 +12918,13 @@
+@@ -11002,8 +12923,13 @@
openbsd*)
version_type=sunos
@@ -15958,7 +16040,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
-@@ -11023,7 +12944,7 @@
+@@ -11023,7 +12949,7 @@
os2*)
libname_spec='$name'
@@ -15967,7 +16049,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11041,13 +12962,6 @@
+@@ -11041,13 +12967,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15981,7 +16063,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11073,7 +12987,7 @@
+@@ -11073,7 +12992,7 @@
need_version=yes
;;
@@ -15990,7 +16072,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'
-@@ -11106,6 +13020,29 @@
+@@ -11106,6 +13025,29 @@
fi
;;
@@ -16020,7 +16102,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11117,16 +13054,21 @@
+@@ -11117,16 +13059,21 @@
dynamic_linker=no
;;
esac
@@ -16048,7 +16130,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11146,8 +13088,8 @@
+@@ -11146,8 +13093,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16059,7 +16141,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11160,29 +13102,29 @@
+@@ -11160,29 +13107,29 @@
striplib=
old_striplib=
@@ -16099,7 +16181,7 @@
;;
esac
fi
-@@ -11214,8 +13156,8 @@
+@@ -11214,8 +13161,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16110,7 +16192,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11228,40 +13170,52 @@
+@@ -11228,40 +13175,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16175,15 +16257,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11270,14 +13224,15 @@
+@@ -11270,14 +13229,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
@@ -16194,7 +16277,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11291,8 +13246,8 @@
+@@ -11291,8 +13251,8 @@
;;
*)
@@ -16205,7 +16288,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11319,53 +13274,59 @@
+@@ -11319,53 +13279,59 @@
#undef shl_load
@@ -16284,15 +16367,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11374,18 +13335,19 @@
+@@ -11374,18 +13340,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
@@ -16309,7 +16393,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11398,40 +13360,52 @@
+@@ -11398,40 +13365,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16374,15 +16458,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11440,19 +13414,20 @@
+@@ -11440,19 +13419,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
@@ -16400,7 +16485,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11479,53 +13454,59 @@
+@@ -11479,53 +13459,59 @@
#undef dlopen
@@ -16479,15 +16564,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11534,18 +13515,19 @@
+@@ -11534,18 +13520,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
@@ -16504,7 +16590,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11558,40 +13540,52 @@
+@@ -11558,40 +13545,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16569,15 +16655,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11600,19 +13594,20 @@
+@@ -11600,19 +13599,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
@@ -16595,7 +16682,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11625,40 +13620,52 @@
+@@ -11625,40 +13625,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16660,15 +16747,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11667,19 +13674,20 @@
+@@ -11667,19 +13679,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
@@ -16686,7 +16774,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11692,40 +13700,52 @@
+@@ -11692,40 +13705,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16751,15 +16839,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11734,14 +13754,15 @@
+@@ -11734,14 +13759,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
@@ -16770,7 +16859,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11776,13 +13797,13 @@
+@@ -11776,13 +13802,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16787,16 +16876,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11792,7 +13813,7 @@
+@@ -11792,7 +13818,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11795 "configure"
-+#line 13816 "configure"
++#line 13821 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11849,6 +13870,8 @@
+@@ -11849,6 +13875,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16805,7 +16894,7 @@
exit (status);
}
-@@ -11858,12 +13881,12 @@
+@@ -11858,12 +13886,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16820,7 +16909,7 @@
esac
else :
# compilation failed
-@@ -11874,13 +13897,13 @@
+@@ -11874,13 +13902,13 @@
fi
@@ -16839,16 +16928,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11890,7 +13913,7 @@
+@@ -11890,7 +13918,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11893 "configure"
-+#line 13916 "configure"
++#line 13921 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11947,6 +13970,8 @@
+@@ -11947,6 +13975,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16857,7 +16946,7 @@
exit (status);
}
-@@ -11956,12 +13981,12 @@
+@@ -11956,12 +13986,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16872,7 +16961,7 @@
esac
else :
# compilation failed
-@@ -11972,8 +13997,8 @@
+@@ -11972,8 +14002,8 @@
fi
@@ -16883,7 +16972,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11994,19 +14019,19 @@
+@@ -11994,19 +14024,19 @@
fi
@@ -16911,7 +17000,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12015,58 +14040,21 @@
+@@ -12015,58 +14045,21 @@
fi
;;
@@ -16977,7 +17066,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12081,7 +14069,8 @@
+@@ -12081,7 +14074,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.
@@ -16987,7 +17076,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 \
-@@ -12195,11 +14184,11 @@
+@@ -12195,11 +14189,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17001,7 +17090,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12229,6 +14218,12 @@
+@@ -12229,6 +14223,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17014,7 +17103,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12240,6 +14235,9 @@
+@@ -12240,6 +14240,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17024,7 +17113,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12259,7 +14257,7 @@
+@@ -12259,7 +14262,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17033,7 +17122,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12290,7 +14288,7 @@
+@@ -12290,7 +14293,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17042,7 +17131,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12305,7 +14303,7 @@
+@@ -12305,7 +14308,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17051,7 +17140,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12532,7 +14530,10 @@
+@@ -12532,7 +14535,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.
@@ -17063,7 +17152,7 @@
fi
-@@ -12545,11 +14546,11 @@
+@@ -12545,11 +14551,11 @@
CC="$lt_save_CC"
@@ -17079,7 +17168,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12567,6 +14568,9 @@
+@@ -12567,6 +14573,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17089,7 +17178,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12597,8 +14601,10 @@
+@@ -12597,8 +14606,10 @@
case $tagname in
CXX)
@@ -17102,7 +17191,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12617,6 +14623,7 @@
+@@ -12617,6 +14628,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17110,7 +17199,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12634,7 +14641,7 @@
+@@ -12634,7 +14646,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17119,7 +17208,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12644,17 +14651,34 @@
+@@ -12644,17 +14656,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17155,7 +17244,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12665,18 +14689,27 @@
+@@ -12665,18 +14694,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17186,7 +17275,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12690,18 +14723,18 @@
+@@ -12690,18 +14728,18 @@
# Set up default GNU C++ configuration
@@ -17211,7 +17300,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12730,11 +14763,11 @@
+@@ -12730,11 +14768,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17227,7 +17316,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12747,7 +14780,7 @@
+@@ -12747,7 +14785,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,
@@ -17236,7 +17325,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'*)
-@@ -12767,21 +14800,21 @@
+@@ -12767,21 +14805,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17265,7 +17354,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12791,8 +14824,8 @@
+@@ -12791,8 +14829,8 @@
;;
esac
fi
@@ -17276,7 +17365,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12800,8 +14833,8 @@
+@@ -12800,8 +14838,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
@@ -17287,7 +17376,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12827,7 +14860,7 @@
+@@ -12827,7 +14865,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.
@@ -17296,7 +17385,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12842,8 +14875,8 @@
+@@ -12842,8 +14880,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17307,7 +17396,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12858,8 +14891,23 @@
+@@ -12858,8 +14896,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17333,7 +17422,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12876,7 +14924,7 @@
+@@ -12876,7 +14929,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17342,7 +17431,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`
-@@ -12895,8 +14943,12 @@
+@@ -12895,8 +14948,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17355,7 +17444,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12905,15 +14957,16 @@
+@@ -12905,15 +14962,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17376,7 +17465,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.
-@@ -12935,24 +14988,36 @@
+@@ -12935,24 +14993,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17421,14 +17510,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12966,20 +15031,21 @@
+@@ -12966,20 +15036,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
@@ -17446,7 +17536,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12998,24 +15064,36 @@
+@@ -12998,24 +15069,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17491,17 +17581,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13029,7 +15107,9 @@
+@@ -13029,8 +15112,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
-@@ -13039,16 +15119,26 @@
+
+@@ -13039,16 +15124,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17533,7 +17625,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13062,12 +15152,12 @@
+@@ -13062,12 +15157,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'
@@ -17548,7 +17640,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
-@@ -13076,70 +15166,81 @@
+@@ -13076,70 +15171,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17682,7 +17774,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13150,14 +15251,14 @@
+@@ -13150,14 +15256,14 @@
;;
esac
;;
@@ -17699,7 +17791,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13174,12 +15275,12 @@
+@@ -13174,12 +15280,12 @@
# location of the library.
case $cc_basename in
@@ -17715,7 +17807,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13188,11 +15289,11 @@
+@@ -13188,11 +15294,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.
@@ -17729,7 +17821,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13202,33 +15303,22 @@
+@@ -13202,33 +15308,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17770,7 +17862,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13239,17 +15329,20 @@
+@@ -13239,17 +15334,20 @@
esac
case $cc_basename in
@@ -17797,7 +17889,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13265,12 +15358,15 @@
+@@ -13265,12 +15363,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17817,7 +17909,7 @@
;;
esac
fi
-@@ -13281,11 +15377,25 @@
+@@ -13281,11 +15382,25 @@
;;
esac
;;
@@ -17845,7 +17937,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13296,9 +15406,9 @@
+@@ -13296,9 +15411,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17857,7 +17949,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13307,16 +15417,16 @@
+@@ -13307,16 +15422,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17878,7 +17970,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13334,20 +15444,44 @@
+@@ -13334,20 +15449,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17911,6 +18003,9 @@
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- # Compaq C++
+- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ pgCC*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -17921,15 +18016,13 @@
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
- # Compaq C++
-- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ # Compaq C++
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13375,7 +15509,7 @@
+@@ -13375,7 +15514,7 @@
;;
mvs*)
case $cc_basename in
@@ -17938,7 +18031,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13385,7 +15519,7 @@
+@@ -13385,7 +15524,7 @@
;;
esac
;;
@@ -17947,7 +18040,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=
-@@ -13396,15 +15530,31 @@
+@@ -13396,15 +15535,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::"'
;;
@@ -17981,7 +18074,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13414,14 +15564,14 @@
+@@ -13414,14 +15569,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17999,7 +18092,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13439,7 +15589,7 @@
+@@ -13439,7 +15594,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18008,7 +18101,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,13 +15608,13 @@
+@@ -13458,13 +15613,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18024,7 +18117,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13473,17 +15623,17 @@
+@@ -13473,17 +15628,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18046,7 +18139,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13502,7 +15652,7 @@
+@@ -13502,7 +15657,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18055,7 +18148,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13523,27 +15673,14 @@
+@@ -13523,27 +15678,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18085,7 +18178,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13556,36 +15693,33 @@
+@@ -13556,36 +15698,33 @@
;;
solaris*)
case $cc_basename in
@@ -18134,7 +18227,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13593,9 +15727,9 @@
+@@ -13593,9 +15732,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18146,7 +18239,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13605,9 +15739,9 @@
+@@ -13605,9 +15744,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
@@ -18158,7 +18251,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13616,9 +15750,9 @@
+@@ -13616,9 +15755,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18170,7 +18263,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13631,12 +15765,63 @@
+@@ -13631,12 +15770,63 @@
;;
esac
;;
@@ -18236,7 +18329,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13656,8 +15841,8 @@
+@@ -13656,8 +15846,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18247,7 +18340,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13693,7 +15878,7 @@
+@@ -13693,7 +15883,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.
@@ -18256,7 +18349,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13733,7 +15918,7 @@
+@@ -13733,7 +15923,7 @@
fi
;;
@@ -18265,7 +18358,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13769,6 +15954,29 @@
+@@ -13769,6 +15959,29 @@
$rm -f confest.$objext
@@ -18295,7 +18388,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13777,8 +15985,8 @@
+@@ -13777,8 +15990,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18306,7 +18399,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13816,6 +16024,10 @@
+@@ -13816,6 +16029,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18317,7 +18410,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13824,7 +16036,7 @@
+@@ -13824,7 +16041,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18326,7 +18419,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13849,18 +16061,28 @@
+@@ -13849,18 +16066,28 @@
;;
chorus*)
case $cc_basename in
@@ -18358,7 +18451,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13868,22 +16090,22 @@
+@@ -13868,22 +16095,22 @@
;;
esac
;;
@@ -18387,7 +18480,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13896,9 +16118,13 @@
+@@ -13896,9 +16123,13 @@
;;
esac
;;
@@ -18402,7 +18495,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13907,20 +16133,26 @@
+@@ -13907,20 +16138,26 @@
;;
esac
;;
@@ -18433,7 +18526,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13937,25 +16169,25 @@
+@@ -13937,25 +16174,25 @@
;;
mvs*)
case $cc_basename in
@@ -18464,7 +18557,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13969,24 +16201,15 @@
+@@ -13969,24 +16206,15 @@
;;
psos*)
;;
@@ -18491,7 +18584,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13996,12 +16219,12 @@
+@@ -13996,12 +16224,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18506,7 +18599,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14011,7 +16234,7 @@
+@@ -14011,7 +16239,7 @@
;;
tandem*)
case $cc_basename in
@@ -18515,7 +18608,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14019,7 +16242,14 @@
+@@ -14019,7 +16247,14 @@
;;
esac
;;
@@ -18531,7 +18624,7 @@
;;
vxworks*)
;;
-@@ -14029,16 +16259,16 @@
+@@ -14029,16 +16264,16 @@
esac
fi
@@ -18552,7 +18645,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14052,26 +16282,28 @@
+@@ -14052,26 +16287,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 \
@@ -18561,12 +18654,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14058: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16288: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16293: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14062: \$? = $ac_status" >&5
-+ echo "$as_me:16292: \$? = $ac_status" >&5
++ echo "$as_me:16297: \$? = $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
@@ -18588,7 +18681,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14084,7 +16316,7 @@
+@@ -14084,7 +16321,7 @@
fi
fi
@@ -18597,7 +18690,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14094,8 +16326,50 @@
+@@ -14094,8 +16331,50 @@
;;
esac
@@ -18650,7 +18743,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14106,60 +16380,58 @@
+@@ -14106,60 +16385,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18672,12 +18765,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14125: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16392: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16397: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14129: \$? = $ac_status" >&5
-+ echo "$as_me:16396: \$? = $ac_status" >&5
++ echo "$as_me:16401: \$? = $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
@@ -18729,7 +18822,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;}
-@@ -14169,8 +16441,8 @@
+@@ -14169,8 +16446,8 @@
need_locks=no
fi
@@ -18740,7 +18833,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14187,22 +16459,20 @@
+@@ -14187,22 +16464,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18769,7 +18862,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14220,8 +16490,8 @@
+@@ -14220,8 +16495,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.
@@ -18780,7 +18873,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14235,6 +16505,7 @@
+@@ -14235,6 +16510,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18788,7 +18881,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14257,20 +16528,20 @@
+@@ -14257,20 +16533,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18814,7 +18907,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14280,7 +16551,20 @@
+@@ -14280,7 +16556,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18836,7 +18929,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14345,7 +16629,7 @@
+@@ -14345,7 +16634,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18845,7 +18938,7 @@
;;
beos*)
-@@ -14354,7 +16638,7 @@
+@@ -14354,7 +16643,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18854,7 +18947,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14370,7 +16654,7 @@
+@@ -14370,7 +16659,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18863,7 +18956,7 @@
need_version=no
need_lib_prefix=no
-@@ -14382,7 +16666,8 @@
+@@ -14382,7 +16671,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18873,7 +18966,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14412,7 +16697,7 @@
+@@ -14412,7 +16702,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18882,7 +18975,7 @@
;;
esac
;;
-@@ -14435,7 +16720,7 @@
+@@ -14435,7 +16725,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18891,7 +18984,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"`
-@@ -14458,20 +16743,17 @@
+@@ -14458,20 +16748,17 @@
dynamic_linker=no
;;
@@ -18923,7 +19016,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14489,14 +16771,19 @@
+@@ -14489,14 +16776,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18945,7 +19038,7 @@
esac
;;
-@@ -14516,9 +16803,9 @@
+@@ -14516,9 +16808,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18957,7 +19050,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14533,7 +16820,7 @@
+@@ -14533,7 +16825,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18966,7 +19059,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14544,7 +16831,7 @@
+@@ -14544,7 +16836,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18975,7 +19068,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14556,6 +16843,18 @@
+@@ -14556,6 +16848,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18994,7 +19087,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14599,29 +16898,26 @@
+@@ -14599,29 +16903,26 @@
;;
# This must be Linux ELF.
@@ -19031,7 +19124,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,
-@@ -14631,6 +16927,18 @@
+@@ -14631,6 +16932,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19050,7 +19143,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14640,7 +16948,7 @@
+@@ -14640,7 +16953,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19059,7 +19152,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14668,8 +16976,13 @@
+@@ -14668,8 +16981,13 @@
openbsd*)
version_type=sunos
@@ -19074,7 +19167,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
-@@ -14689,7 +17002,7 @@
+@@ -14689,7 +17007,7 @@
os2*)
libname_spec='$name'
@@ -19083,7 +19176,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14707,13 +17020,6 @@
+@@ -14707,13 +17025,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19097,7 +19190,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14739,7 +17045,7 @@
+@@ -14739,7 +17050,7 @@
need_version=yes
;;
@@ -19106,7 +19199,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'
-@@ -14772,6 +17078,29 @@
+@@ -14772,6 +17083,29 @@
fi
;;
@@ -19136,7 +19229,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14783,16 +17112,21 @@
+@@ -14783,16 +17117,21 @@
dynamic_linker=no
;;
esac
@@ -19164,7 +19257,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14812,8 +17146,8 @@
+@@ -14812,8 +17151,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19175,7 +19268,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14824,1235 +17158,413 @@
+@@ -14824,1242 +17163,420 @@
enable_fast_install=needless
fi
@@ -19589,29 +19682,31 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-
--#undef dlopen
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+-#undef dlopen
++# A C compiler.
++LTCC=$lt_LTCC
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19631,8 +19726,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# A C compiler.
-+LTCC=$lt_LTCC
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
-int
-main ()
@@ -19668,8 +19763,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A language-specific compiler.
++CC=$lt_compiler_CXX
-ac_cv_func_dlopen=no
-fi
@@ -19694,8 +19789,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19738,8 +19833,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-ac_cv_lib_dl_dlopen=no
-fi
@@ -19765,8 +19860,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19809,8 +19904,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
-ac_cv_lib_svld_dlopen=no
-fi
@@ -19836,8 +19931,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# A BSD-compatible nm program.
++NM=$lt_NM
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19880,8 +19975,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# A symbol stripping program
++STRIP=$lt_STRIP
-ac_cv_lib_dld_dld_link=no
-fi
@@ -19894,21 +19989,16 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
--fi
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+-fi
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
--fi
--
+# Used on cygwin: assembler.
+AS="$AS"
@@ -19931,36 +20021,43 @@
+# Old archive suffix (normally "a").
+libext="$libext"
-- ;;
-- esac
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+-fi
++# Executable file suffix (normally "").
++exeext="$exeext"
+
+- ;;
+- esac
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -19975,18 +20072,18 @@
- cat > conftest.$ac_ext <<EOF
-#line 15461 "configure"
-#include "confdefs.h"
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Do we need a version for libraries?
++need_version=$need_version
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
-#include <stdio.h>
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -19997,8 +20094,8 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -20021,22 +20118,22 @@
-# endif
-# endif
-#endif
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
- if (self)
- {
@@ -20044,8 +20141,8 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
- exit (status);
-}
@@ -20068,17 +20165,17 @@
- fi
-fi
-rm -fr conftest*
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Library versioning type.
++version_type=$version_type
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
@@ -20095,19 +20192,22 @@
- cat > conftest.$ac_ext <<EOF
-#line 15559 "configure"
-#include "confdefs.h"
-+# Library versioning type.
-+version_type=$version_type
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
-#include <stdio.h>
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -20118,8 +20218,8 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -20142,25 +20242,26 @@
-# endif
-# endif
-#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
- if (self)
- {
@@ -20168,11 +20269,9 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
- exit (status);
-}
@@ -20195,22 +20294,19 @@
- fi
-fi
-rm -fr conftest*
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
- fi
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
+-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
@@ -20227,14 +20323,14 @@
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_predeps_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
@@ -20291,9 +20387,9 @@
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- case $var in
- old_archive_cmds_CXX | \
@@ -20316,192 +20412,198 @@
- ;;
- esac
- done
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-
--cfgfile="$ofile"
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
-- cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-cfgfile="$ofile"
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+
-# The host system.
-host_alias=$host_alias
-host=$host
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
-# A C compiler.
-LTCC=$lt_LTCC
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct_CXX
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--# A symbol stripping program
--STRIP=$STRIP
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_CXX
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# A symbol stripping program
+-STRIP=$STRIP
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--# Used on cygwin: assembler.
--AS="$AS"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Used on cygwin: assembler.
+-AS="$AS"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path_CXX"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
+
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
-# Object file suffix (normally "o").
-objext="$ac_objext"
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
-# Old archive suffix (normally "a").
-libext="$libext"
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# ### END LIBTOOL TAG CONFIG: $tagname
-# Executable file suffix (normally "").
-exeext="$exeext"
-+# ### END LIBTOOL TAG CONFIG: $tagname
++__EOF__
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-+__EOF__
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
++else
++ # If there is no Makefile yet, we rely on a make rule to execute
++ # `config.status --recheck' to rerun these tests and create the
++ # libtool script then.
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
++fi
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
--
+
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
@@ -20706,19 +20808,22 @@
- # libtool script then.
- test -f Makefile && make "$ltmain"
-fi
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
+-
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- ac_ext=c
-@@ -16123,29 +17635,55 @@
+ CC=$lt_save_CC
+ LDCXX=$LD
+@@ -16123,29 +17640,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20758,19 +20863,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
@@ -20782,7 +20887,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16153,21 +17691,21 @@
+@@ -16153,21 +17696,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20814,7 +20919,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16176,8 +17714,8 @@
+@@ -16176,8 +17719,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20825,7 +20930,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16215,6 +17753,11 @@
+@@ -16215,6 +17758,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20837,7 +20942,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16231,7 +17774,7 @@
+@@ -16231,7 +17779,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20846,7 +20951,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16257,6 +17800,16 @@
+@@ -16257,6 +17805,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20863,7 +20968,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16268,7 +17821,7 @@
+@@ -16268,7 +17826,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.
@@ -20872,7 +20977,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16291,13 +17844,20 @@
+@@ -16291,13 +17849,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20895,7 +21000,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16312,15 +17872,15 @@
+@@ -16312,15 +17877,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20917,7 +21022,7 @@
;;
sunos4*)
-@@ -16329,7 +17889,7 @@
+@@ -16329,7 +17894,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20926,7 +21031,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16342,6 +17902,17 @@
+@@ -16342,6 +17907,17 @@
fi
;;
@@ -20944,7 +21049,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16353,16 +17924,16 @@
+@@ -16353,16 +17929,16 @@
esac
fi
@@ -20965,7 +21070,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16376,26 +17947,28 @@
+@@ -16376,26 +17952,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 \
@@ -20974,12 +21079,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17953: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17958: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16386: \$? = $ac_status" >&5
-+ echo "$as_me:17957: \$? = $ac_status" >&5
++ echo "$as_me:17962: \$? = $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
@@ -21001,7 +21106,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16408,7 +17981,7 @@
+@@ -16408,7 +17986,7 @@
fi
fi
@@ -21010,7 +21115,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16418,72 +17991,112 @@
+@@ -16418,24 +17996,59 @@
;;
esac
@@ -21039,14 +21144,6 @@
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
--
-- lt_compiler_flag="-o out/conftest2.$ac_objext"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -21091,23 +21188,24 @@
+ cd conftest
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -16443,47 +18056,52 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16449: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18057: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18062: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16453: \$? = $ac_status" >&5
-+ echo "$as_me:18061: \$? = $ac_status" >&5
++ echo "$as_me:18066: \$? = $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
@@ -21159,7 +21257,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;}
-@@ -16493,8 +18106,8 @@
+@@ -16493,8 +18111,8 @@
need_locks=no
fi
@@ -21170,7 +21268,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16532,6 +18145,16 @@
+@@ -16532,6 +18150,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -21187,7 +21285,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16542,6 +18165,10 @@
+@@ -16542,6 +18170,10 @@
with_gnu_ld=no
fi
;;
@@ -21198,7 +21296,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16552,6 +18179,27 @@
+@@ -16552,6 +18184,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -21226,7 +21324,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16589,7 +18237,7 @@
+@@ -16589,7 +18242,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -21235,7 +21333,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16599,13 +18247,13 @@
+@@ -16599,13 +18252,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'
@@ -21252,7 +21350,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
-@@ -16614,23 +18262,70 @@
+@@ -16614,23 +18267,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21329,7 +21427,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16644,13 +18339,40 @@
+@@ -16644,13 +18344,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21372,7 +21470,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16660,24 +18382,19 @@
+@@ -16660,24 +18387,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21404,7 +21502,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16689,7 +18406,7 @@
+@@ -16689,7 +18411,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21413,7 +21511,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16711,9 +18428,21 @@
+@@ -16711,9 +18433,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
@@ -21437,7 +21535,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16730,7 +18459,7 @@
+@@ -16730,7 +18464,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21446,7 +21544,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`
-@@ -16749,8 +18478,12 @@
+@@ -16749,8 +18483,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21459,7 +21557,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16758,45 +18491,58 @@
+@@ -16758,45 +18496,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21533,14 +21631,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16810,19 +18556,20 @@
+@@ -16810,19 +18561,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
@@ -21558,7 +21657,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16831,24 +18578,36 @@
+@@ -16831,24 +18583,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21603,17 +21702,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16862,7 +18621,9 @@
+@@ -16862,8 +18626,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
-@@ -16872,13 +18633,11 @@
+
+@@ -16872,13 +18638,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21630,7 +21731,7 @@
fi
fi
;;
-@@ -16891,7 +18650,7 @@
+@@ -16891,7 +18655,7 @@
ld_shlibs_F77=no
;;
@@ -21639,7 +21740,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16901,68 +18660,68 @@
+@@ -16901,68 +18665,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21752,7 +21853,7 @@
fi
;;
-@@ -16996,8 +18755,8 @@
+@@ -16996,8 +18760,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21763,7 +21864,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17005,7 +18764,7 @@
+@@ -17005,7 +18769,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21772,7 +21873,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
-@@ -17019,47 +18778,62 @@
+@@ -17019,47 +18783,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21859,7 +21960,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17073,7 +18847,7 @@
+@@ -17073,7 +18852,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21868,7 +21969,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'
-@@ -17083,7 +18857,7 @@
+@@ -17083,7 +18862,7 @@
link_all_deplibs_F77=yes
;;
@@ -21877,7 +21978,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
-@@ -17106,7 +18880,8 @@
+@@ -17106,7 +18885,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
@@ -21887,7 +21988,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17116,7 +18891,7 @@
+@@ -17116,7 +18896,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21896,7 +21997,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17127,14 +18902,14 @@
+@@ -17127,14 +18907,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21913,7 +22014,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'
-@@ -17146,13 +18921,13 @@
+@@ -17146,13 +18926,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21929,7 +22030,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17160,21 +18935,15 @@
+@@ -17160,21 +18940,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21955,7 +22056,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'
-@@ -17183,8 +18952,18 @@
+@@ -17183,8 +18957,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21976,7 +22077,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17193,7 +18972,7 @@
+@@ -17193,7 +18977,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.
@@ -21985,7 +22086,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17241,36 +19020,45 @@
+@@ -17241,36 +19025,45 @@
fi
;;
@@ -22052,7 +22153,7 @@
;;
uts4*)
-@@ -17285,15 +19073,10 @@
+@@ -17285,15 +19078,10 @@
esac
fi
@@ -22070,7 +22171,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17311,8 +19094,8 @@
+@@ -17311,8 +19099,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.
@@ -22081,7 +22182,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17326,6 +19109,7 @@
+@@ -17326,6 +19114,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -22089,7 +22190,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17348,20 +19132,20 @@
+@@ -17348,20 +19137,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -22115,7 +22216,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17371,7 +19155,20 @@
+@@ -17371,7 +19160,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22137,7 +22238,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17436,7 +19233,7 @@
+@@ -17436,7 +19238,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22146,7 +22247,7 @@
;;
beos*)
-@@ -17445,7 +19242,7 @@
+@@ -17445,7 +19247,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -22155,7 +22256,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17461,7 +19258,7 @@
+@@ -17461,7 +19263,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -22164,7 +22265,7 @@
need_version=no
need_lib_prefix=no
-@@ -17473,7 +19270,8 @@
+@@ -17473,7 +19275,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -22174,7 +22275,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17503,7 +19301,7 @@
+@@ -17503,7 +19306,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22183,7 +22284,7 @@
;;
esac
;;
-@@ -17526,7 +19324,7 @@
+@@ -17526,7 +19329,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -22192,7 +22293,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"`
-@@ -17549,20 +19347,17 @@
+@@ -17549,20 +19352,17 @@
dynamic_linker=no
;;
@@ -22224,7 +22325,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17580,14 +19375,19 @@
+@@ -17580,14 +19380,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -22246,7 +22347,7 @@
esac
;;
-@@ -17607,9 +19407,9 @@
+@@ -17607,9 +19412,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -22258,7 +22359,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17624,7 +19424,7 @@
+@@ -17624,7 +19429,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -22267,7 +22368,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17635,7 +19435,7 @@
+@@ -17635,7 +19440,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -22276,7 +22377,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17647,6 +19447,18 @@
+@@ -17647,6 +19452,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22295,7 +22396,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17690,29 +19502,26 @@
+@@ -17690,29 +19507,26 @@
;;
# This must be Linux ELF.
@@ -22332,7 +22433,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,
-@@ -17722,6 +19531,18 @@
+@@ -17722,6 +19536,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22351,7 +22452,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17731,7 +19552,7 @@
+@@ -17731,7 +19557,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22360,7 +22461,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17759,8 +19580,13 @@
+@@ -17759,8 +19585,13 @@
openbsd*)
version_type=sunos
@@ -22375,7 +22476,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
-@@ -17780,7 +19606,7 @@
+@@ -17780,7 +19611,7 @@
os2*)
libname_spec='$name'
@@ -22384,7 +22485,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17798,13 +19624,6 @@
+@@ -17798,13 +19629,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22398,7 +22499,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17830,7 +19649,7 @@
+@@ -17830,7 +19654,7 @@
need_version=yes
;;
@@ -22407,23 +22508,17 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17863,27 +19682,55 @@
+@@ -17863,6 +19687,29 @@
fi
;;
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -22440,14 +22535,10 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17874,16 +19721,21 @@
dynamic_linker=no
;;
esac
@@ -22475,7 +22566,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17903,8 +19750,8 @@
+@@ -17903,8 +19755,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22486,7 +22577,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17915,36 +19762,6 @@
+@@ -17915,36 +19767,6 @@
enable_fast_install=needless
fi
@@ -22523,7 +22614,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17959,7 +19776,8 @@
+@@ -17959,7 +19781,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.
@@ -22533,7 +22624,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 \
-@@ -18059,6 +19877,12 @@
+@@ -18059,6 +19882,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22546,7 +22637,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18070,6 +19894,9 @@
+@@ -18070,6 +19899,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22556,7 +22647,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18089,7 +19916,7 @@
+@@ -18089,7 +19921,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22565,7 +22656,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18120,7 +19947,7 @@
+@@ -18120,7 +19952,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22574,7 +22665,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18135,7 +19962,7 @@
+@@ -18135,7 +19967,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22583,7 +22674,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18337,7 +20164,10 @@
+@@ -18337,7 +20169,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.
@@ -22595,7 +22686,7 @@
fi
-@@ -18358,7 +20188,6 @@
+@@ -18358,7 +20193,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22603,7 +22694,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18370,26 +20199,55 @@
+@@ -18370,26 +20204,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22660,7 +22751,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
-@@ -18401,8 +20259,8 @@
+@@ -18401,8 +20264,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22671,7 +22762,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18416,26 +20274,28 @@
+@@ -18416,26 +20279,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 \
@@ -22680,12 +22771,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20280: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20285: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18426: \$? = $ac_status" >&5
-+ echo "$as_me:20284: \$? = $ac_status" >&5
++ echo "$as_me:20289: \$? = $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
@@ -22707,7 +22798,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"
-@@ -18449,8 +20309,8 @@
+@@ -18449,8 +20314,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22718,7 +22809,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18488,6 +20348,11 @@
+@@ -18488,6 +20353,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22730,7 +22821,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18504,7 +20369,7 @@
+@@ -18504,7 +20374,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22739,7 +22830,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18530,6 +20395,16 @@
+@@ -18530,6 +20400,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22756,7 +22847,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18541,7 +20416,7 @@
+@@ -18541,7 +20421,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.
@@ -22765,7 +22856,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18564,13 +20439,20 @@
+@@ -18564,13 +20444,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22788,7 +22879,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18585,15 +20467,15 @@
+@@ -18585,15 +20472,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22810,7 +22901,7 @@
;;
sunos4*)
-@@ -18602,7 +20484,7 @@
+@@ -18602,7 +20489,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22819,7 +22910,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18615,6 +20497,17 @@
+@@ -18615,6 +20502,17 @@
fi
;;
@@ -22837,7 +22928,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18626,16 +20519,16 @@
+@@ -18626,16 +20524,16 @@
esac
fi
@@ -22858,7 +22949,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18649,26 +20542,28 @@
+@@ -18649,26 +20547,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 \
@@ -22867,12 +22958,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20548: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20553: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18659: \$? = $ac_status" >&5
-+ echo "$as_me:20552: \$? = $ac_status" >&5
++ echo "$as_me:20557: \$? = $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
@@ -22894,7 +22985,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18681,7 +20576,7 @@
+@@ -18681,7 +20581,7 @@
fi
fi
@@ -22903,7 +22994,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18691,8 +20586,50 @@
+@@ -18691,8 +20591,50 @@
;;
esac
@@ -22956,7 +23047,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18703,60 +20640,58 @@
+@@ -18703,60 +20645,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22978,12 +23069,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18722: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20652: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20657: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18726: \$? = $ac_status" >&5
-+ echo "$as_me:20656: \$? = $ac_status" >&5
++ echo "$as_me:20661: \$? = $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
@@ -23035,7 +23126,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;}
-@@ -18766,8 +20701,8 @@
+@@ -18766,8 +20706,8 @@
need_locks=no
fi
@@ -23046,7 +23137,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18805,6 +20740,16 @@
+@@ -18805,6 +20745,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -23063,7 +23154,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18815,6 +20760,10 @@
+@@ -18815,6 +20765,10 @@
with_gnu_ld=no
fi
;;
@@ -23074,7 +23165,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18825,6 +20774,27 @@
+@@ -18825,6 +20779,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -23102,7 +23193,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18862,7 +20832,7 @@
+@@ -18862,7 +20837,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -23111,7 +23202,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18872,13 +20842,13 @@
+@@ -18872,13 +20847,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'
@@ -23128,7 +23219,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
-@@ -18887,23 +20857,70 @@
+@@ -18887,23 +20862,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -23205,7 +23296,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18917,13 +20934,40 @@
+@@ -18917,13 +20939,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23248,7 +23339,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18933,24 +20977,19 @@
+@@ -18933,24 +20982,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23280,7 +23371,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18962,7 +21001,7 @@
+@@ -18962,7 +21006,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -23289,7 +23380,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18984,9 +21023,21 @@
+@@ -18984,9 +21028,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
@@ -23313,7 +23404,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19003,7 +21054,7 @@
+@@ -19003,7 +21059,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -23322,7 +23413,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`
-@@ -19022,8 +21073,12 @@
+@@ -19022,8 +21078,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23335,7 +23426,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19031,22 +21086,23 @@
+@@ -19031,22 +21091,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23366,7 +23457,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19062,24 +21118,36 @@
+@@ -19062,24 +21123,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23411,14 +23502,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19093,19 +21161,20 @@
+@@ -19093,19 +21166,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
@@ -23436,7 +23528,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19124,24 +21193,36 @@
+@@ -19124,24 +21198,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23481,17 +23573,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19155,7 +21236,9 @@
+@@ -19155,8 +21241,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
-@@ -19165,13 +21248,11 @@
+
+@@ -19165,13 +21253,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23508,7 +23602,7 @@
fi
fi
;;
-@@ -19184,7 +21265,7 @@
+@@ -19184,7 +21270,7 @@
ld_shlibs_GCJ=no
;;
@@ -23517,7 +23611,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19194,68 +21275,68 @@
+@@ -19194,68 +21280,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23630,7 +23724,7 @@
fi
;;
-@@ -19289,8 +21370,8 @@
+@@ -19289,8 +21375,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23641,7 +23735,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19298,7 +21379,7 @@
+@@ -19298,7 +21384,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23650,7 +23744,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
-@@ -19312,47 +21393,62 @@
+@@ -19312,47 +21398,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23737,7 +23831,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19366,7 +21462,7 @@
+@@ -19366,7 +21467,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23746,7 +23840,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'
-@@ -19376,7 +21472,7 @@
+@@ -19376,7 +21477,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23755,7 +23849,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
-@@ -19399,7 +21495,8 @@
+@@ -19399,7 +21500,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
@@ -23765,7 +23859,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19409,7 +21506,7 @@
+@@ -19409,7 +21511,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23774,7 +23868,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19420,14 +21517,14 @@
+@@ -19420,14 +21522,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23791,7 +23885,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'
-@@ -19439,13 +21536,13 @@
+@@ -19439,13 +21541,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23807,7 +23901,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19453,21 +21550,15 @@
+@@ -19453,21 +21555,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23833,7 +23927,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'
-@@ -19476,8 +21567,18 @@
+@@ -19476,8 +21572,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23854,7 +23948,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19486,7 +21587,7 @@
+@@ -19486,7 +21592,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.
@@ -23863,7 +23957,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19534,1513 +21635,746 @@
+@@ -19534,1513 +21640,746 @@
fi
;;
@@ -23931,8 +24025,8 @@
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
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+- hardcode_shlibpath_var_GCJ=no
- ;;
-
- *)
@@ -25037,6 +25131,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ hardcode_libdir_flag_spec_GCJ='-L$libdir'
++ hardcode_shlibpath_var_GCJ=no
+ ;;
-/* Override any gcc2 internal prototype to avoid an error. */
@@ -26046,7 +26142,7 @@
fi
-@@ -21057,7 +22391,8 @@
+@@ -21057,7 +22396,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.
@@ -26056,7 +26152,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 \
-@@ -21157,6 +22492,12 @@
+@@ -21157,6 +22497,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26069,7 +26165,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21168,6 +22509,9 @@
+@@ -21168,6 +22514,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26079,7 +26175,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21187,7 +22531,7 @@
+@@ -21187,7 +22536,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26088,7 +26184,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21218,7 +22562,7 @@
+@@ -21218,7 +22567,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26097,7 +26193,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21233,7 +22577,7 @@
+@@ -21233,7 +22582,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -26106,7 +26202,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21435,7 +22779,10 @@
+@@ -21435,7 +22784,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.
@@ -26118,7 +26214,7 @@
fi
-@@ -21455,7 +22802,6 @@
+@@ -21455,7 +22807,6 @@
RC)
@@ -26126,7 +26222,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21474,15 +22820,42 @@
+@@ -21474,15 +22825,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -26169,7 +26265,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21498,7 +22871,8 @@
+@@ -21498,7 +22876,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.
@@ -26179,7 +26275,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 \
-@@ -21598,6 +22972,12 @@
+@@ -21598,6 +22977,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26192,7 +26288,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21609,6 +22989,9 @@
+@@ -21609,6 +22994,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26202,7 +26298,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21628,7 +23011,7 @@
+@@ -21628,7 +23016,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26211,7 +26307,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21659,7 +23042,7 @@
+@@ -21659,7 +23047,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26220,7 +26316,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21674,7 +23057,7 @@
+@@ -21674,7 +23062,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -26229,7 +26325,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21876,7 +23259,10 @@
+@@ -21876,7 +23264,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.
@@ -26241,7 +26337,7 @@
fi
-@@ -21923,7 +23309,7 @@
+@@ -21923,7 +23314,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -26250,7 +26346,7 @@
# Prevent multiple expansion
-@@ -21978,8 +23364,8 @@
+@@ -21978,8 +23369,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -26261,7 +26357,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22005,17 +23391,17 @@
+@@ -22005,17 +23396,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -26285,7 +26381,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22030,32 +23416,33 @@
+@@ -22030,32 +23421,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26327,7 +26423,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22064,8 +23451,8 @@
+@@ -22064,8 +23456,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -26338,7 +26434,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22091,11 +23478,11 @@
+@@ -22091,11 +23483,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -26354,7 +26450,7 @@
fi
-@@ -22103,8 +23490,8 @@
+@@ -22103,8 +23495,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -26365,7 +26461,7 @@
XGETTEXT=":"
fi
fi
-@@ -22114,8 +23501,7 @@
+@@ -22114,8 +23506,7 @@
@@ -26375,7 +26471,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22127,8 +23513,8 @@
+@@ -22127,8 +23518,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -26386,7 +26482,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22156,24 +23542,36 @@
+@@ -22156,24 +23547,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26431,15 +26527,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22182,15 +23580,16 @@
+@@ -22182,15 +23585,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
@@ -26451,7 +26548,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22219,15 +23618,14 @@
+@@ -22219,15 +23623,14 @@
@@ -26470,7 +26567,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22239,9 +23637,6 @@
+@@ -22239,9 +23642,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26480,7 +26577,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22267,24 +23662,36 @@
+@@ -22267,24 +23667,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26525,18 +26622,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22293,8 +23700,9 @@
+@@ -22293,9 +23705,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"
-@@ -22308,11 +23716,11 @@
+ ac_ext=c
+@@ -22308,11 +23721,11 @@
fi
@@ -26552,7 +26651,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22333,8 +23741,7 @@
+@@ -22333,8 +23746,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26562,7 +26661,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22372,24 +23779,36 @@
+@@ -22372,24 +23784,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26607,7 +26706,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22399,9 +23818,10 @@
+@@ -22399,10 +23823,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26615,11 +26714,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
-@@ -22415,8 +23835,8 @@
+ ac_ext=c
+@@ -22415,8 +23840,8 @@
fi
@@ -26630,7 +26731,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22440,15 +23860,14 @@
+@@ -22440,15 +23865,14 @@
@@ -26649,7 +26750,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22460,9 +23879,6 @@
+@@ -22460,9 +23884,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26659,7 +26760,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22487,24 +23903,36 @@
+@@ -22487,24 +23908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26704,18 +26805,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22513,8 +23941,9 @@
+@@ -22513,9 +23946,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"
-@@ -22528,11 +23957,11 @@
+ ac_ext=c
+@@ -22528,11 +23962,11 @@
fi
@@ -26731,7 +26834,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22553,8 +23982,7 @@
+@@ -22553,8 +23987,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26741,7 +26844,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22591,24 +24019,36 @@
+@@ -22591,24 +24024,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26786,7 +26889,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22618,9 +24058,10 @@
+@@ -22618,10 +24063,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26794,11 +26897,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
-@@ -22634,8 +24075,8 @@
+ ac_ext=c
+@@ -22634,8 +24080,8 @@
fi
@@ -26809,7 +26914,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22658,8 +24099,8 @@
+@@ -22658,8 +24104,8 @@
@@ -26820,7 +26925,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22676,30 +24117,42 @@
+@@ -22676,30 +24122,42 @@
int
main ()
{
@@ -26872,15 +26977,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22708,20 +24161,21 @@
+@@ -22708,20 +24166,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
@@ -26899,7 +27005,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22738,30 +24192,42 @@
+@@ -22738,30 +24197,42 @@
int
main ()
{
@@ -26951,15 +27057,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22770,21 +24236,22 @@
+@@ -22770,21 +24241,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
@@ -26979,7 +27086,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22797,40 +24264,52 @@
+@@ -22797,40 +24269,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27044,15 +27151,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22839,19 +24318,20 @@
+@@ -22839,19 +24323,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
@@ -27070,7 +27178,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22864,40 +24344,52 @@
+@@ -22864,40 +24349,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27135,15 +27243,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22906,14 +24398,15 @@
+@@ -22906,14 +24403,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
@@ -27154,7 +27263,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22939,13 +24432,13 @@
+@@ -22939,13 +24437,13 @@
fi
@@ -27171,7 +27280,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22974,24 +24467,36 @@
+@@ -22974,24 +24472,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27216,17 +27325,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23003,7 +24508,9 @@
+@@ -23003,8 +24513,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'
-@@ -23014,17 +24521,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23014,17 +24526,17 @@
fi
@@ -27249,7 +27360,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23053,24 +24560,36 @@
+@@ -23053,24 +24565,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27294,17 +27405,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23082,7 +24601,9 @@
+@@ -23082,8 +24606,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
-@@ -23094,8 +24615,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23094,8 +24620,8 @@
fi
@@ -27315,7 +27428,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23108,8 +24629,8 @@
+@@ -23108,8 +24634,8 @@
_ACEOF
@@ -27326,7 +27439,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23122,40 +24643,52 @@
+@@ -23122,40 +24648,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27391,15 +27504,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23164,21 +24697,22 @@
+@@ -23164,21 +24702,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
@@ -27419,7 +27533,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23191,40 +24725,52 @@
+@@ -23191,40 +24730,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27484,15 +27598,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23233,21 +24779,22 @@
+@@ -23233,21 +24784,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
@@ -27512,7 +27627,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23274,53 +24821,59 @@
+@@ -23274,53 +24826,59 @@
#undef inet_ntoa
@@ -27591,15 +27706,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23329,17 +24882,18 @@
+@@ -23329,17 +24887,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
@@ -27615,7 +27731,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23352,40 +24906,52 @@
+@@ -23352,40 +24911,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27680,15 +27796,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23394,21 +24960,22 @@
+@@ -23394,21 +24965,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
@@ -27708,7 +27825,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23435,53 +25002,59 @@
+@@ -23435,53 +25007,59 @@
#undef connect
@@ -27787,15 +27904,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23490,17 +25063,18 @@
+@@ -23490,17 +25068,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
@@ -27811,7 +27929,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23513,40 +25087,52 @@
+@@ -23513,40 +25092,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27876,15 +27994,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23555,22 +25141,23 @@
+@@ -23555,22 +25146,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
@@ -27905,7 +28024,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23597,53 +25184,59 @@
+@@ -23597,53 +25189,59 @@
#undef remove
@@ -27984,15 +28103,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23652,17 +25245,18 @@
+@@ -23652,17 +25250,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
@@ -28008,7 +28128,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23675,40 +25269,52 @@
+@@ -23675,40 +25274,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28073,15 +28193,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23717,14 +25323,15 @@
+@@ -23717,14 +25328,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
@@ -28092,7 +28213,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23732,8 +25339,8 @@
+@@ -23732,8 +25344,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28103,7 +28224,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23760,53 +25367,59 @@
+@@ -23760,53 +25372,59 @@
#undef shmat
@@ -28182,15 +28303,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23815,18 +25428,19 @@
+@@ -23815,18 +25433,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
@@ -28207,7 +28329,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23839,40 +25453,52 @@
+@@ -23839,40 +25458,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28272,15 +28394,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23881,14 +25507,15 @@
+@@ -23881,14 +25512,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
@@ -28291,7 +28414,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23902,18 +25529,19 @@
+@@ -23902,18 +25534,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28319,7 +28442,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23924,24 +25552,36 @@
+@@ -23924,24 +25557,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28364,17 +28487,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23950,15 +25590,16 @@
+@@ -23950,15 +25595,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; }
@@ -28386,7 +28510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23967,8 +25608,13 @@
+@@ -23967,8 +25613,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28402,7 +28526,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23992,9 +25638,10 @@
+@@ -23992,9 +25643,10 @@
ac_header_preproc=no
fi
@@ -28415,7 +28539,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24018,25 +25665,19 @@
+@@ -24018,25 +25670,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;}
@@ -28448,7 +28572,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24054,18 +25695,19 @@
+@@ -24054,18 +25700,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28476,7 +28600,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24076,24 +25718,36 @@
+@@ -24076,24 +25723,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28521,17 +28645,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24102,15 +25756,16 @@
+@@ -24102,15 +25761,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; }
@@ -28543,7 +28668,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24119,8 +25774,13 @@
+@@ -24119,8 +25779,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28559,7 +28684,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24144,9 +25804,10 @@
+@@ -24144,9 +25809,10 @@
ac_header_preproc=no
fi
@@ -28572,7 +28697,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24170,25 +25831,19 @@
+@@ -24170,25 +25836,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;}
@@ -28605,7 +28730,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24202,8 +25857,8 @@
+@@ -24202,8 +25862,8 @@
# darwin requires a poll emulation library
@@ -28616,7 +28741,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24216,40 +25871,52 @@
+@@ -24216,40 +25876,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28681,15 +28806,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24258,14 +25925,15 @@
+@@ -24258,14 +25930,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
@@ -28700,7 +28826,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24276,18 +25944,19 @@
+@@ -24276,18 +25949,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28728,7 +28854,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24298,24 +25967,36 @@
+@@ -24298,24 +25972,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28773,17 +28899,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24324,15 +26005,16 @@
+@@ -24324,15 +26010,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; }
@@ -28795,7 +28922,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24341,8 +26023,13 @@
+@@ -24341,8 +26028,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28811,7 +28938,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24366,9 +26053,10 @@
+@@ -24366,9 +26058,10 @@
ac_header_preproc=no
fi
@@ -28824,7 +28951,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24392,25 +26080,19 @@
+@@ -24392,25 +26085,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;}
@@ -28857,7 +28984,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24425,17 +26107,17 @@
+@@ -24425,17 +26112,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28881,7 +29008,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24446,24 +26128,36 @@
+@@ -24446,24 +26133,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -28926,17 +29053,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24472,15 +26166,16 @@
+@@ -24472,15 +26171,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; }
@@ -28948,7 +29076,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24489,8 +26184,13 @@
+@@ -24489,8 +26189,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -28964,7 +29092,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24514,9 +26214,10 @@
+@@ -24514,9 +26219,10 @@
ac_header_preproc=no
fi
@@ -28977,7 +29105,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24540,25 +26241,18 @@
+@@ -24540,25 +26246,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;}
@@ -29008,7 +29136,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24575,8 +26269,8 @@
+@@ -24575,8 +26274,8 @@
@@ -29019,7 +29147,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24602,31 +26296,43 @@
+@@ -24602,31 +26301,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29073,7 +29201,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24637,25 +26343,25 @@
+@@ -24637,25 +26348,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29083,8 +29211,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
@@ -29105,7 +29234,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24667,9 +26373,6 @@
+@@ -24667,9 +26378,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29115,7 +29244,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24695,24 +26398,36 @@
+@@ -24695,24 +26403,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29160,18 +29289,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24721,8 +26436,9 @@
+@@ -24721,9 +26441,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"
-@@ -24736,11 +26452,11 @@
+ ac_ext=c
+@@ -24736,11 +26457,11 @@
fi
@@ -29187,7 +29318,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24761,8 +26477,7 @@
+@@ -24761,8 +26482,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -29197,7 +29328,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24800,24 +26515,36 @@
+@@ -24800,24 +26520,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29242,7 +29373,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24827,9 +26554,10 @@
+@@ -24827,10 +26559,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29250,11 +29381,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
-@@ -24843,8 +26571,8 @@
+ ac_ext=c
+@@ -24843,8 +26576,8 @@
fi
@@ -29265,7 +29398,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24871,8 +26599,8 @@
+@@ -24871,8 +26604,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -29276,7 +29409,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24885,40 +26613,52 @@
+@@ -24885,40 +26618,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29341,15 +29474,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24927,27 +26667,28 @@
+@@ -24927,27 +26672,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
@@ -29379,7 +29513,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24960,40 +26701,52 @@
+@@ -24960,40 +26706,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29444,15 +29578,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25002,22 +26755,23 @@
+@@ -25002,22 +26760,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
@@ -29473,7 +29608,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25028,36 +26782,49 @@
+@@ -25028,36 +26787,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29533,15 +29668,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25066,20 +26833,21 @@
+@@ -25066,20 +26838,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
@@ -29561,7 +29697,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.
-@@ -25092,10 +26860,11 @@
+@@ -25092,10 +26865,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29574,7 +29710,7 @@
test_array [0] = 0
;
-@@ -25103,24 +26872,36 @@
+@@ -25103,24 +26877,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29619,7 +29755,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25133,10 +26914,11 @@
+@@ -25133,10 +26919,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29632,7 +29768,7 @@
test_array [0] = 0
;
-@@ -25144,24 +26926,36 @@
+@@ -25144,24 +26931,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29677,7 +29813,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25170,30 +26964,32 @@
+@@ -25170,30 +26969,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29694,8 +29830,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
@@ -29718,7 +29855,7 @@
test_array [0] = 0
;
-@@ -25201,24 +26997,36 @@
+@@ -25201,24 +27002,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29763,7 +29900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25231,10 +27039,11 @@
+@@ -25231,10 +27044,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29776,7 +29913,7 @@
test_array [0] = 0
;
-@@ -25242,24 +27051,36 @@
+@@ -25242,24 +27056,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29821,7 +29958,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25268,23 +27089,26 @@
+@@ -25268,24 +27094,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29838,8 +29975,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
@@ -29848,14 +29986,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
-@@ -25296,10 +27120,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25296,10 +27125,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29868,7 +30009,7 @@
test_array [0] = 0
;
-@@ -25307,24 +27132,36 @@
+@@ -25307,24 +27137,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29913,15 +30054,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25333,26 +27170,20 @@
+@@ -25333,26 +27175,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;;
@@ -29945,7 +30087,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25360,8 +27191,9 @@
+@@ -25360,8 +27196,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29957,7 +30099,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25370,35 +27202,44 @@
+@@ -25370,35 +27207,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30015,7 +30157,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25409,28 +27250,27 @@
+@@ -25409,28 +27255,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30052,7 +30194,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25441,36 +27281,49 @@
+@@ -25441,36 +27286,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30112,15 +30254,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25479,20 +27332,21 @@
+@@ -25479,20 +27337,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
@@ -30140,7 +30283,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.
-@@ -25505,10 +27359,11 @@
+@@ -25505,10 +27364,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30153,7 +30296,7 @@
test_array [0] = 0
;
-@@ -25516,24 +27371,36 @@
+@@ -25516,24 +27376,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30198,7 +30341,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25546,10 +27413,11 @@
+@@ -25546,10 +27418,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30211,7 +30354,7 @@
test_array [0] = 0
;
-@@ -25557,24 +27425,36 @@
+@@ -25557,24 +27430,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30256,7 +30399,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25583,30 +27463,32 @@
+@@ -25583,30 +27468,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30273,8 +30416,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
@@ -30297,7 +30441,7 @@
test_array [0] = 0
;
-@@ -25614,24 +27496,36 @@
+@@ -25614,24 +27501,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30342,7 +30486,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25644,10 +27538,11 @@
+@@ -25644,10 +27543,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30355,7 +30499,7 @@
test_array [0] = 0
;
-@@ -25655,24 +27550,36 @@
+@@ -25655,24 +27555,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30400,7 +30544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25681,23 +27588,26 @@
+@@ -25681,24 +27593,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30417,8 +30561,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
@@ -30427,14 +30572,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
-@@ -25709,10 +27619,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25709,10 +27624,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30447,7 +30595,7 @@
test_array [0] = 0
;
-@@ -25720,24 +27631,36 @@
+@@ -25720,24 +27636,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30492,15 +30640,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25746,26 +27669,20 @@
+@@ -25746,26 +27674,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;;
@@ -30524,7 +30673,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25773,8 +27690,9 @@
+@@ -25773,8 +27695,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30536,7 +30685,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25783,35 +27701,44 @@
+@@ -25783,35 +27706,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30594,7 +30743,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25822,28 +27749,27 @@
+@@ -25822,28 +27754,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -30631,7 +30780,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25854,36 +27780,49 @@
+@@ -25854,36 +27785,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30691,15 +30840,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25892,20 +27831,21 @@
+@@ -25892,20 +27836,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
@@ -30719,7 +30869,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.
-@@ -25918,10 +27858,11 @@
+@@ -25918,10 +27863,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30732,7 +30882,7 @@
test_array [0] = 0
;
-@@ -25929,24 +27870,36 @@
+@@ -25929,24 +27875,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30777,7 +30927,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25959,10 +27912,11 @@
+@@ -25959,10 +27917,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30790,7 +30940,7 @@
test_array [0] = 0
;
-@@ -25970,24 +27924,36 @@
+@@ -25970,24 +27929,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30835,7 +30985,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25996,30 +27962,32 @@
+@@ -25996,30 +27967,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30852,8 +31002,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
@@ -30876,7 +31027,7 @@
test_array [0] = 0
;
-@@ -26027,24 +27995,36 @@
+@@ -26027,24 +28000,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30921,7 +31072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26057,10 +28037,11 @@
+@@ -26057,10 +28042,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30934,7 +31085,7 @@
test_array [0] = 0
;
-@@ -26068,24 +28049,36 @@
+@@ -26068,24 +28054,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30979,7 +31130,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26094,23 +28087,26 @@
+@@ -26094,24 +28092,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30996,8 +31147,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
@@ -31006,14 +31158,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
-@@ -26122,10 +28118,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26122,10 +28123,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31026,7 +31181,7 @@
test_array [0] = 0
;
-@@ -26133,24 +28130,36 @@
+@@ -26133,24 +28135,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31071,15 +31226,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26159,26 +28168,20 @@
+@@ -26159,26 +28173,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;;
@@ -31103,7 +31259,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26186,8 +28189,9 @@
+@@ -26186,8 +28194,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31115,7 +31271,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26196,35 +28200,44 @@
+@@ -26196,35 +28205,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31173,7 +31329,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26235,28 +28248,27 @@
+@@ -26235,28 +28253,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31210,7 +31366,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26267,36 +28279,49 @@
+@@ -26267,36 +28284,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31270,15 +31426,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26305,20 +28330,21 @@
+@@ -26305,20 +28335,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
@@ -31298,7 +31455,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.
-@@ -26331,10 +28357,11 @@
+@@ -26331,10 +28362,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31311,7 +31468,7 @@
test_array [0] = 0
;
-@@ -26342,24 +28369,36 @@
+@@ -26342,24 +28374,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31356,7 +31513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26372,10 +28411,11 @@
+@@ -26372,10 +28416,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31369,7 +31526,7 @@
test_array [0] = 0
;
-@@ -26383,24 +28423,36 @@
+@@ -26383,24 +28428,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31414,7 +31571,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26409,30 +28461,32 @@
+@@ -26409,30 +28466,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31431,8 +31588,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
@@ -31455,7 +31613,7 @@
test_array [0] = 0
;
-@@ -26440,24 +28494,36 @@
+@@ -26440,24 +28499,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31500,7 +31658,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26470,10 +28536,11 @@
+@@ -26470,10 +28541,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31513,7 +31671,7 @@
test_array [0] = 0
;
-@@ -26481,24 +28548,36 @@
+@@ -26481,24 +28553,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31558,7 +31716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26507,23 +28586,26 @@
+@@ -26507,24 +28591,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31575,8 +31733,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
@@ -31585,14 +31744,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
-@@ -26535,10 +28617,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26535,10 +28622,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31605,7 +31767,7 @@
test_array [0] = 0
;
-@@ -26546,24 +28629,36 @@
+@@ -26546,24 +28634,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31650,15 +31812,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26572,26 +28667,20 @@
+@@ -26572,26 +28672,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;;
@@ -31682,7 +31845,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26599,8 +28688,9 @@
+@@ -26599,8 +28693,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31694,7 +31857,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26609,35 +28699,44 @@
+@@ -26609,35 +28704,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31752,7 +31915,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26648,30 +28747,29 @@
+@@ -26648,30 +28752,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31791,7 +31954,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26684,40 +28782,52 @@
+@@ -26684,40 +28787,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31856,15 +32019,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26726,14 +28836,15 @@
+@@ -26726,14 +28841,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
@@ -31875,7 +32039,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26742,8 +28853,8 @@
+@@ -26742,8 +28858,8 @@
fi
@@ -31886,7 +32050,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26756,40 +28867,52 @@
+@@ -26756,40 +28872,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -31951,15 +32115,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26798,14 +28921,15 @@
+@@ -26798,14 +28926,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
@@ -31970,7 +32135,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26819,8 +28943,8 @@
+@@ -26819,8 +28948,8 @@
@@ -31981,7 +32146,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26831,36 +28955,49 @@
+@@ -26831,36 +28960,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32041,15 +32206,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26869,20 +29006,21 @@
+@@ -26869,20 +29011,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
@@ -32069,7 +32235,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.
-@@ -26895,10 +29033,11 @@
+@@ -26895,10 +29038,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32082,7 +32248,7 @@
test_array [0] = 0
;
-@@ -26906,24 +29045,36 @@
+@@ -26906,24 +29050,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32127,7 +32293,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26936,10 +29087,11 @@
+@@ -26936,10 +29092,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32140,7 +32306,7 @@
test_array [0] = 0
;
-@@ -26947,24 +29099,36 @@
+@@ -26947,24 +29104,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32185,7 +32351,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26973,30 +29137,32 @@
+@@ -26973,30 +29142,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32202,8 +32368,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
@@ -32226,7 +32393,7 @@
test_array [0] = 0
;
-@@ -27004,24 +29170,36 @@
+@@ -27004,24 +29175,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32271,7 +32438,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27034,10 +29212,11 @@
+@@ -27034,10 +29217,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32284,7 +32451,7 @@
test_array [0] = 0
;
-@@ -27045,24 +29224,36 @@
+@@ -27045,24 +29229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32329,7 +32496,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27071,23 +29262,26 @@
+@@ -27071,24 +29267,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32346,8 +32513,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
@@ -32356,14 +32524,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
-@@ -27099,10 +29293,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27099,10 +29298,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32376,7 +32547,7 @@
test_array [0] = 0
;
-@@ -27110,24 +29305,36 @@
+@@ -27110,24 +29310,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32421,15 +32592,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27136,26 +29343,20 @@
+@@ -27136,26 +29348,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;;
@@ -32453,7 +32625,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27163,8 +29364,9 @@
+@@ -27163,8 +29369,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32465,7 +32637,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27173,35 +29375,44 @@
+@@ -27173,35 +29380,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32523,7 +32695,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27212,29 +29423,28 @@
+@@ -27212,29 +29428,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32561,7 +32733,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27245,36 +29455,49 @@
+@@ -27245,36 +29460,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32621,15 +32793,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27283,20 +29506,21 @@
+@@ -27283,20 +29511,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
@@ -32649,7 +32822,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.
-@@ -27309,10 +29533,11 @@
+@@ -27309,10 +29538,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32662,7 +32835,7 @@
test_array [0] = 0
;
-@@ -27320,24 +29545,36 @@
+@@ -27320,24 +29550,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32707,7 +32880,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27350,10 +29587,11 @@
+@@ -27350,10 +29592,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32720,7 +32893,7 @@
test_array [0] = 0
;
-@@ -27361,24 +29599,36 @@
+@@ -27361,24 +29604,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32765,7 +32938,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27387,30 +29637,32 @@
+@@ -27387,30 +29642,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32782,8 +32955,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
@@ -32806,7 +32980,7 @@
test_array [0] = 0
;
-@@ -27418,24 +29670,36 @@
+@@ -27418,24 +29675,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32851,7 +33025,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27448,10 +29712,11 @@
+@@ -27448,10 +29717,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32864,7 +33038,7 @@
test_array [0] = 0
;
-@@ -27459,24 +29724,36 @@
+@@ -27459,24 +29729,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32909,7 +33083,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27485,23 +29762,26 @@
+@@ -27485,24 +29767,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32926,8 +33100,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
@@ -32936,14 +33111,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
-@@ -27513,10 +29793,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27513,10 +29798,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32956,7 +33134,7 @@
test_array [0] = 0
;
-@@ -27524,24 +29805,36 @@
+@@ -27524,24 +29810,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33001,15 +33179,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27550,26 +29843,20 @@
+@@ -27550,26 +29848,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;;
@@ -33033,7 +33212,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27577,8 +29864,9 @@
+@@ -27577,8 +29869,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33045,7 +33224,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27587,35 +29875,44 @@
+@@ -27587,35 +29880,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33103,7 +33282,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27626,30 +29923,29 @@
+@@ -27626,30 +29928,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -33142,7 +33321,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27670,36 +29966,48 @@
+@@ -27670,36 +29971,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33203,16 +33382,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!
-@@ -27711,18 +30019,18 @@
+@@ -27711,18 +30024,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
@@ -33226,7 +33406,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27752,24 +30060,36 @@
+@@ -27752,24 +30065,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33271,18 +33451,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27778,8 +30098,9 @@
+@@ -27778,9 +30103,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
-@@ -27793,26 +30114,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27793,26 +30119,26 @@
fi
@@ -33319,7 +33501,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27831,18 +30152,19 @@
+@@ -27831,18 +30157,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33347,7 +33529,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27853,24 +30175,36 @@
+@@ -27853,24 +30180,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -33392,17 +33574,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27879,15 +30213,16 @@
+@@ -27879,15 +30218,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; }
@@ -33414,7 +33597,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27896,8 +30231,13 @@
+@@ -27896,8 +30236,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33430,7 +33613,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27921,9 +30261,10 @@
+@@ -27921,9 +30266,10 @@
ac_header_preproc=no
fi
@@ -33443,7 +33626,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27947,25 +30288,19 @@
+@@ -27947,25 +30293,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;}
@@ -33476,7 +33659,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27977,8 +30312,8 @@
+@@ -27977,8 +30317,8 @@
done
@@ -33487,7 +33670,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28005,53 +30340,59 @@
+@@ -28005,53 +30345,59 @@
#undef _NSGetEnviron
@@ -33566,15 +33749,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28060,13 +30401,14 @@
+@@ -28060,13 +30406,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
@@ -33584,7 +33768,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28087,9 +30429,9 @@
+@@ -28087,9 +30434,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33597,7 +33781,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28115,53 +30457,59 @@
+@@ -28115,53 +30462,59 @@
#undef $ac_func
@@ -33676,15 +33860,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28170,13 +30518,15 @@
+@@ -28170,13 +30523,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
@@ -33695,7 +33880,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28193,32 +30543,32 @@
+@@ -28193,32 +30548,32 @@
@@ -33740,7 +33925,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28234,8 +30584,8 @@
+@@ -28234,8 +30589,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33751,7 +33936,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28272,8 +30622,13 @@
+@@ -28272,8 +30627,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -33767,7 +33952,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28340,6 +30695,7 @@
+@@ -28340,6 +30700,7 @@
fi
done
fi
@@ -33775,7 +33960,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28369,24 +30725,36 @@
+@@ -28369,24 +30730,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33820,7 +34005,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28397,7 +30765,7 @@
+@@ -28397,7 +30770,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33829,15 +34014,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}/` \
-@@ -28445,6 +30813,7 @@
+@@ -28445,7 +30818,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
-@@ -28455,21 +30824,26 @@
+
+@@ -28455,21 +30829,26 @@
*-*-solaris*)
;;
*)
@@ -33872,7 +34059,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28477,7 +30851,7 @@
+@@ -28477,7 +30856,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
@@ -33881,7 +34068,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28486,7 +30860,7 @@
+@@ -28486,7 +30865,7 @@
esac
fi
cd ..
@@ -33890,7 +34077,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28530,12 +30904,12 @@
+@@ -28530,12 +30909,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -33907,7 +34094,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28563,8 +30937,8 @@
+@@ -28563,8 +30942,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.
@@ -33918,7 +34105,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28577,40 +30951,52 @@
+@@ -28577,40 +30956,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33983,15 +34170,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28619,14 +31005,15 @@
+@@ -28619,14 +31010,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
@@ -34002,7 +34190,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28635,8 +31022,8 @@
+@@ -28635,8 +31027,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -34013,7 +34201,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28670,24 +31057,36 @@
+@@ -28670,24 +31062,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34058,7 +34246,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28696,9 +31095,10 @@
+@@ -28696,10 +31100,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34066,11 +34254,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
-@@ -28708,8 +31108,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28708,8 +31113,8 @@
fi
@@ -34081,7 +34271,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28855,8 +31255,8 @@
+@@ -28855,8 +31260,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34092,7 +34282,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28867,9 +31267,9 @@
+@@ -28867,9 +31272,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34105,7 +34295,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28881,40 +31281,52 @@
+@@ -28881,40 +31286,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34170,15 +34360,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28923,14 +31335,16 @@
+@@ -28923,14 +31340,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
@@ -34190,7 +34381,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28943,8 +31357,8 @@
+@@ -28943,8 +31362,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -34201,7 +34392,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28957,40 +31371,52 @@
+@@ -28957,40 +31376,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34266,15 +34457,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28999,14 +31425,15 @@
+@@ -28999,14 +31430,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
@@ -34285,7 +34477,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29014,8 +31441,8 @@
+@@ -29014,8 +31446,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -34296,7 +34488,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29034,39 +31461,52 @@
+@@ -29034,40 +31466,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34357,11 +34549,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
-@@ -29082,16 +31522,15 @@
+ fi
+@@ -29082,16 +31527,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -34382,7 +34576,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29118,24 +31557,36 @@
+@@ -29118,24 +31562,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34427,17 +34621,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29144,7 +31595,9 @@
+@@ -29144,8 +31600,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"
-@@ -29158,13 +31611,13 @@
+ ac_ext=c
+@@ -29158,13 +31616,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34455,7 +34651,7 @@
:
fi
-@@ -29176,16 +31629,15 @@
+@@ -29176,16 +31634,15 @@
case $host_os in
solaris*)
@@ -34476,7 +34672,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29212,24 +31664,36 @@
+@@ -29212,24 +31669,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34521,17 +34717,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29238,7 +31702,9 @@
+@@ -29238,8 +31707,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"
-@@ -29252,13 +31718,13 @@
+ ac_ext=c
+@@ -29252,13 +31723,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34549,7 +34747,7 @@
:
fi
-@@ -29285,17 +31751,17 @@
+@@ -29285,17 +31756,17 @@
@@ -34573,7 +34771,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29313,21 +31779,21 @@
+@@ -29313,21 +31784,21 @@
fi
@@ -34603,7 +34801,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29346,14 +31812,14 @@
+@@ -29346,14 +31817,14 @@
@@ -34622,7 +34820,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29387,24 +31853,36 @@
+@@ -29387,24 +31858,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34667,18 +34865,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29413,8 +31891,9 @@
+@@ -29413,9 +31896,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"
-@@ -29428,8 +31907,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29428,8 +31912,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34689,7 +34889,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29449,8 +31928,8 @@
+@@ -29449,8 +31933,8 @@
@@ -34700,7 +34900,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29486,24 +31965,36 @@
+@@ -29486,24 +31970,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34745,7 +34945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29512,9 +32003,10 @@
+@@ -29512,10 +32008,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34753,11 +34953,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"
-@@ -29529,19 +32021,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29529,19 +32026,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -34783,7 +34985,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29574,24 +32066,36 @@
+@@ -29574,24 +32071,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34828,18 +35030,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29600,8 +32104,9 @@
+@@ -29600,9 +32109,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"
-@@ -29612,14 +32117,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29612,14 +32122,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34860,7 +35064,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29652,24 +32157,36 @@
+@@ -29652,24 +32162,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34905,18 +35109,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29678,8 +32195,9 @@
+@@ -29678,9 +32200,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"
-@@ -29690,11 +32208,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29690,11 +32213,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34932,16 +35138,16 @@
LIBJPEG=
-@@ -29714,7 +32232,7 @@
+@@ -29714,7 +32237,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29717: $i/$j" >&5
-+ echo "configure: 32235: $i/$j" >&5
++ echo "configure: 32240: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29761,14 +32279,14 @@
+@@ -29761,14 +32284,14 @@
@@ -34959,7 +35165,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29811,8 +32329,8 @@
+@@ -29811,8 +32334,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34970,7 +35176,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29821,8 +32339,8 @@
+@@ -29821,8 +32344,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34981,7 +35187,7 @@
PERL=$kde_cv_path
fi
-@@ -29836,10 +32354,9 @@
+@@ -29836,10 +32359,9 @@
@@ -34994,7 +35200,7 @@
else
if test $kde_qtver = 3; then
-@@ -29849,7 +32366,8 @@
+@@ -29849,7 +32371,8 @@
fi
@@ -35004,7 +35210,7 @@
USING_QT_MT=""
-@@ -29869,13 +32387,13 @@
+@@ -29869,13 +32392,13 @@
else
kde_check_threading_default=yes
fi
@@ -35022,7 +35228,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29947,8 +32465,8 @@
+@@ -29947,8 +32470,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -35033,7 +35239,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"
-@@ -29957,34 +32475,34 @@
+@@ -29957,34 +32480,34 @@
qt_libraries=""
qt_includes=""
@@ -35080,16 +35286,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30012,7 +32530,7 @@
+@@ -30012,7 +32535,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30015: $i/$j" >&5
-+ echo "configure: 32533: $i/$j" >&5
++ echo "configure: 32538: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30049,8 +32567,7 @@
+@@ -30049,8 +32572,7 @@
ac_qt_libraries="$qt_libdir"
@@ -35099,7 +35305,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30187,13 +32704,13 @@
+@@ -30187,13 +32709,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -35117,7 +35323,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30202,15 +32719,14 @@
+@@ -30202,15 +32724,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -35136,7 +35342,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30331,12 +32847,12 @@
+@@ -30331,12 +32852,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -35153,7 +35359,7 @@
fi
-@@ -30374,14 +32890,14 @@
+@@ -30374,14 +32895,14 @@
fi
@@ -35171,7 +35377,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30424,8 +32940,8 @@
+@@ -30424,8 +32945,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35182,7 +35388,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30446,22 +32962,22 @@
+@@ -30446,22 +32967,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35210,7 +35416,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30504,12 +33020,12 @@
+@@ -30504,12 +33025,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35227,7 +35433,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30539,10 +33055,10 @@
+@@ -30539,10 +33060,10 @@
if test $kde_qtver = 3; then
@@ -35241,7 +35447,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30565,22 +33081,22 @@
+@@ -30565,22 +33086,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35271,7 +35477,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30603,13 +33119,13 @@
+@@ -30603,13 +33124,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35289,7 +35495,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30640,15 +33156,14 @@
+@@ -30640,15 +33161,14 @@
if test -n "$LIBJPEG"; then
@@ -35308,7 +35514,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30681,24 +33196,36 @@
+@@ -30681,24 +33201,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35353,18 +35559,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30707,8 +33234,9 @@
+@@ -30707,9 +33239,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"
-@@ -30725,12 +33253,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30725,12 +33258,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35381,7 +35589,7 @@
LIBJPEG_QT=
fi
-@@ -30761,15 +33289,15 @@
+@@ -30761,15 +33294,15 @@
@@ -35403,7 +35611,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30793,11 +33321,11 @@
+@@ -30793,11 +33326,11 @@
@@ -35419,34 +35627,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30849,7 +33377,7 @@
+@@ -30849,7 +33382,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30852: $i/$j" >&5
-+ echo "configure: 33380: $i/$j" >&5
++ echo "configure: 33385: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30879,7 +33407,7 @@
+@@ -30879,7 +33412,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30882: $i/$j" >&5
-+ echo "configure: 33410: $i/$j" >&5
++ echo "configure: 33415: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30897,7 +33425,7 @@
+@@ -30897,7 +33430,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30900: $i/$j" >&5
-+ echo "configure: 33428: $i/$j" >&5
++ echo "configure: 33433: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30956,12 +33484,12 @@
+@@ -30956,12 +33489,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35463,7 +35671,7 @@
fi
kde_libraries="${libdir}"
-@@ -30970,8 +33498,8 @@
+@@ -30970,8 +33503,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35474,7 +35682,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31009,8 +33537,8 @@
+@@ -31009,8 +33542,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -35485,7 +35693,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31053,8 +33581,8 @@
+@@ -31053,8 +33586,8 @@
fi
@@ -35496,7 +35704,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31086,10 +33614,9 @@
+@@ -31086,10 +33619,9 @@
@@ -35509,7 +35717,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31103,13 +33630,14 @@
+@@ -31103,13 +33635,14 @@
fi
@@ -35527,7 +35735,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31220,15 +33748,14 @@
+@@ -31220,15 +33753,14 @@
else
if test $kde_qtver = 1; then
@@ -35548,7 +35756,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31280,8 +33807,8 @@
+@@ -31280,8 +33812,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35559,7 +35767,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.
-@@ -31320,8 +33847,8 @@
+@@ -31320,8 +33852,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35570,7 +35778,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
-@@ -31329,8 +33856,8 @@
+@@ -31329,8 +33861,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35581,7 +35789,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
-@@ -31523,15 +34050,14 @@
+@@ -31523,15 +34055,14 @@
else
if test $kde_qtver = 1; then
@@ -35602,7 +35810,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31583,8 +34109,8 @@
+@@ -31583,8 +34114,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35613,7 +35821,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.
-@@ -31623,8 +34149,8 @@
+@@ -31623,8 +34154,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35624,7 +35832,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
-@@ -31632,8 +34158,8 @@
+@@ -31632,8 +34163,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35635,7 +35843,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
-@@ -31725,22 +34251,22 @@
+@@ -31725,22 +34256,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35664,7 +35872,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31773,14 +34299,14 @@
+@@ -31773,14 +34304,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35682,7 +35890,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31823,8 +34349,8 @@
+@@ -31823,8 +34354,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35693,7 +35901,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31835,21 +34361,21 @@
+@@ -31835,21 +34366,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35720,7 +35928,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31892,8 +34418,8 @@
+@@ -31892,8 +34423,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35731,7 +35939,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31904,22 +34430,22 @@
+@@ -31904,22 +34435,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35759,7 +35967,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31962,8 +34488,8 @@
+@@ -31962,8 +34493,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35770,7 +35978,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31976,21 +34502,21 @@
+@@ -31976,21 +34507,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35797,7 +36005,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32033,8 +34559,8 @@
+@@ -32033,8 +34564,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35808,7 +36016,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32047,22 +34573,22 @@
+@@ -32047,22 +34578,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35836,7 +36044,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32105,12 +34631,12 @@
+@@ -32105,12 +34636,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35853,7 +36061,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32139,14 +34665,14 @@
+@@ -32139,14 +34670,14 @@
if test -n "$kde32ornewer"; then
@@ -35871,7 +36079,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32189,8 +34715,8 @@
+@@ -32189,8 +34720,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35882,7 +36090,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32201,21 +34727,21 @@
+@@ -32201,21 +34732,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35909,7 +36117,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32258,8 +34784,8 @@
+@@ -32258,8 +34789,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35920,7 +36128,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32270,8 +34796,8 @@
+@@ -32270,8 +34801,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35931,7 +36139,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32279,14 +34805,14 @@
+@@ -32279,14 +34810,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -35949,7 +36157,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32329,8 +34855,8 @@
+@@ -32329,8 +34860,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35960,7 +36168,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32341,8 +34867,8 @@
+@@ -32341,8 +34872,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35971,7 +36179,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32350,14 +34876,14 @@
+@@ -32350,14 +34881,14 @@
fi
@@ -35989,7 +36197,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32400,12 +34926,12 @@
+@@ -32400,12 +34931,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36006,16 +36214,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32420,7 +34946,7 @@
+@@ -32420,7 +34951,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32423: $i/$j" >&5
-+ echo "configure: 34949: $i/$j" >&5
++ echo "configure: 34954: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32580,15 +35106,14 @@
+@@ -32580,15 +35111,14 @@
@@ -36034,7 +36242,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32600,9 +35125,6 @@
+@@ -32600,9 +35130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36044,7 +36252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32625,24 +35147,36 @@
+@@ -32625,24 +35152,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36089,18 +36297,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32651,8 +35185,9 @@
+@@ -32651,9 +35190,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"
-@@ -32666,11 +35201,11 @@
+ ac_ext=c
+@@ -32666,11 +35206,11 @@
fi
@@ -36116,7 +36326,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32691,8 +35226,7 @@
+@@ -32691,8 +35231,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -36126,7 +36336,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32727,24 +35261,36 @@
+@@ -32727,24 +35266,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36171,7 +36381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32754,9 +35300,10 @@
+@@ -32754,10 +35305,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36179,11 +36389,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
-@@ -32770,8 +35317,8 @@
+ ac_ext=c
+@@ -32770,8 +35322,8 @@
fi
@@ -36194,7 +36406,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -32801,8 +35348,7 @@
+@@ -32801,8 +35353,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36204,7 +36416,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32812,17 +35358,17 @@
+@@ -32812,17 +35363,17 @@
if test "${ac_cv_header_atlantik_ui_board_h+set}" = set; then
@@ -36228,7 +36440,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32833,24 +35379,36 @@
+@@ -32833,24 +35384,36 @@
#include <atlantik/ui/board.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36273,17 +36485,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32859,15 +35417,16 @@
+@@ -32859,15 +35422,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; }
@@ -36295,7 +36508,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32876,8 +35435,13 @@
+@@ -32876,8 +35440,13 @@
/* end confdefs.h. */
#include <atlantik/ui/board.h>
_ACEOF
@@ -36311,7 +36524,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -32901,9 +35465,10 @@
+@@ -32901,9 +35470,10 @@
ac_header_preproc=no
fi
@@ -36324,7 +36537,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -32927,25 +35492,18 @@
+@@ -32927,25 +35497,18 @@
echo "$as_me: WARNING: atlantik/ui/board.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: atlantik/ui/board.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: atlantik/ui/board.h: in the future, the compiler will take precedence" >&2;}
@@ -36355,7 +36568,7 @@
fi
if test $ac_cv_header_atlantik_ui_board_h = yes; then
-@@ -32971,8 +35529,7 @@
+@@ -32971,8 +35534,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36365,7 +36578,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32982,17 +35539,17 @@
+@@ -32982,17 +35544,17 @@
if test "${ac_cv_header_kaddressbook_xxport_h+set}" = set; then
@@ -36389,7 +36602,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33003,24 +35560,36 @@
+@@ -33003,24 +35565,36 @@
#include <kaddressbook/xxport.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36434,17 +36647,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33029,15 +35598,16 @@
+@@ -33029,15 +35603,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; }
@@ -36456,7 +36670,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33046,8 +35616,13 @@
+@@ -33046,8 +35621,13 @@
/* end confdefs.h. */
#include <kaddressbook/xxport.h>
_ACEOF
@@ -36472,7 +36686,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33071,9 +35646,10 @@
+@@ -33071,9 +35651,10 @@
ac_header_preproc=no
fi
@@ -36485,7 +36699,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33097,25 +35673,18 @@
+@@ -33097,25 +35678,18 @@
echo "$as_me: WARNING: kaddressbook/xxport.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kaddressbook/xxport.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kaddressbook/xxport.h: in the future, the compiler will take precedence" >&2;}
@@ -36516,7 +36730,7 @@
fi
if test $ac_cv_header_kaddressbook_xxport_h = yes; then
-@@ -33144,26 +35713,26 @@
+@@ -33144,26 +35718,26 @@
ssl_libraries=""
ssl_includes=""
@@ -36553,16 +36767,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33178,7 +35747,7 @@
+@@ -33178,7 +35752,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 33181: $i/$j" >&5
-+ echo "configure: 35750: $i/$j" >&5
++ echo "configure: 35755: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -33225,24 +35794,36 @@
+@@ -33225,24 +35799,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36607,7 +36821,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33252,9 +35833,10 @@
+@@ -33252,10 +35838,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36615,11 +36829,13 @@
+ ac_ssl_rsaref="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -33273,26 +35855,26 @@
+ LDFLAGS="$ac_ldflags_safe"
+@@ -33273,26 +35860,26 @@
eval "$ac_cv_have_ssl"
@@ -36659,7 +36875,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33365,8 +35947,8 @@
+@@ -33365,8 +35952,8 @@
eval "$ac_cv_ssl_version"
@@ -36670,7 +36886,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -33432,18 +36014,19 @@
+@@ -33432,18 +36019,19 @@
for ac_header in fcntl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36698,7 +36914,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33454,24 +36037,36 @@
+@@ -33454,24 +36042,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36743,17 +36959,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33480,15 +36075,16 @@
+@@ -33480,15 +36080,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; }
@@ -36765,7 +36982,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33497,8 +36093,13 @@
+@@ -33497,8 +36098,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36781,7 +36998,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33522,9 +36123,10 @@
+@@ -33522,9 +36128,10 @@
ac_header_preproc=no
fi
@@ -36794,7 +37011,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33548,25 +36150,19 @@
+@@ -33548,25 +36155,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;}
@@ -36827,7 +37044,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33578,8 +36174,8 @@
+@@ -33578,8 +36179,8 @@
done
@@ -36838,7 +37055,7 @@
if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33592,40 +36188,52 @@
+@@ -33592,40 +36193,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36903,15 +37120,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33634,14 +36242,15 @@
+@@ -33634,14 +36247,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_kstat_kstat_open=no
+ ac_cv_lib_kstat_kstat_open=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -36922,7 +37140,7 @@
if test $ac_cv_lib_kstat_kstat_open = yes; then
LIBKSTAT="-lkstat"
fi
-@@ -33652,18 +36261,18 @@
+@@ -33652,18 +36266,18 @@
@@ -36947,7 +37165,7 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33690,24 +36299,36 @@
+@@ -33690,24 +36304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36992,7 +37210,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33716,9 +36337,10 @@
+@@ -33716,10 +36342,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37000,11 +37218,13 @@
+ ac_cv_have_xmms="no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
-@@ -33727,8 +36349,8 @@
+ LDFLAGS="$ac_LDFLAGS_save"
+@@ -33727,8 +36354,8 @@
fi
@@ -37015,7 +37235,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_LIBS="`xmms-config --libs`"
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -33752,8 +36374,8 @@
+@@ -33752,8 +36379,8 @@
#MIN_CONFIG(3.2.0)
@@ -37026,7 +37246,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33779,24 +36401,36 @@
+@@ -33779,24 +36406,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37071,7 +37291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33822,24 +36456,36 @@
+@@ -33822,24 +36461,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37116,15 +37336,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33848,14 +36494,15 @@
+@@ -33848,14 +36499,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37134,7 +37355,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -33865,11 +36512,11 @@
+@@ -33865,11 +36517,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37150,7 +37371,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -33880,24 +36527,36 @@
+@@ -33880,24 +36532,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37195,17 +37416,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33916,7 +36575,9 @@
+@@ -33916,8 +36580,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33925,27 +36586,41 @@
+ /* confdefs.h. */
+@@ -33925,27 +36591,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37254,7 +37477,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33958,13 +36633,16 @@
+@@ -33958,13 +36638,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -37264,8 +37487,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -37274,7 +37498,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -33983,8 +36661,8 @@
+@@ -33983,8 +36666,8 @@
esac
@@ -37285,7 +37509,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34020,8 +36698,8 @@
+@@ -34020,8 +36703,8 @@
fi
@@ -37296,7 +37520,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34052,39 +36730,39 @@
+@@ -34052,39 +36735,39 @@
noatun_sdl=no
@@ -37352,7 +37576,7 @@
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-@@ -34101,8 +36779,8 @@
+@@ -34101,8 +36784,8 @@
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
@@ -37363,7 +37587,7 @@
if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34117,31 +36795,32 @@
+@@ -34117,31 +36800,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37404,7 +37628,7 @@
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
-@@ -34230,13 +36909,22 @@
+@@ -34230,13 +36914,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -37431,7 +37655,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34249,19 +36937,21 @@
+@@ -34249,19 +36942,21 @@
( exit $ac_status )
no_sdl=yes
fi
@@ -37458,7 +37682,7 @@
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -34293,24 +36983,36 @@
+@@ -34293,24 +36988,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37503,7 +37727,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34327,11 +37029,12 @@
+@@ -34327,12 +37034,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37513,11 +37737,13 @@
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
fi
+-rm -f conftest.err 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="$ac_save_CFLAGS"
-@@ -34369,18 +37072,19 @@
+ LIBS="$ac_save_LIBS"
+@@ -34369,18 +37077,19 @@
for ac_header in endian.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37545,7 +37771,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34391,24 +37095,36 @@
+@@ -34391,24 +37100,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37590,17 +37816,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34417,15 +37133,16 @@
+@@ -34417,15 +37138,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; }
@@ -37612,7 +37839,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34434,8 +37151,13 @@
+@@ -34434,8 +37156,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37628,7 +37855,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34459,9 +37181,10 @@
+@@ -34459,9 +37186,10 @@
ac_header_preproc=no
fi
@@ -37641,7 +37868,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34485,25 +37208,19 @@
+@@ -34485,25 +37213,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;}
@@ -37674,7 +37901,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34521,8 +37238,7 @@
+@@ -34521,8 +37243,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37684,7 +37911,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34532,17 +37248,17 @@
+@@ -34532,17 +37253,17 @@
if test "${ac_cv_header_noatun_app_h+set}" = set; then
@@ -37708,7 +37935,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34553,24 +37269,36 @@
+@@ -34553,24 +37274,36 @@
#include <noatun/app.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37753,17 +37980,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34579,15 +37307,16 @@
+@@ -34579,15 +37312,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; }
@@ -37775,7 +38003,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34596,8 +37325,13 @@
+@@ -34596,8 +37330,13 @@
/* end confdefs.h. */
#include <noatun/app.h>
_ACEOF
@@ -37791,7 +38019,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34621,9 +37355,10 @@
+@@ -34621,9 +37360,10 @@
ac_header_preproc=no
fi
@@ -37804,7 +38032,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34647,25 +37382,18 @@
+@@ -34647,25 +37387,18 @@
echo "$as_me: WARNING: noatun/app.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: noatun/app.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: noatun/app.h: in the future, the compiler will take precedence" >&2;}
@@ -37835,7 +38063,7 @@
fi
if test $ac_cv_header_noatun_app_h = yes; then
-@@ -34692,22 +37420,22 @@
+@@ -34692,22 +37425,22 @@
@@ -37866,7 +38094,7 @@
berkeley_db=no
if test "x$with_berkeley_db" != xno; then
-@@ -34717,8 +37445,7 @@
+@@ -34717,8 +37450,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37876,7 +38104,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34728,17 +37455,17 @@
+@@ -34728,17 +37460,17 @@
if test "${ac_cv_header_db_cxx_h+set}" = set; then
@@ -37900,7 +38128,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34749,24 +37476,36 @@
+@@ -34749,24 +37481,36 @@
#include <db_cxx.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37945,17 +38173,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34775,15 +37514,16 @@
+@@ -34775,15 +37519,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; }
@@ -37967,7 +38196,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34792,8 +37532,13 @@
+@@ -34792,8 +37537,13 @@
/* end confdefs.h. */
#include <db_cxx.h>
_ACEOF
@@ -37983,7 +38212,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34817,9 +37562,10 @@
+@@ -34817,9 +37567,10 @@
ac_header_preproc=no
fi
@@ -37996,7 +38225,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34843,25 +37589,18 @@
+@@ -34843,25 +37594,18 @@
echo "$as_me: WARNING: db_cxx.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: db_cxx.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: db_cxx.h: in the future, the compiler will take precedence" >&2;}
@@ -38027,7 +38256,7 @@
fi
if test $ac_cv_header_db_cxx_h = yes; then
-@@ -34881,9 +37620,9 @@
+@@ -34881,9 +37625,9 @@
as_ac_Lib=`echo "ac_cv_lib_$ac_db_name''_main" | $as_tr_sh`
@@ -38040,7 +38269,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -34899,30 +37638,42 @@
+@@ -34899,30 +37643,42 @@
int
main ()
{
@@ -38092,15 +38321,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34931,14 +37682,16 @@
+@@ -34931,14 +37687,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
@@ -38112,7 +38342,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
:
else
-@@ -34994,8 +37747,8 @@
+@@ -34994,8 +37752,8 @@
fi
for i in $ac_topsubdirs; do
@@ -38123,7 +38353,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -35006,8 +37759,8 @@
+@@ -35006,8 +37764,8 @@
else
install_it="no"
fi
@@ -38134,7 +38364,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -35129,243 +37882,243 @@
+@@ -35129,243 +37887,243 @@
renamedlgplugins_SUBDIR_included_FALSE=
fi
@@ -38497,7 +38727,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -35385,39 +38138,58 @@
+@@ -35385,39 +38143,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -38572,7 +38802,7 @@
fi
fi
rm -f confcache
-@@ -35426,38 +38198,31 @@
+@@ -35426,38 +38203,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -38624,7 +38854,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
-@@ -35636,11 +38401,35 @@
+@@ -35636,11 +38406,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -38662,7 +38892,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -35649,8 +38438,43 @@
+@@ -35649,8 +38443,43 @@
fi
@@ -38707,7 +38937,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -35664,18 +38488,19 @@
+@@ -35664,18 +38493,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -38730,7 +38960,7 @@
as_basename=basename
else
as_basename=false
-@@ -35683,159 +38508,120 @@
+@@ -35683,159 +38513,120 @@
# Name of the executable.
@@ -38961,7 +39191,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -35844,7 +38630,19 @@
+@@ -35844,7 +38635,19 @@
as_mkdir_p=false
fi
@@ -38982,7 +39212,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'"
-@@ -35853,31 +38651,14 @@
+@@ -35853,31 +38656,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -39014,11 +39244,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
-@@ -35885,30 +38666,20 @@
+@@ -35885,30 +38671,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -39057,7 +39287,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -35935,19 +38706,21 @@
+@@ -35935,19 +38711,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -39069,7 +39299,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.
@@ -39085,7 +39315,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -35958,39 +38731,24 @@
+@@ -35958,39 +38736,24 @@
do
case $1 in
--*=*)
@@ -39131,7 +39361,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -36000,18 +38758,24 @@
+@@ -36000,18 +38763,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -39161,7 +39391,7 @@
esac
shift
-@@ -36027,155 +38791,167 @@
+@@ -36027,155 +38796,167 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -39458,7 +39688,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
-@@ -36187,533 +38963,684 @@
+@@ -36187,533 +38968,684 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -40615,7 +40845,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -36721,248 +39648,129 @@
+@@ -36721,248 +39653,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -40656,6 +40886,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'
@@ -40963,7 +41194,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -36973,135 +39781,39 @@
+@@ -36973,135 +39787,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -41125,7 +41356,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.
-@@ -37111,18 +39823,29 @@
+@@ -37111,18 +39829,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
@@ -41163,7 +41394,7 @@
else
continue
fi
-@@ -37144,53 +39867,79 @@
+@@ -37144,53 +39873,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -41276,7 +41507,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeaddons, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeaddons, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -41387,7 +41618,7 @@
#>+ 2
-KDE_DIST=openheader.docbook index.docbook insertcommand.docbook configure_insertcommand.png Makefile.in insertcommand.png htmltools.docbook filetemplates.docbook textfilter.docbook xmlcheck.docbook Makefile.am xmltools.docbook index.cache.bz2
-+KDE_DIST=openheader.docbook index.docbook insertcommand.docbook configure_insertcommand.png Makefile.in insertcommand.png htmltools.docbook textfilter.docbook filetemplates.docbook Makefile.am xmlcheck.docbook xmltools.docbook index.cache.bz2
++KDE_DIST=openheader.docbook insertcommand.docbook Makefile.in textfilter.docbook index.docbook configure_insertcommand.png insertcommand.png htmltools.docbook filetemplates.docbook Makefile.am xmlcheck.docbook xmltools.docbook index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) htmltools.docbook xmltools.docbook configure_insertcommand.png insertcommand.docbook index.docbook openheader.docbook textfilter.docbook filetemplates.docbook xmlcheck.docbook insertcommand.png
@@ -41523,7 +41754,7 @@
#>+ 2
-KDE_DIST=kolourpicker.docbook index.docbook Makefile.in Makefile.am ktimemon.docbook index.cache.bz2
-+KDE_DIST=kolourpicker.docbook index.docbook Makefile.in ktimemon.docbook Makefile.am index.cache.bz2
++KDE_DIST=kolourpicker.docbook Makefile.in ktimemon.docbook index.docbook Makefile.am index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kolourpicker.docbook ktimemon.docbook index.docbook
@@ -41654,6 +41885,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/crashes/Makefile.in
+++ doc/konq-plugins/crashes/Makefile.in
@@ -108,6 +108,7 @@
@@ -41753,6 +41993,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/dirfilter/Makefile.in
+++ doc/konq-plugins/dirfilter/Makefile.in
@@ -108,6 +108,7 @@
@@ -41852,6 +42101,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/domtreeviewer/Makefile.in
+++ doc/konq-plugins/domtreeviewer/Makefile.in
@@ -108,6 +108,7 @@
@@ -41951,6 +42209,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/fsview/Makefile.in
+++ doc/konq-plugins/fsview/Makefile.in
@@ -108,6 +108,7 @@
@@ -42050,6 +42317,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/imgallery/Makefile.in
+++ doc/konq-plugins/imgallery/Makefile.in
@@ -108,6 +108,7 @@
@@ -42154,7 +42430,7 @@
#>+ 2
-KDE_DIST=index.docbook Makefile.in thumbnails.png Makefile.am index.cache.bz2 look.png folders.png
-+KDE_DIST=index.docbook Makefile.in thumbnails.png Makefile.am look.png index.cache.bz2 folders.png
++KDE_DIST=Makefile.in thumbnails.png look.png index.docbook Makefile.am index.cache.bz2 folders.png
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook folders.png look.png thumbnails.png
@@ -42285,6 +42561,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/kuick/Makefile.in
+++ doc/konq-plugins/kuick/Makefile.in
@@ -108,6 +108,7 @@
@@ -42384,6 +42669,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/Makefile.in
+++ doc/konq-plugins/Makefile.in
@@ -108,6 +108,7 @@
@@ -42492,6 +42786,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/mediaplayer/Makefile.in
+++ doc/konq-plugins/mediaplayer/Makefile.in
@@ -108,6 +108,7 @@
@@ -42591,6 +42894,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/uachanger/Makefile.in
+++ doc/konq-plugins/uachanger/Makefile.in
@@ -108,6 +108,7 @@
@@ -42690,6 +43002,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/validators/Makefile.in
+++ doc/konq-plugins/validators/Makefile.in
@@ -108,6 +108,7 @@
@@ -42789,6 +43110,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/konq-plugins/webarchiver/Makefile.in
+++ doc/konq-plugins/webarchiver/Makefile.in
@@ -108,6 +108,7 @@
@@ -42888,6 +43218,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -689,7 +698,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -108,6 +108,7 @@
@@ -43197,7 +43536,7 @@
#>+ 2
-KDE_DIST=gmx_xxportui.rc Makefile.in Makefile.am gmx_xxport.h gmx_xxport.desktop
-+KDE_DIST=gmx_xxportui.rc Makefile.in Makefile.am gmx_xxport.desktop gmx_xxport.h
++KDE_DIST=Makefile.in gmx_xxport.desktop gmx_xxport.h gmx_xxportui.rc Makefile.am
#>+ 3
clean-closures:
@@ -43498,6 +43837,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -758,7 +767,7 @@
+ -rm -f plugin_katesymbolviewer.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in ui.rc katecppsymbolviewer.desktop testfile.c plugin_katesymbolviewer.h Makefile.am
++KDE_DIST=Makefile.in testfile.c ui.rc katecppsymbolviewer.desktop plugin_katesymbolviewer.h Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kate/filelistloader/Makefile.in
+++ kate/filelistloader/Makefile.in
@@ -137,6 +137,7 @@
@@ -43602,7 +43950,7 @@
#>+ 2
-KDE_DIST=katefll_plugin.desktop katefll.desktop katefll_plugin.h Makefile.in ui.rc Makefile.am katefll_initplugin.desktop katefll_initplugin.h
-+KDE_DIST=katefll_plugin.desktop katefll.desktop katefll_plugin.h Makefile.in ui.rc Makefile.am katefll_initplugin.h katefll_initplugin.desktop
++KDE_DIST=katefll.desktop katefll_plugin.h Makefile.in katefll_plugin.desktop ui.rc Makefile.am katefll_initplugin.h katefll_initplugin.desktop
#>+ 3
clean-closures:
@@ -43809,7 +44157,7 @@
#>+ 2
-KDE_DIST=filetemplates.h Makefile.in ui.rc Makefile.am katefiletemplates.desktop katetemplate.xml
-+KDE_DIST=filetemplates.h Makefile.in ui.rc Makefile.am katetemplate.xml katefiletemplates.desktop
++KDE_DIST=filetemplates.h Makefile.in katetemplate.xml katefiletemplates.desktop ui.rc Makefile.am
#>+ 3
clean-closures:
@@ -44119,6 +44467,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -756,7 +765,7 @@
+ -rm -f plugin_katehtmltools.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in plugin_katehtmltools.h ui.rc katehtmltools.desktop Makefile.am
++KDE_DIST=Makefile.in katehtmltools.desktop plugin_katehtmltools.h ui.rc Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kate/insertcommand/Makefile.in
+++ kate/insertcommand/Makefile.in
@@ -136,6 +136,7 @@
@@ -44223,7 +44580,7 @@
#>+ 2
-KDE_DIST=Makefile.in ui.rc Makefile.am plugin_kateinsertcommand.h kateinsertcommand.desktop
-+KDE_DIST=Makefile.in ui.rc Makefile.am kateinsertcommand.desktop plugin_kateinsertcommand.h
++KDE_DIST=Makefile.in kateinsertcommand.desktop ui.rc Makefile.am plugin_kateinsertcommand.h
#>+ 3
clean-closures:
@@ -44430,7 +44787,7 @@
#>+ 2
-KDE_DIST=Makefile.in katekjstest1.js katekjsconsolewindow.rc katekjstest1.desktop katekjsconsolewindow.js katekjsselect.rc Makefile.am katekjsselect.js katekjsselect.desktop katekjsconsolewindow.desktop
-+KDE_DIST=katekjstest1.js Makefile.in katekjsconsolewindow.rc katekjsselect.rc katekjstest1.desktop katekjsconsolewindow.js katekjsselect.js Makefile.am katekjsselect.desktop katekjsconsolewindow.desktop
++KDE_DIST=katekjstest1.js Makefile.in katekjsselect.rc katekjsconsolewindow.js katekjsconsolewindow.rc katekjstest1.desktop katekjsselect.js Makefile.am katekjsselect.desktop katekjsconsolewindow.desktop
#>+ 2
docs-am:
@@ -44533,6 +44890,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -764,7 +773,7 @@
+ -rm -f pybrowse_part.moc kpybrowser.moc
+
+ #>+ 2
+-KDE_DIST=pybrowse.xpm kpybrowser.h Makefile.in katepybrowse.desktop ui.rc pybrowse_part.h Makefile.am kpybrowser.desktop pybrowsenode.h
++KDE_DIST=Makefile.in pybrowse_part.h pybrowsenode.h pybrowse.xpm kpybrowser.h katepybrowse.desktop ui.rc Makefile.am kpybrowser.desktop
+
+ #>+ 3
+ clean-closures:
--- kate/make/Makefile.in
+++ kate/make/Makefile.in
@@ -135,6 +135,7 @@
@@ -44830,6 +45196,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -756,7 +765,7 @@
+ -rm -f ModelinePlugin.moc
+
+ #>+ 2
+-KDE_DIST=ModelinePlugin.h Makefile.in katemodeline.desktop ui.rc Makefile.am
++KDE_DIST=Makefile.in ModelinePlugin.h katemodeline.desktop ui.rc Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kate/openheader/Makefile.in
+++ kate/openheader/Makefile.in
@@ -136,6 +136,7 @@
@@ -44929,6 +45304,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -757,7 +766,7 @@
+ -rm -f plugin_kateopenheader.moc
+
+ #>+ 2
+-KDE_DIST=kateopenheader.desktop Makefile.in plugin_kateopenheader.h ui.rc Makefile.am
++KDE_DIST=Makefile.in kateopenheader.desktop plugin_kateopenheader.h ui.rc Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kate/scripts/Makefile.in
+++ kate/scripts/Makefile.in
@@ -102,6 +102,7 @@
@@ -45028,6 +45412,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -547,7 +556,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in html-tidy.sh Makefile.am html-tidy.desktop
++KDE_DIST=Makefile.in html-tidy.desktop html-tidy.sh Makefile.am
+
+ #>+ 2
+ docs-am:
--- kate/snippets/Makefile.in
+++ kate/snippets/Makefile.in
@@ -148,6 +148,7 @@
@@ -45127,6 +45520,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -774,7 +783,7 @@
+ -rm -f plugin_katesnippets.moc csnippet.moc
+
+ #>+ 2
+-KDE_DIST=katesnippets.desktop Makefile.in plugin_katesnippets.h plugin_katesnippets.rc CWidgetSnippetsBase.ui Makefile.am
++KDE_DIST=Makefile.in plugin_katesnippets.h plugin_katesnippets.rc CWidgetSnippetsBase.ui katesnippets.desktop Makefile.am
+
+ #>+ 4
+ clean-ui:
--- kate/tabbarextension/Makefile.in
+++ kate/tabbarextension/Makefile.in
@@ -137,6 +137,7 @@
@@ -45334,6 +45736,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -757,7 +766,7 @@
+ -rm -f plugin_katetextfilter.moc
+
+ #>+ 2
+-KDE_DIST=katetextfilter.desktop Makefile.in ui.rc Makefile.am plugin_katetextfilter.h
++KDE_DIST=katetextfilter.desktop Makefile.in plugin_katetextfilter.h ui.rc Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kate/xmlcheck/Makefile.in
+++ kate/xmlcheck/Makefile.in
@@ -135,6 +135,7 @@
@@ -48503,7 +48914,7 @@
@$(NORMAL_INSTALL)
--- konq-plugins/imagerotation/Makefile.in
+++ konq-plugins/imagerotation/Makefile.in
-@@ -105,6 +105,7 @@
+@@ -107,6 +107,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
GMSGFMT = @GMSGFMT@
@@ -48511,7 +48922,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -180,6 +181,9 @@
+@@ -182,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -48521,7 +48932,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -220,6 +224,7 @@
+@@ -222,6 +226,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -48529,7 +48940,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LIBS = @XMMS_LIBS@
-@@ -228,12 +233,9 @@
+@@ -230,12 +235,9 @@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
X_RPATH = @X_RPATH@
@@ -48542,7 +48953,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -254,14 +256,18 @@
+@@ -256,14 +258,18 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
@@ -48561,7 +48972,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_BERKELEY_DB_FALSE = @include_BERKELEY_DB_FALSE@
-@@ -316,14 +322,17 @@
+@@ -318,14 +324,17 @@
ksig_SUBDIR_included_TRUE = @ksig_SUBDIR_included_TRUE@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -48579,7 +48990,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
-@@ -351,7 +360,7 @@
+@@ -355,7 +364,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -48588,7 +48999,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -389,9 +398,9 @@
+@@ -393,9 +402,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51449,6 +51860,17 @@
#>+ 15
force-reedit:
+--- Makefile.am
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ ## kdeaddons/Makefile.am
+ ## (C) 1997 Stephan Kulow
+
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+
+ EXTRA_DIST = admin
+ dist-hook:
--- Makefile.in
+++ Makefile.in
@@ -125,6 +125,7 @@
@@ -51527,6 +51949,15 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
+@@ -363,7 +372,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+ EXTRA_DIST = admin
+ SUBDIRS = $(TOPSUBDIRS)
+ #>- all: config.h
@@ -374,7 +383,7 @@
.SUFFIXES:
am--refresh:
@@ -51565,7 +51996,7 @@
#>+ 2
-KDE_DIST=configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 Makefile.am kdeaddons.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in configure.in Makefile.cvs subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 configure Makefile.am kdeaddons.lsm Makefile.am.in
++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 kdeaddons.lsm Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list