[pkg-kde-commits] rev 2779 -
trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jan 7 22:01:17 UTC 2006
Author: chrsmrtn
Date: 2006-01-07 22:01:14 +0000 (Sat, 07 Jan 2006)
New Revision: 2779
Modified:
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
buildprep update for kdenetwork.
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-01-07 21:59:25 UTC (rev 2778)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-01-07 22:01:14 UTC (rev 2779)
@@ -2948,7 +2948,17 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1201,7 +1203,7 @@
+@@ -1062,7 +1064,8 @@
+ toolchain hidden visibility default=no
+ --disable-largefile omit support for large files
+ --disable-slp don't require libslp (Browsing in krfb and krdc not possible)
+- --enable-smpppd enable support for smpppd
++ --enable-smpppd enable support for the SuSE Meta PPP Daemon (smpppd)
++ (default is NO)
+ --enable-sametime-plugin
+ build the Kopete Sametime plugin [default=no]
+ --disable-testbed disable kopete testbed protocol compilation
+@@ -1201,7 +1204,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -2957,7 +2967,7 @@
done
fi
-@@ -2104,6 +2106,31 @@
+@@ -2104,6 +2107,31 @@
@@ -2989,7 +2999,7 @@
unset CDPATH
-@@ -3037,8 +3064,7 @@
+@@ -3037,8 +3065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2999,7 +3009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3096,8 +3122,7 @@
+@@ -3096,8 +3123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3009,7 +3019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3213,8 +3238,7 @@
+@@ -3213,8 +3239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3019,7 +3029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3268,8 +3292,7 @@
+@@ -3268,8 +3293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3029,7 +3039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3314,8 +3337,7 @@
+@@ -3314,8 +3338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3039,7 +3049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3359,8 +3381,7 @@
+@@ -3359,8 +3382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3049,7 +3059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3917,8 +3938,7 @@
+@@ -3917,8 +3939,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3059,7 +3069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3976,8 +3996,7 @@
+@@ -3976,8 +3997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3069,7 +3079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4048,8 +4067,7 @@
+@@ -4048,8 +4068,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3079,7 +3089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4093,8 +4111,7 @@
+@@ -4093,8 +4112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3089,7 +3099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4272,8 +4289,7 @@
+@@ -4272,8 +4290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3099,7 +3109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4384,8 +4400,7 @@
+@@ -4384,8 +4401,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3109,7 +3119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4473,8 +4488,7 @@
+@@ -4473,8 +4489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3119,7 +3129,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4576,8 +4590,7 @@
+@@ -4576,8 +4591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3129,7 +3139,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4676,8 +4689,7 @@
+@@ -4676,8 +4690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3139,7 +3149,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4761,8 +4773,7 @@
+@@ -4761,8 +4774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3149,7 +3159,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4851,8 +4862,7 @@
+@@ -4851,8 +4863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3159,7 +3169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4939,8 +4949,7 @@
+@@ -4939,8 +4950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3169,7 +3179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5027,8 +5036,7 @@
+@@ -5027,8 +5037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3179,7 +3189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5134,8 +5142,7 @@
+@@ -5134,8 +5143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3189,7 +3199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5222,8 +5229,7 @@
+@@ -5222,8 +5230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3199,7 +3209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5310,8 +5316,7 @@
+@@ -5310,8 +5317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3209,7 +3219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5398,8 +5403,7 @@
+@@ -5398,8 +5404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3219,7 +3229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5530,8 +5534,7 @@
+@@ -5530,8 +5535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3229,7 +3239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5619,8 +5622,7 @@
+@@ -5619,8 +5623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3239,7 +3249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5707,8 +5709,7 @@
+@@ -5707,8 +5710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3249,7 +3259,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5795,8 +5796,7 @@
+@@ -5795,8 +5797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3259,7 +3269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5883,8 +5883,7 @@
+@@ -5883,8 +5884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3269,7 +3279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5971,8 +5970,7 @@
+@@ -5971,8 +5971,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3279,7 +3289,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6395,8 +6393,7 @@
+@@ -6395,8 +6394,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3289,7 +3299,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6522,8 +6519,7 @@
+@@ -6522,8 +6520,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3299,7 +3309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6611,8 +6607,7 @@
+@@ -6611,8 +6608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3309,7 +3319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6695,185 +6690,6 @@
+@@ -6695,185 +6691,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3495,7 +3505,7 @@
fi
-@@ -7037,7 +6853,7 @@
+@@ -7037,7 +6854,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
@@ -3504,7 +3514,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7142,7 +6958,7 @@
+@@ -7142,7 +6959,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,
@@ -3513,7 +3523,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'*)
-@@ -7176,7 +6992,7 @@
+@@ -7176,7 +6993,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3522,7 +3532,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7206,6 +7022,15 @@
+@@ -7206,6 +7023,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3538,7 +3548,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7292,44 +7117,36 @@
+@@ -7292,44 +7118,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3593,7 +3603,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7345,7 +7162,7 @@
+@@ -7345,7 +7163,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3602,7 +3612,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
-@@ -7362,42 +7179,21 @@
+@@ -7362,42 +7180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3652,7 +3662,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
-@@ -7416,19 +7212,14 @@
+@@ -7416,19 +7213,14 @@
;;
openbsd*)
@@ -3674,7 +3684,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7438,7 +7229,6 @@
+@@ -7438,7 +7230,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3682,16 +3692,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7515,7 +7305,7 @@
+@@ -7515,7 +7306,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7518 "configure"' > conftest.$ac_ext
-+ echo '#line 7308 "configure"' > conftest.$ac_ext
++ echo '#line 7309 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7558,14 +7348,13 @@
+@@ -7558,14 +7349,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3708,7 +3718,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7577,7 +7366,6 @@
+@@ -7577,7 +7367,6 @@
esac
;;
*64-bit*)
@@ -3716,7 +3726,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7637,8 +7425,7 @@
+@@ -7637,8 +7426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3726,7 +3736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7713,8 +7500,7 @@
+@@ -7713,8 +7501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3736,7 +3746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7884,8 +7670,7 @@
+@@ -7884,8 +7671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3746,7 +3756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7952,8 +7737,7 @@
+@@ -7952,8 +7738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3756,7 +3766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8068,6 +7852,243 @@
+@@ -8068,6 +7853,243 @@
done
@@ -4000,16 +4010,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8160,7 +8181,7 @@
+@@ -8160,7 +8182,7 @@
# Provide some information about the compiler.
-echo "$as_me:8163:" \
-+echo "$as_me:8184:" \
++echo "$as_me:8185:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8206,8 +8227,7 @@
+@@ -8206,8 +8228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4019,7 +4029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8256,8 +8276,7 @@
+@@ -8256,8 +8277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4029,7 +4039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8315,7 +8334,7 @@
+@@ -8315,7 +8335,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4038,7 +4048,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8344,20 +8363,53 @@
+@@ -8344,20 +8364,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4098,7 +4108,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8394,9 +8446,6 @@
+@@ -8394,9 +8447,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4108,7 +4118,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'"
-@@ -8418,6 +8467,13 @@
+@@ -8418,6 +8468,13 @@
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'"
;;
@@ -4122,7 +4132,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8425,7 +8481,7 @@
+@@ -8425,7 +8482,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4131,7 +4141,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8443,14 +8499,17 @@
+@@ -8443,14 +8500,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4151,7 +4161,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8612,7 +8671,7 @@
+@@ -8612,7 +8672,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4160,7 +4170,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8632,7 +8691,7 @@
+@@ -8632,7 +8692,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4169,7 +4179,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8917,6 +8976,17 @@
+@@ -8917,6 +8977,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4187,7 +4197,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8942,7 +9012,7 @@
+@@ -8942,7 +9013,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4196,7 +4206,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
-@@ -9004,7 +9074,7 @@
+@@ -9004,7 +9075,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4205,7 +4215,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
-@@ -9103,6 +9173,20 @@
+@@ -9103,6 +9174,20 @@
compiler=$CC
@@ -4226,7 +4236,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9139,11 +9223,16 @@
+@@ -9139,11 +9224,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4244,7 +4254,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9189,18 +9278,20 @@
+@@ -9189,18 +9279,20 @@
# 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 \
@@ -4253,12 +4263,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9195: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9284: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9285: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9199: \$? = $ac_status" >&5
-+ echo "$as_me:9288: \$? = $ac_status" >&5
++ echo "$as_me:9289: \$? = $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
@@ -4270,7 +4280,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9277,7 +9368,7 @@
+@@ -9277,7 +9369,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4279,7 +4289,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9303,6 +9394,16 @@
+@@ -9303,6 +9395,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4296,7 +4306,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9314,7 +9415,7 @@
+@@ -9314,7 +9416,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.
@@ -4305,7 +4315,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9338,12 +9439,19 @@
+@@ -9338,12 +9440,19 @@
;;
linux*)
@@ -4326,7 +4336,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9364,9 +9472,14 @@
+@@ -9364,9 +9473,14 @@
;;
solaris*)
@@ -4342,7 +4352,7 @@
;;
sunos4*)
-@@ -9388,6 +9501,11 @@
+@@ -9388,6 +9502,11 @@
fi
;;
@@ -4354,7 +4364,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9422,18 +9540,20 @@
+@@ -9422,18 +9541,20 @@
# 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 \
@@ -4363,12 +4373,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9428: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9432: \$? = $ac_status" >&5
-+ echo "$as_me:9550: \$? = $ac_status" >&5
++ echo "$as_me:9551: \$? = $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
@@ -4380,7 +4390,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9454,7 +9574,7 @@
+@@ -9454,7 +9575,7 @@
fi
fi
@@ -4389,7 +4399,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9476,38 +9596,36 @@
+@@ -9476,38 +9597,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4411,12 +4421,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9495: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9499: \$? = $ac_status" >&5
-+ echo "$as_me:9612: \$? = $ac_status" >&5
++ echo "$as_me:9613: \$? = $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
@@ -4440,7 +4450,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9578,6 +9696,16 @@
+@@ -9578,6 +9697,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4457,7 +4467,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9598,6 +9726,27 @@
+@@ -9598,6 +9727,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4485,7 +4495,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9635,7 +9784,7 @@
+@@ -9635,7 +9785,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4494,7 +4504,7 @@
else
ld_shlibs=no
fi
-@@ -9645,13 +9794,13 @@
+@@ -9645,13 +9795,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'
@@ -4511,7 +4521,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
-@@ -9660,19 +9809,51 @@
+@@ -9660,19 +9810,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4567,7 +4577,7 @@
fi
;;
-@@ -9690,8 +9871,8 @@
+@@ -9690,8 +9872,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4578,7 +4588,7 @@
else
ld_shlibs=no
fi
-@@ -9706,24 +9887,19 @@
+@@ -9706,24 +9888,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4610,7 +4620,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9757,9 +9933,20 @@
+@@ -9757,9 +9934,20 @@
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
@@ -4633,7 +4643,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9776,7 +9963,7 @@
+@@ -9776,7 +9964,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4642,7 +4652,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`
-@@ -9797,6 +9984,9 @@
+@@ -9797,6 +9985,9 @@
fi
esac
shared_flag='-shared'
@@ -4652,7 +4662,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9805,21 +9995,22 @@
+@@ -9805,21 +9996,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4680,7 +4690,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9843,8 +10034,7 @@
+@@ -9843,8 +10035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4690,7 +4700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9871,14 +10061,13 @@
+@@ -9871,14 +10062,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4708,7 +4718,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9905,8 +10094,7 @@
+@@ -9905,8 +10095,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4718,7 +4728,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9943,8 +10131,8 @@
+@@ -9943,8 +10132,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4729,7 +4739,7 @@
fi
fi
;;
-@@ -9957,7 +10145,7 @@
+@@ -9957,7 +10146,7 @@
ld_shlibs=no
;;
@@ -4738,7 +4748,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9967,13 +10155,13 @@
+@@ -9967,13 +10156,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4755,7 +4765,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.
-@@ -9983,52 +10171,52 @@
+@@ -9983,52 +10172,52 @@
;;
darwin* | rhapsody*)
@@ -4848,7 +4858,7 @@
fi
;;
-@@ -10062,8 +10250,8 @@
+@@ -10062,8 +10251,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4859,7 +4869,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10071,7 +10259,7 @@
+@@ -10071,7 +10260,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4868,7 +4878,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
-@@ -10087,16 +10275,16 @@
+@@ -10087,16 +10276,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4889,7 +4899,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10106,7 +10294,7 @@
+@@ -10106,7 +10295,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -4898,7 +4908,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10139,7 +10327,7 @@
+@@ -10139,7 +10328,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4907,7 +4917,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'
-@@ -10149,7 +10337,7 @@
+@@ -10149,7 +10338,7 @@
link_all_deplibs=yes
;;
@@ -4916,7 +4926,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10172,7 +10360,8 @@
+@@ -10172,7 +10361,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
@@ -4926,7 +4936,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10182,7 +10371,7 @@
+@@ -10182,7 +10372,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4935,7 +4945,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10193,14 +10382,14 @@
+@@ -10193,14 +10383,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4952,7 +4962,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'
-@@ -10212,13 +10401,13 @@
+@@ -10212,13 +10402,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4968,7 +4978,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10237,10 +10426,12 @@
+@@ -10237,10 +10427,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4983,7 +4993,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'
-@@ -10249,8 +10440,18 @@
+@@ -10249,8 +10441,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5004,7 +5014,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10259,7 +10460,7 @@
+@@ -10259,7 +10461,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.
@@ -5013,7 +5023,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10319,9 +10520,9 @@
+@@ -10319,9 +10521,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5025,7 +5035,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10427,7 +10628,7 @@
+@@ -10427,7 +10629,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5034,7 +5044,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10437,7 +10638,20 @@
+@@ -10437,7 +10639,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5056,7 +5066,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10502,7 +10716,7 @@
+@@ -10502,7 +10717,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5065,7 +5075,7 @@
;;
beos*)
-@@ -10511,7 +10725,7 @@
+@@ -10511,7 +10726,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5074,7 +5084,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10527,7 +10741,7 @@
+@@ -10527,7 +10742,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5083,7 +5093,7 @@
need_version=no
need_lib_prefix=no
-@@ -10539,7 +10753,8 @@
+@@ -10539,7 +10754,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5093,7 +5103,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10569,7 +10784,7 @@
+@@ -10569,7 +10785,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5102,7 +5112,7 @@
;;
esac
;;
-@@ -10592,7 +10807,7 @@
+@@ -10592,7 +10808,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5111,7 +5121,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"`
-@@ -10615,7 +10830,7 @@
+@@ -10615,7 +10831,7 @@
dynamic_linker=no
;;
@@ -5120,7 +5130,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10627,8 +10842,17 @@
+@@ -10627,8 +10843,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5140,7 +5150,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10646,7 +10870,7 @@
+@@ -10646,7 +10871,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5149,7 +5159,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10673,9 +10897,9 @@
+@@ -10673,9 +10898,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5161,7 +5171,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10690,7 +10914,7 @@
+@@ -10690,7 +10915,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5170,7 +5180,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10701,7 +10925,7 @@
+@@ -10701,7 +10926,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5179,7 +5189,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10763,22 +10987,19 @@
+@@ -10763,22 +10988,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5208,7 +5218,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,
-@@ -10788,6 +11009,30 @@
+@@ -10788,6 +11010,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5239,7 +5249,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10797,7 +11042,7 @@
+@@ -10797,7 +11043,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5248,7 +5258,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10826,7 +11071,11 @@
+@@ -10826,7 +11072,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5261,7 +5271,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
-@@ -10846,7 +11095,7 @@
+@@ -10846,7 +11096,7 @@
os2*)
libname_spec='$name'
@@ -5270,7 +5280,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10948,8 +11197,8 @@
+@@ -10948,8 +11198,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5281,7 +5291,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11075,8 +11324,7 @@
+@@ -11075,8 +11325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5291,7 +5301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11179,8 +11427,7 @@
+@@ -11179,8 +11428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5301,7 +5311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11245,8 +11492,7 @@
+@@ -11245,8 +11493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5311,7 +5321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11339,8 +11585,7 @@
+@@ -11339,8 +11586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5321,7 +5331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11405,8 +11650,7 @@
+@@ -11405,8 +11651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5331,7 +5341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11472,8 +11716,7 @@
+@@ -11472,8 +11717,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5341,7 +5351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11539,8 +11782,7 @@
+@@ -11539,8 +11783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5351,16 +5361,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11615,7 +11857,7 @@
+@@ -11615,7 +11858,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11618 "configure"
-+#line 11860 "configure"
++#line 11861 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11681,7 +11923,7 @@
+@@ -11681,7 +11924,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5369,16 +5379,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11713,7 +11955,7 @@
+@@ -11713,7 +11956,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11716 "configure"
-+#line 11958 "configure"
++#line 11959 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11779,7 +12021,7 @@
+@@ -11779,7 +12022,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5387,7 +5397,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11829,7 +12071,7 @@
+@@ -11829,7 +12072,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5396,7 +5406,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11838,47 +12080,10 @@
+@@ -11838,47 +12081,10 @@
fi
;;
@@ -5445,7 +5455,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11904,7 +12109,8 @@
+@@ -11904,7 +12110,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.
@@ -5455,7 +5465,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 \
-@@ -12018,11 +12224,11 @@
+@@ -12018,11 +12225,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5469,7 +5479,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12052,6 +12258,12 @@
+@@ -12052,6 +12259,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5482,7 +5492,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12082,7 +12294,7 @@
+@@ -12082,7 +12295,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5491,7 +5501,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12113,7 +12325,7 @@
+@@ -12113,7 +12326,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5500,7 +5510,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12128,7 +12340,7 @@
+@@ -12128,7 +12341,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5509,7 +5519,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12355,7 +12567,10 @@
+@@ -12355,7 +12568,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.
@@ -5521,7 +5531,7 @@
fi
-@@ -12420,7 +12635,9 @@
+@@ -12420,7 +12636,9 @@
case $tagname in
CXX)
@@ -5532,7 +5542,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12457,7 +12674,7 @@
+@@ -12457,7 +12675,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5541,7 +5551,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12478,6 +12695,20 @@
+@@ -12478,6 +12696,20 @@
compiler=$CC
@@ -5562,7 +5572,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12499,7 +12730,16 @@
+@@ -12499,7 +12731,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5580,7 +5590,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12570,7 +12810,7 @@
+@@ -12570,7 +12811,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,
@@ -5589,7 +5599,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'*)
-@@ -12604,7 +12844,7 @@
+@@ -12604,7 +12845,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5598,7 +5608,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12623,8 +12863,8 @@
+@@ -12623,8 +12864,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
@@ -5609,7 +5619,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12650,7 +12890,7 @@
+@@ -12650,7 +12891,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.
@@ -5618,7 +5628,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12681,8 +12921,22 @@
+@@ -12681,8 +12922,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5643,7 +5653,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12699,7 +12953,7 @@
+@@ -12699,7 +12954,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5652,7 +5662,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`
-@@ -12720,6 +12974,9 @@
+@@ -12720,6 +12975,9 @@
fi
esac
shared_flag='-shared'
@@ -5662,7 +5672,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12728,15 +12985,16 @@
+@@ -12728,15 +12986,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5683,7 +5693,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.
-@@ -12766,8 +13024,7 @@
+@@ -12766,8 +13025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5693,7 +5703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12796,13 +13053,12 @@
+@@ -12796,13 +13054,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5709,7 +5719,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12829,8 +13085,7 @@
+@@ -12829,8 +13086,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5719,7 +5729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12867,8 +13122,8 @@
+@@ -12867,8 +13123,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -5730,7 +5740,7 @@
fi
fi
;;
-@@ -12881,16 +13136,17 @@
+@@ -12881,16 +13137,17 @@
esac
;;
@@ -5750,7 +5760,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
-@@ -12899,70 +13155,81 @@
+@@ -12899,70 +13156,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5884,7 +5894,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12973,14 +13240,14 @@
+@@ -12973,14 +13241,14 @@
;;
esac
;;
@@ -5901,7 +5911,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12997,12 +13264,12 @@
+@@ -12997,12 +13265,12 @@
# location of the library.
case $cc_basename in
@@ -5917,7 +5927,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13011,11 +13278,11 @@
+@@ -13011,11 +13279,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.
@@ -5931,7 +5941,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13025,7 +13292,7 @@
+@@ -13025,7 +13293,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -5940,7 +5950,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13041,7 +13308,7 @@
+@@ -13041,7 +13309,7 @@
;;
esac
fi
@@ -5949,7 +5959,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13062,17 +13329,17 @@
+@@ -13062,17 +13330,17 @@
esac
case $cc_basename in
@@ -5971,7 +5981,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13088,12 +13355,12 @@
+@@ -13088,12 +13356,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -5986,7 +5996,7 @@
;;
esac
fi
-@@ -13106,9 +13373,9 @@
+@@ -13106,9 +13374,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -5998,7 +6008,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13119,9 +13386,9 @@
+@@ -13119,9 +13387,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6010,7 +6020,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13132,14 +13399,14 @@
+@@ -13132,14 +13400,14 @@
;;
linux*)
case $cc_basename in
@@ -6028,7 +6038,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13157,20 +13424,44 @@
+@@ -13157,20 +13425,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6079,7 +6089,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13198,7 +13489,7 @@
+@@ -13198,7 +13490,7 @@
;;
mvs*)
case $cc_basename in
@@ -6088,7 +6098,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13208,7 +13499,7 @@
+@@ -13208,7 +13500,7 @@
;;
esac
;;
@@ -6097,7 +6107,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=
-@@ -13219,15 +13510,31 @@
+@@ -13219,15 +13511,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::"'
;;
@@ -6131,7 +6141,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13237,14 +13544,14 @@
+@@ -13237,14 +13545,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6149,7 +6159,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13262,7 +13569,7 @@
+@@ -13262,7 +13570,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6158,7 +6168,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13281,13 +13588,13 @@
+@@ -13281,13 +13589,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6174,7 +6184,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13296,17 +13603,17 @@
+@@ -13296,17 +13604,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6196,7 +6206,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13325,7 +13632,7 @@
+@@ -13325,7 +13633,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6205,7 +6215,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13349,7 +13656,7 @@
+@@ -13349,7 +13657,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6214,7 +6224,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13361,12 +13668,12 @@
+@@ -13361,12 +13669,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6229,7 +6239,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13379,36 +13686,33 @@
+@@ -13379,36 +13687,33 @@
;;
solaris*)
case $cc_basename in
@@ -6278,7 +6288,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13416,9 +13720,9 @@
+@@ -13416,9 +13721,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6290,7 +6300,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13428,9 +13732,9 @@
+@@ -13428,9 +13733,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
@@ -6302,7 +6312,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13439,9 +13743,9 @@
+@@ -13439,9 +13744,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6314,7 +6324,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13459,7 +13763,7 @@
+@@ -13459,7 +13764,7 @@
;;
tandem*)
case $cc_basename in
@@ -6323,7 +6333,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13516,7 +13820,7 @@
+@@ -13516,7 +13821,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.
@@ -6332,7 +6342,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13556,7 +13860,7 @@
+@@ -13556,7 +13861,7 @@
fi
;;
@@ -6341,7 +6351,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13592,6 +13896,20 @@
+@@ -13592,6 +13897,20 @@
$rm -f confest.$objext
@@ -6362,7 +6372,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13647,7 +13965,7 @@
+@@ -13647,7 +13966,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6371,7 +6381,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13672,18 +13990,28 @@
+@@ -13672,18 +13991,28 @@
;;
chorus*)
case $cc_basename in
@@ -6403,7 +6413,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13691,22 +14019,22 @@
+@@ -13691,22 +14020,22 @@
;;
esac
;;
@@ -6430,7 +6440,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13721,7 +14049,7 @@
+@@ -13721,7 +14050,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6439,7 +6449,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13732,18 +14060,24 @@
+@@ -13732,18 +14061,24 @@
;;
linux*)
case $cc_basename in
@@ -6467,7 +6477,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13760,25 +14094,25 @@
+@@ -13760,25 +14095,25 @@
;;
mvs*)
case $cc_basename in
@@ -6498,7 +6508,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13794,7 +14128,7 @@
+@@ -13794,7 +14129,7 @@
;;
sco*)
case $cc_basename in
@@ -6507,7 +6517,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13803,13 +14137,13 @@
+@@ -13803,13 +14138,13 @@
;;
solaris*)
case $cc_basename in
@@ -6523,7 +6533,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13819,12 +14153,12 @@
+@@ -13819,12 +14154,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6538,7 +6548,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13834,7 +14168,7 @@
+@@ -13834,7 +14169,7 @@
;;
tandem*)
case $cc_basename in
@@ -6547,7 +6557,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13875,18 +14209,20 @@
+@@ -13875,18 +14210,20 @@
# 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 \
@@ -6556,12 +6566,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13881: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14215: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13885: \$? = $ac_status" >&5
-+ echo "$as_me:14219: \$? = $ac_status" >&5
++ echo "$as_me:14220: \$? = $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
@@ -6573,7 +6583,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13907,7 +14243,7 @@
+@@ -13907,7 +14244,7 @@
fi
fi
@@ -6582,7 +6592,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13929,38 +14265,36 @@
+@@ -13929,38 +14266,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6604,12 +6614,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13948: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14277: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14278: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13952: \$? = $ac_status" >&5
-+ echo "$as_me:14281: \$? = $ac_status" >&5
++ echo "$as_me:14282: \$? = $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
@@ -6633,7 +6643,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14010,7 +14344,10 @@
+@@ -14010,7 +14345,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6645,7 +6655,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14093,7 +14430,7 @@
+@@ -14093,7 +14431,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6654,7 +6664,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14103,7 +14440,20 @@
+@@ -14103,7 +14441,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6676,7 +6686,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14168,7 +14518,7 @@
+@@ -14168,7 +14519,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6685,7 +6695,7 @@
;;
beos*)
-@@ -14177,7 +14527,7 @@
+@@ -14177,7 +14528,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6694,7 +6704,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14193,7 +14543,7 @@
+@@ -14193,7 +14544,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6703,7 +6713,7 @@
need_version=no
need_lib_prefix=no
-@@ -14205,7 +14555,8 @@
+@@ -14205,7 +14556,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6713,7 +6723,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14235,7 +14586,7 @@
+@@ -14235,7 +14587,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6722,7 +6732,7 @@
;;
esac
;;
-@@ -14258,7 +14609,7 @@
+@@ -14258,7 +14610,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6731,7 +6741,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"`
-@@ -14281,7 +14632,7 @@
+@@ -14281,7 +14633,7 @@
dynamic_linker=no
;;
@@ -6740,7 +6750,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14293,8 +14644,17 @@
+@@ -14293,8 +14645,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6760,7 +6770,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14312,7 +14672,7 @@
+@@ -14312,7 +14673,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6769,7 +6779,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14339,9 +14699,9 @@
+@@ -14339,9 +14700,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6781,7 +6791,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14356,7 +14716,7 @@
+@@ -14356,7 +14717,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6790,7 +6800,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14367,7 +14727,7 @@
+@@ -14367,7 +14728,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6799,7 +6809,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14429,22 +14789,19 @@
+@@ -14429,22 +14790,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6828,7 +6838,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,
-@@ -14454,6 +14811,30 @@
+@@ -14454,6 +14812,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6859,7 +6869,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14463,7 +14844,7 @@
+@@ -14463,7 +14845,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6868,7 +6878,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14492,7 +14873,11 @@
+@@ -14492,7 +14874,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6881,7 +6891,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
-@@ -14512,7 +14897,7 @@
+@@ -14512,7 +14898,7 @@
os2*)
libname_spec='$name'
@@ -6890,7 +6900,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14614,8 +14999,8 @@
+@@ -14614,8 +15000,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -6901,7 +6911,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14741,8 +15126,7 @@
+@@ -14741,8 +15127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6911,7 +6921,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14845,8 +15229,7 @@
+@@ -14845,8 +15230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6921,7 +6931,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14911,8 +15294,7 @@
+@@ -14911,8 +15295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6931,7 +6941,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15005,8 +15387,7 @@
+@@ -15005,8 +15388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6941,7 +6951,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15071,8 +15452,7 @@
+@@ -15071,8 +15453,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6951,7 +6961,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15138,8 +15518,7 @@
+@@ -15138,8 +15519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6961,7 +6971,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15205,8 +15584,7 @@
+@@ -15205,8 +15585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6971,16 +6981,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15281,7 +15659,7 @@
+@@ -15281,7 +15660,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15284 "configure"
-+#line 15662 "configure"
++#line 15663 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15347,7 +15725,7 @@
+@@ -15347,7 +15726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -6989,16 +6999,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15379,7 +15757,7 @@
+@@ -15379,7 +15758,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15382 "configure"
-+#line 15760 "configure"
++#line 15761 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15445,7 +15823,7 @@
+@@ -15445,7 +15824,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7007,7 +7017,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15496,7 +15874,8 @@
+@@ -15496,7 +15875,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.
@@ -7017,7 +7027,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 \
-@@ -15596,6 +15975,12 @@
+@@ -15596,6 +15976,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7030,7 +7040,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15626,7 +16011,7 @@
+@@ -15626,7 +16012,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7039,7 +7049,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15657,7 +16042,7 @@
+@@ -15657,7 +16043,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7048,7 +7058,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15672,7 +16057,7 @@
+@@ -15672,7 +16058,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7057,7 +7067,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15874,7 +16259,10 @@
+@@ -15874,7 +16260,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.
@@ -7069,7 +7079,7 @@
fi
-@@ -15950,12 +16338,35 @@
+@@ -15950,12 +16339,35 @@
compiler=$CC
@@ -7106,7 +7116,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15968,7 +16379,7 @@
+@@ -15968,7 +16380,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7115,7 +7125,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15976,8 +16387,10 @@
+@@ -15976,8 +16388,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7128,7 +7138,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16054,7 +16467,7 @@
+@@ -16054,7 +16468,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7137,7 +7147,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16080,6 +16493,16 @@
+@@ -16080,6 +16494,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7154,7 +7164,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16091,7 +16514,7 @@
+@@ -16091,7 +16515,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.
@@ -7163,7 +7173,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16115,12 +16538,19 @@
+@@ -16115,12 +16539,19 @@
;;
linux*)
@@ -7184,7 +7194,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16141,9 +16571,14 @@
+@@ -16141,9 +16572,14 @@
;;
solaris*)
@@ -7200,7 +7210,7 @@
;;
sunos4*)
-@@ -16165,6 +16600,11 @@
+@@ -16165,6 +16601,11 @@
fi
;;
@@ -7212,7 +7222,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16199,18 +16639,20 @@
+@@ -16199,18 +16640,20 @@
# 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 \
@@ -7221,12 +7231,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16205: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16645: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16646: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16209: \$? = $ac_status" >&5
-+ echo "$as_me:16649: \$? = $ac_status" >&5
++ echo "$as_me:16650: \$? = $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
@@ -7238,7 +7248,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16231,7 +16673,7 @@
+@@ -16231,7 +16674,7 @@
fi
fi
@@ -7247,7 +7257,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16253,38 +16695,36 @@
+@@ -16253,38 +16696,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7269,12 +7279,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16272: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16707: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16708: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16276: \$? = $ac_status" >&5
-+ echo "$as_me:16711: \$? = $ac_status" >&5
++ echo "$as_me:16712: \$? = $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
@@ -7298,7 +7308,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16355,6 +16795,16 @@
+@@ -16355,6 +16796,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7315,7 +7325,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16375,6 +16825,27 @@
+@@ -16375,6 +16826,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7343,7 +7353,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16412,7 +16883,7 @@
+@@ -16412,7 +16884,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7352,7 +7362,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16422,13 +16893,13 @@
+@@ -16422,13 +16894,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'
@@ -7369,7 +7379,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
-@@ -16437,19 +16908,51 @@
+@@ -16437,19 +16909,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7426,7 +7436,7 @@
fi
;;
-@@ -16467,8 +16970,8 @@
+@@ -16467,8 +16971,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7437,7 +7447,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16483,24 +16986,19 @@
+@@ -16483,24 +16987,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7469,7 +7479,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16534,9 +17032,20 @@
+@@ -16534,9 +17033,20 @@
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
@@ -7492,7 +7502,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16553,7 +17062,7 @@
+@@ -16553,7 +17063,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7501,7 +7511,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`
-@@ -16574,6 +17083,9 @@
+@@ -16574,6 +17084,9 @@
fi
esac
shared_flag='-shared'
@@ -7511,7 +7521,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16582,21 +17094,22 @@
+@@ -16582,21 +17095,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7539,7 +7549,7 @@
program main
end
-@@ -16610,8 +17123,7 @@
+@@ -16610,8 +17124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7549,7 +7559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16638,14 +17150,13 @@
+@@ -16638,14 +17151,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7567,7 +7577,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16662,8 +17173,7 @@
+@@ -16662,8 +17174,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7577,7 +7587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16700,8 +17210,8 @@
+@@ -16700,8 +17211,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7588,7 +7598,7 @@
fi
fi
;;
-@@ -16714,7 +17224,7 @@
+@@ -16714,7 +17225,7 @@
ld_shlibs_F77=no
;;
@@ -7597,7 +7607,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16724,68 +17234,68 @@
+@@ -16724,68 +17235,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7710,7 +7720,7 @@
fi
;;
-@@ -16819,8 +17329,8 @@
+@@ -16819,8 +17330,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7721,7 +7731,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16828,7 +17338,7 @@
+@@ -16828,7 +17339,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7730,7 +7740,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
-@@ -16844,16 +17354,16 @@
+@@ -16844,16 +17355,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7751,7 +7761,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16863,7 +17373,7 @@
+@@ -16863,7 +17374,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7760,7 +7770,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16896,7 +17406,7 @@
+@@ -16896,7 +17407,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7769,7 +7779,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'
-@@ -16906,7 +17416,7 @@
+@@ -16906,7 +17417,7 @@
link_all_deplibs_F77=yes
;;
@@ -7778,7 +7788,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
-@@ -16929,7 +17439,8 @@
+@@ -16929,7 +17440,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
@@ -7788,7 +7798,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16939,7 +17450,7 @@
+@@ -16939,7 +17451,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7797,7 +7807,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16950,14 +17461,14 @@
+@@ -16950,14 +17462,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7814,7 +7824,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'
-@@ -16969,13 +17480,13 @@
+@@ -16969,13 +17481,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7830,7 +7840,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16994,10 +17505,12 @@
+@@ -16994,10 +17506,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7845,7 +7855,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'
-@@ -17006,8 +17519,18 @@
+@@ -17006,8 +17520,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7866,7 +7876,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17016,7 +17539,7 @@
+@@ -17016,7 +17540,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.
@@ -7875,7 +7885,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17076,9 +17599,9 @@
+@@ -17076,9 +17600,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -7887,7 +7897,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17184,7 +17707,7 @@
+@@ -17184,7 +17708,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7896,7 +7906,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17194,7 +17717,20 @@
+@@ -17194,7 +17718,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7918,7 +7928,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17259,7 +17795,7 @@
+@@ -17259,7 +17796,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7927,7 +7937,7 @@
;;
beos*)
-@@ -17268,7 +17804,7 @@
+@@ -17268,7 +17805,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7936,7 +7946,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17284,7 +17820,7 @@
+@@ -17284,7 +17821,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7945,7 +7955,7 @@
need_version=no
need_lib_prefix=no
-@@ -17296,7 +17832,8 @@
+@@ -17296,7 +17833,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7955,7 +7965,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17326,7 +17863,7 @@
+@@ -17326,7 +17864,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7964,7 +7974,7 @@
;;
esac
;;
-@@ -17349,7 +17886,7 @@
+@@ -17349,7 +17887,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7973,7 +7983,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"`
-@@ -17372,7 +17909,7 @@
+@@ -17372,7 +17910,7 @@
dynamic_linker=no
;;
@@ -7982,7 +7992,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17384,8 +17921,17 @@
+@@ -17384,8 +17922,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8002,7 +8012,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17403,7 +17949,7 @@
+@@ -17403,7 +17950,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8011,7 +8021,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17430,9 +17976,9 @@
+@@ -17430,9 +17977,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8023,7 +8033,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17447,7 +17993,7 @@
+@@ -17447,7 +17994,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8032,7 +8042,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17458,7 +18004,7 @@
+@@ -17458,7 +18005,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8041,7 +8051,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17520,22 +18066,19 @@
+@@ -17520,22 +18067,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8070,7 +8080,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,
-@@ -17545,6 +18088,30 @@
+@@ -17545,6 +18089,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8101,7 +8111,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17554,7 +18121,7 @@
+@@ -17554,7 +18122,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8110,7 +8120,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17583,7 +18150,11 @@
+@@ -17583,7 +18151,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8123,7 +8133,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
-@@ -17603,7 +18174,7 @@
+@@ -17603,7 +18175,7 @@
os2*)
libname_spec='$name'
@@ -8132,7 +8142,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17705,8 +18276,8 @@
+@@ -17705,8 +18277,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8143,7 +8153,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17782,7 +18353,8 @@
+@@ -17782,7 +18354,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.
@@ -8153,7 +8163,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 \
-@@ -17882,6 +18454,12 @@
+@@ -17882,6 +18455,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8166,7 +8176,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17912,7 +18490,7 @@
+@@ -17912,7 +18491,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8175,7 +8185,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17943,7 +18521,7 @@
+@@ -17943,7 +18522,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8184,7 +8194,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17958,7 +18536,7 @@
+@@ -17958,7 +18537,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8193,7 +8203,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18160,7 +18738,10 @@
+@@ -18160,7 +18739,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.
@@ -8205,7 +8215,7 @@
fi
-@@ -18193,7 +18774,7 @@
+@@ -18193,7 +18775,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8214,7 +8224,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18204,15 +18785,41 @@
+@@ -18204,15 +18786,41 @@
compiler=$CC
@@ -8256,7 +8266,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
-@@ -18239,18 +18846,20 @@
+@@ -18239,18 +18847,20 @@
# 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 \
@@ -8265,12 +8275,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18245: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18852: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18249: \$? = $ac_status" >&5
-+ echo "$as_me:18856: \$? = $ac_status" >&5
++ echo "$as_me:18857: \$? = $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
@@ -8282,7 +8292,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18327,7 +18936,7 @@
+@@ -18327,7 +18937,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8291,7 +8301,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18353,6 +18962,16 @@
+@@ -18353,6 +18963,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8308,7 +8318,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18364,7 +18983,7 @@
+@@ -18364,7 +18984,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.
@@ -8317,7 +8327,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18388,12 +19007,19 @@
+@@ -18388,12 +19008,19 @@
;;
linux*)
@@ -8338,7 +8348,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18414,9 +19040,14 @@
+@@ -18414,9 +19041,14 @@
;;
solaris*)
@@ -8354,7 +8364,7 @@
;;
sunos4*)
-@@ -18438,6 +19069,11 @@
+@@ -18438,6 +19070,11 @@
fi
;;
@@ -8366,7 +8376,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18472,18 +19108,20 @@
+@@ -18472,18 +19109,20 @@
# 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 \
@@ -8375,12 +8385,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18478: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19114: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19115: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18482: \$? = $ac_status" >&5
-+ echo "$as_me:19118: \$? = $ac_status" >&5
++ echo "$as_me:19119: \$? = $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
@@ -8392,7 +8402,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18504,7 +19142,7 @@
+@@ -18504,7 +19143,7 @@
fi
fi
@@ -8401,7 +8411,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18526,38 +19164,36 @@
+@@ -18526,38 +19165,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8423,12 +8433,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19176: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18549: \$? = $ac_status" >&5
-+ echo "$as_me:19180: \$? = $ac_status" >&5
++ echo "$as_me:19181: \$? = $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
@@ -8452,7 +8462,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18628,6 +19264,16 @@
+@@ -18628,6 +19265,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8469,7 +8479,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18648,6 +19294,27 @@
+@@ -18648,6 +19295,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8497,7 +8507,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18685,7 +19352,7 @@
+@@ -18685,7 +19353,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8506,7 +8516,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18695,13 +19362,13 @@
+@@ -18695,13 +19363,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'
@@ -8523,7 +8533,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
-@@ -18710,19 +19377,51 @@
+@@ -18710,19 +19378,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8580,7 +8590,7 @@
fi
;;
-@@ -18740,8 +19439,8 @@
+@@ -18740,8 +19440,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8591,7 +8601,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18756,24 +19455,19 @@
+@@ -18756,24 +19456,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8623,7 +8633,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18807,9 +19501,20 @@
+@@ -18807,9 +19502,20 @@
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
@@ -8646,7 +8656,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18826,7 +19531,7 @@
+@@ -18826,7 +19532,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8655,7 +8665,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`
-@@ -18847,6 +19552,9 @@
+@@ -18847,6 +19553,9 @@
fi
esac
shared_flag='-shared'
@@ -8665,7 +8675,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18855,21 +19563,22 @@
+@@ -18855,21 +19564,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8693,7 +8703,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18893,8 +19602,7 @@
+@@ -18893,8 +19603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8703,7 +8713,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18921,14 +19629,13 @@
+@@ -18921,14 +19630,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8721,7 +8731,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18955,8 +19662,7 @@
+@@ -18955,8 +19663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8731,7 +8741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18993,8 +19699,8 @@
+@@ -18993,8 +19700,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -8742,7 +8752,7 @@
fi
fi
;;
-@@ -19007,7 +19713,7 @@
+@@ -19007,7 +19714,7 @@
ld_shlibs_GCJ=no
;;
@@ -8751,7 +8761,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19017,68 +19723,68 @@
+@@ -19017,68 +19724,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8864,7 +8874,7 @@
fi
;;
-@@ -19112,8 +19818,8 @@
+@@ -19112,8 +19819,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8875,7 +8885,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19121,7 +19827,7 @@
+@@ -19121,7 +19828,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8884,7 +8894,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
-@@ -19137,16 +19843,16 @@
+@@ -19137,16 +19844,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8905,7 +8915,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19156,7 +19862,7 @@
+@@ -19156,7 +19863,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8914,7 +8924,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19189,7 +19895,7 @@
+@@ -19189,7 +19896,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8923,7 +8933,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'
-@@ -19199,7 +19905,7 @@
+@@ -19199,7 +19906,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8932,7 +8942,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
-@@ -19222,7 +19928,8 @@
+@@ -19222,7 +19929,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
@@ -8942,7 +8952,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19232,7 +19939,7 @@
+@@ -19232,7 +19940,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8951,7 +8961,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19243,14 +19950,14 @@
+@@ -19243,14 +19951,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8968,7 +8978,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'
-@@ -19262,13 +19969,13 @@
+@@ -19262,13 +19970,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8984,7 +8994,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19287,10 +19994,12 @@
+@@ -19287,10 +19995,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8999,7 +9009,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'
-@@ -19299,8 +20008,18 @@
+@@ -19299,8 +20009,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9020,7 +9030,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19309,7 +20028,7 @@
+@@ -19309,7 +20029,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.
@@ -9029,7 +9039,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19369,9 +20088,9 @@
+@@ -19369,9 +20089,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9041,7 +9051,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19477,7 +20196,7 @@
+@@ -19477,7 +20197,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9050,7 +9060,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19487,7 +20206,20 @@
+@@ -19487,7 +20207,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9072,7 +9082,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19552,7 +20284,7 @@
+@@ -19552,7 +20285,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9081,7 +9091,7 @@
;;
beos*)
-@@ -19561,7 +20293,7 @@
+@@ -19561,7 +20294,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9090,7 +9100,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19577,7 +20309,7 @@
+@@ -19577,7 +20310,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9099,7 +9109,7 @@
need_version=no
need_lib_prefix=no
-@@ -19589,7 +20321,8 @@
+@@ -19589,7 +20322,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9109,7 +9119,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19619,7 +20352,7 @@
+@@ -19619,7 +20353,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9118,7 +9128,7 @@
;;
esac
;;
-@@ -19642,7 +20375,7 @@
+@@ -19642,7 +20376,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9127,7 +9137,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"`
-@@ -19665,7 +20398,7 @@
+@@ -19665,7 +20399,7 @@
dynamic_linker=no
;;
@@ -9136,7 +9146,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19677,8 +20410,17 @@
+@@ -19677,8 +20411,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9156,7 +9166,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19696,7 +20438,7 @@
+@@ -19696,7 +20439,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9165,7 +9175,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19723,9 +20465,9 @@
+@@ -19723,9 +20466,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9177,7 +9187,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19740,7 +20482,7 @@
+@@ -19740,7 +20483,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9186,7 +9196,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19751,7 +20493,7 @@
+@@ -19751,7 +20494,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9195,7 +9205,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19813,22 +20555,19 @@
+@@ -19813,22 +20556,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9224,7 +9234,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,
-@@ -19838,6 +20577,30 @@
+@@ -19838,6 +20578,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9255,7 +9265,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19847,7 +20610,7 @@
+@@ -19847,7 +20611,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9264,7 +9274,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19876,7 +20639,11 @@
+@@ -19876,7 +20640,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9277,7 +9287,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
-@@ -19896,7 +20663,7 @@
+@@ -19896,7 +20664,7 @@
os2*)
libname_spec='$name'
@@ -9286,7 +9296,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19998,8 +20765,8 @@
+@@ -19998,8 +20766,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9297,7 +9307,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20125,8 +20892,7 @@
+@@ -20125,8 +20893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9307,7 +9317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20229,8 +20995,7 @@
+@@ -20229,8 +20996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9317,7 +9327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20295,8 +21060,7 @@
+@@ -20295,8 +21061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9327,7 +9337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20389,8 +21153,7 @@
+@@ -20389,8 +21154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9337,7 +9347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20455,8 +21218,7 @@
+@@ -20455,8 +21219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9347,7 +9357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20522,8 +21284,7 @@
+@@ -20522,8 +21285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9357,7 +9367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20589,8 +21350,7 @@
+@@ -20589,8 +21351,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9367,16 +9377,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20665,7 +21425,7 @@
+@@ -20665,7 +21426,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20668 "configure"
-+#line 21428 "configure"
++#line 21429 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20731,7 +21491,7 @@
+@@ -20731,7 +21492,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9385,16 +9395,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20763,7 +21523,7 @@
+@@ -20763,7 +21524,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20766 "configure"
-+#line 21526 "configure"
++#line 21527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20829,7 +21589,7 @@
+@@ -20829,7 +21590,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9403,7 +9413,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20880,7 +21640,8 @@
+@@ -20880,7 +21641,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.
@@ -9413,7 +9423,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 \
-@@ -20980,6 +21741,12 @@
+@@ -20980,6 +21742,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9426,7 +9436,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21010,7 +21777,7 @@
+@@ -21010,7 +21778,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9435,7 +9445,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21041,7 +21808,7 @@
+@@ -21041,7 +21809,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9444,7 +9454,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21056,7 +21823,7 @@
+@@ -21056,7 +21824,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9453,7 +9463,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21258,7 +22025,10 @@
+@@ -21258,7 +22026,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.
@@ -9465,7 +9475,7 @@
fi
-@@ -21301,11 +22071,35 @@
+@@ -21301,11 +22072,35 @@
compiler=$CC
@@ -9501,7 +9511,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21321,7 +22115,8 @@
+@@ -21321,7 +22116,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.
@@ -9511,7 +9521,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 \
-@@ -21421,6 +22216,12 @@
+@@ -21421,6 +22217,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9524,7 +9534,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21451,7 +22252,7 @@
+@@ -21451,7 +22253,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9533,7 +9543,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21482,7 +22283,7 @@
+@@ -21482,7 +22284,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9542,7 +9552,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21497,7 +22298,7 @@
+@@ -21497,7 +22299,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9551,7 +9561,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21699,7 +22500,10 @@
+@@ -21699,7 +22501,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.
@@ -9563,7 +9573,7 @@
fi
-@@ -21746,7 +22550,7 @@
+@@ -21746,7 +22551,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9572,7 +9582,7 @@
# Prevent multiple expansion
-@@ -21987,8 +22791,7 @@
+@@ -21987,8 +22792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9582,7 +9592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22062,9 +22865,6 @@
+@@ -22062,9 +22866,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9592,7 +9602,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22098,8 +22898,7 @@
+@@ -22098,8 +22899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9602,7 +9612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22203,8 +23002,7 @@
+@@ -22203,8 +23003,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9612,7 +9622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22283,9 +23081,6 @@
+@@ -22283,9 +23082,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9622,7 +9632,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22318,8 +23113,7 @@
+@@ -22318,8 +23114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9632,7 +9642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22422,8 +23216,7 @@
+@@ -22422,8 +23217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9642,7 +9652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22513,8 +23306,7 @@
+@@ -22513,8 +23307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9652,7 +9662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22575,8 +23367,7 @@
+@@ -22575,8 +23368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9662,7 +9672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22644,8 +23435,7 @@
+@@ -22644,8 +23436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9672,7 +9682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22711,8 +23501,7 @@
+@@ -22711,8 +23502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9682,7 +9692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22805,8 +23594,7 @@
+@@ -22805,8 +23595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9692,7 +9702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22884,8 +23672,7 @@
+@@ -22884,8 +23673,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9702,7 +9712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22969,8 +23756,7 @@
+@@ -22969,8 +23757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9712,7 +9722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23038,8 +23824,7 @@
+@@ -23038,8 +23825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9722,7 +9732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23134,8 +23919,7 @@
+@@ -23134,8 +23920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9732,7 +9742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23199,8 +23983,7 @@
+@@ -23199,8 +23984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9742,7 +9752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23295,8 +24078,7 @@
+@@ -23295,8 +24079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9752,7 +9762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23360,8 +24142,7 @@
+@@ -23360,8 +24143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9762,7 +9772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23457,8 +24238,7 @@
+@@ -23457,8 +24239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9772,7 +9782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23522,8 +24302,7 @@
+@@ -23522,8 +24303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9782,7 +9792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23620,8 +24399,7 @@
+@@ -23620,8 +24400,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9792,7 +9802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23686,8 +24464,7 @@
+@@ -23686,8 +24465,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9802,7 +9812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23755,8 +24532,7 @@
+@@ -23755,8 +24533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9812,7 +9822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23907,8 +24683,7 @@
+@@ -23907,8 +24684,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9822,7 +9832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24063,8 +24838,7 @@
+@@ -24063,8 +24839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9832,7 +9842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24129,8 +24903,7 @@
+@@ -24129,8 +24904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9842,7 +9852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24277,8 +25050,7 @@
+@@ -24277,8 +25051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9852,7 +9862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24433,8 +25205,7 @@
+@@ -24433,8 +25206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9862,7 +9872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24490,9 +25261,6 @@
+@@ -24490,9 +25262,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9872,7 +9882,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24526,8 +25294,7 @@
+@@ -24526,8 +25295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9882,7 +9892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24631,8 +25398,7 @@
+@@ -24631,8 +25399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9892,7 +9902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24732,8 +25498,7 @@
+@@ -24732,8 +25499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9902,7 +9912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24807,8 +25572,7 @@
+@@ -24807,8 +25573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9912,7 +9922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24871,8 +25635,7 @@
+@@ -24871,8 +25636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9922,7 +9932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24934,8 +25697,7 @@
+@@ -24934,8 +25698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9932,7 +9942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24975,8 +25737,7 @@
+@@ -24975,8 +25738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9942,7 +9952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25032,8 +25793,7 @@
+@@ -25032,8 +25794,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9952,7 +9962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25073,8 +25833,7 @@
+@@ -25073,8 +25834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9962,7 +9972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25138,8 +25897,7 @@
+@@ -25138,8 +25898,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9972,7 +9982,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25170,10 +25928,8 @@
+@@ -25170,10 +25929,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9985,7 +9995,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25284,8 +26040,7 @@
+@@ -25284,8 +26041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9995,7 +10005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25347,8 +26102,7 @@
+@@ -25347,8 +26103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10005,7 +10015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25388,8 +26142,7 @@
+@@ -25388,8 +26143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10015,7 +10025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25445,8 +26198,7 @@
+@@ -25445,8 +26199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10025,7 +10035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25486,8 +26238,7 @@
+@@ -25486,8 +26239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10035,7 +10045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25551,8 +26302,7 @@
+@@ -25551,8 +26303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10045,7 +10055,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25583,10 +26333,8 @@
+@@ -25583,10 +26334,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10058,7 +10068,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25697,8 +26445,7 @@
+@@ -25697,8 +26446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10068,7 +10078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25760,8 +26507,7 @@
+@@ -25760,8 +26508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10078,7 +10088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25801,8 +26547,7 @@
+@@ -25801,8 +26548,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10088,7 +10098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25858,8 +26603,7 @@
+@@ -25858,8 +26604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10098,7 +10108,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25899,8 +26643,7 @@
+@@ -25899,8 +26644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10108,7 +10118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25964,8 +26707,7 @@
+@@ -25964,8 +26708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10118,7 +10128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25996,10 +26738,8 @@
+@@ -25996,10 +26739,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10131,7 +10141,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26110,8 +26850,7 @@
+@@ -26110,8 +26851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10141,7 +10151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26173,8 +26912,7 @@
+@@ -26173,8 +26913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10151,7 +10161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26214,8 +26952,7 @@
+@@ -26214,8 +26953,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10161,7 +10171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26271,8 +27008,7 @@
+@@ -26271,8 +27009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10171,7 +10181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26312,8 +27048,7 @@
+@@ -26312,8 +27049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10181,7 +10191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26377,8 +27112,7 @@
+@@ -26377,8 +27113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10191,7 +10201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26409,10 +27143,8 @@
+@@ -26409,10 +27144,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10204,7 +10214,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26531,8 +27263,7 @@
+@@ -26531,8 +27264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10214,7 +10224,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26603,8 +27334,7 @@
+@@ -26603,8 +27335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10224,7 +10234,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26674,8 +27404,7 @@
+@@ -26674,8 +27405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10234,7 +10244,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26737,8 +27466,7 @@
+@@ -26737,8 +27467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10244,7 +10254,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26778,8 +27506,7 @@
+@@ -26778,8 +27507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10254,7 +10264,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26835,8 +27562,7 @@
+@@ -26835,8 +27563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10264,7 +10274,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26876,8 +27602,7 @@
+@@ -26876,8 +27603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10274,7 +10284,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26941,8 +27666,7 @@
+@@ -26941,8 +27667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10284,7 +10294,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26973,10 +27697,8 @@
+@@ -26973,10 +27698,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10297,7 +10307,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27088,8 +27810,7 @@
+@@ -27088,8 +27811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10307,7 +10317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27151,8 +27872,7 @@
+@@ -27151,8 +27873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10317,7 +10327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27192,8 +27912,7 @@
+@@ -27192,8 +27913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10327,7 +10337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27249,8 +27968,7 @@
+@@ -27249,8 +27969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10337,7 +10347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27290,8 +28008,7 @@
+@@ -27290,8 +28009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10347,7 +10357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27355,8 +28072,7 @@
+@@ -27355,8 +28073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10357,7 +10367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27387,10 +28103,8 @@
+@@ -27387,10 +28104,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10370,7 +10380,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27501,8 +28215,7 @@
+@@ -27501,8 +28216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10380,7 +10390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27583,8 +28296,7 @@
+@@ -27583,8 +28297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10390,7 +10400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27684,8 +28396,7 @@
+@@ -27684,8 +28397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10400,7 +10410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27865,8 +28576,7 @@
+@@ -27865,8 +28577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10410,7 +10420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27975,8 +28685,7 @@
+@@ -27975,8 +28686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10420,7 +10430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28200,8 +28909,7 @@
+@@ -28200,8 +28910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10430,7 +10440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28424,8 +29132,7 @@
+@@ -28424,8 +29133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10440,7 +10450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28501,8 +29208,7 @@
+@@ -28501,8 +29209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10450,7 +10460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28728,8 +29434,7 @@
+@@ -28728,8 +29435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10460,7 +10470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28804,8 +29509,7 @@
+@@ -28804,8 +29510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10470,7 +10480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28865,8 +29569,7 @@
+@@ -28865,8 +29570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10480,7 +10490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28949,8 +29652,7 @@
+@@ -28949,8 +29653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10490,7 +10500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29043,8 +29745,7 @@
+@@ -29043,8 +29746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10500,7 +10510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29218,8 +29919,7 @@
+@@ -29218,8 +29920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10510,7 +10520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29317,8 +30017,7 @@
+@@ -29317,8 +30018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10520,7 +10530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29405,8 +30104,7 @@
+@@ -29405,8 +30105,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10530,7 +10540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29483,8 +30181,7 @@
+@@ -29483,8 +30182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10540,25 +10550,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29537,7 +30234,7 @@
+@@ -29537,7 +30235,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29540: $i/$j" >&5
-+ echo "configure: 30237: $i/$j" >&5
++ echo "configure: 30238: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29835,7 +30532,7 @@
+@@ -29835,7 +30533,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 29838: $i/$j" >&5
-+ echo "configure: 30535: $i/$j" >&5
++ echo "configure: 30536: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30512,8 +31209,7 @@
+@@ -30512,8 +31210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10568,43 +10578,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30672,7 +31368,7 @@
+@@ -30672,7 +31369,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30675: $i/$j" >&5
-+ echo "configure: 31371: $i/$j" >&5
++ echo "configure: 31372: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30702,7 +31398,7 @@
+@@ -30702,7 +31399,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30705: $i/$j" >&5
-+ echo "configure: 31401: $i/$j" >&5
++ echo "configure: 31402: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30720,7 +31416,7 @@
+@@ -30720,7 +31417,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30723: $i/$j" >&5
-+ echo "configure: 31419: $i/$j" >&5
++ echo "configure: 31420: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32243,7 +32939,7 @@
+@@ -32243,7 +32940,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32246: $i/$j" >&5
-+ echo "configure: 32942: $i/$j" >&5
++ echo "configure: 32943: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32501,8 +33197,7 @@
+@@ -32501,8 +33198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10614,7 +10624,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32597,8 +33292,7 @@
+@@ -32597,8 +33293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10624,7 +10634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32691,8 +33385,7 @@
+@@ -32691,8 +33386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10634,16 +10644,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32764,7 +33457,7 @@
+@@ -32764,7 +33458,7 @@
do
for j in qsql.html;
do
- echo "configure: 32767: $i/$j" >&5
-+ echo "configure: 33460: $i/$j" >&5
++ echo "configure: 33461: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32957,8 +33650,7 @@
+@@ -32957,8 +33651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10653,7 +10663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33108,8 +33800,7 @@
+@@ -33108,8 +33801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10663,7 +10673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33258,8 +33949,7 @@
+@@ -33258,8 +33950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10673,7 +10683,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33412,8 +34102,7 @@
+@@ -33412,8 +34103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10683,7 +10693,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33567,8 +34256,7 @@
+@@ -33567,8 +34257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10693,7 +10703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33720,8 +34408,7 @@
+@@ -33720,8 +34409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10703,7 +10713,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33860,8 +34547,7 @@
+@@ -33860,8 +34548,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10713,7 +10723,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33938,8 +34624,7 @@
+@@ -33938,8 +34625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10723,7 +10733,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33968,8 +34653,7 @@
+@@ -33968,8 +34654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10733,7 +10743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34039,8 +34723,7 @@
+@@ -34039,8 +34724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10743,7 +10753,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34092,8 +34775,7 @@
+@@ -34092,8 +34776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10753,7 +10763,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34164,8 +34846,7 @@
+@@ -34164,8 +34847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10763,7 +10773,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34217,8 +34898,7 @@
+@@ -34217,8 +34899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10773,7 +10783,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34329,8 +35009,7 @@
+@@ -34329,8 +35010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10783,7 +10793,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34384,9 +35063,6 @@
+@@ -34384,9 +35064,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10793,7 +10803,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34419,8 +35095,7 @@
+@@ -34419,8 +35096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10803,7 +10813,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34523,8 +35198,7 @@
+@@ -34523,8 +35199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10813,7 +10823,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34655,8 +35329,7 @@
+@@ -34655,8 +35330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10823,7 +10833,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34710,9 +35383,6 @@
+@@ -34710,9 +35384,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10833,7 +10843,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34743,8 +35413,7 @@
+@@ -34743,8 +35414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10843,7 +10853,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34845,8 +35514,7 @@
+@@ -34845,8 +35515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10853,7 +10863,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34925,9 +35593,6 @@
+@@ -34925,9 +35594,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10863,7 +10873,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34958,8 +35623,7 @@
+@@ -34958,8 +35624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10873,7 +10883,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35060,8 +35724,7 @@
+@@ -35060,8 +35725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10883,7 +10893,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35140,9 +35803,6 @@
+@@ -35140,9 +35804,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10893,7 +10903,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35178,8 +35838,7 @@
+@@ -35178,8 +35839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10903,7 +10913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35286,8 +35945,7 @@
+@@ -35286,8 +35946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10913,7 +10923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35366,9 +36024,6 @@
+@@ -35366,9 +36025,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10923,7 +10933,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35403,8 +36058,7 @@
+@@ -35403,8 +36059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10933,7 +10943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35509,8 +36163,7 @@
+@@ -35509,8 +36164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10943,7 +10953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35602,8 +36255,7 @@
+@@ -35602,8 +36256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10953,7 +10963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35645,8 +36297,7 @@
+@@ -35645,8 +36298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10963,7 +10973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35703,8 +36354,7 @@
+@@ -35703,8 +36355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10973,7 +10983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35863,8 +36513,7 @@
+@@ -35863,8 +36514,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10983,7 +10993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35928,8 +36577,7 @@
+@@ -35928,8 +36578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10993,7 +11003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35994,8 +36642,7 @@
+@@ -35994,8 +36643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11003,7 +11013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36059,8 +36706,7 @@
+@@ -36059,8 +36707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11013,7 +11023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36136,8 +36782,7 @@
+@@ -36136,8 +36783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11023,7 +11033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36285,8 +36930,7 @@
+@@ -36285,8 +36931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11033,16 +11043,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36363,7 +37007,7 @@
+@@ -36363,7 +37008,7 @@
do
for j in qsql.html;
do
- echo "configure: 36366: $i/$j" >&5
-+ echo "configure: 37010: $i/$j" >&5
++ echo "configure: 37011: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -36553,8 +37197,7 @@
+@@ -36553,8 +37198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11052,7 +11062,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36635,8 +37278,7 @@
+@@ -36635,8 +37279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11062,7 +11072,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37094,8 +37736,7 @@
+@@ -37094,8 +37737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11072,7 +11082,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37165,8 +37806,7 @@
+@@ -37165,8 +37807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11082,7 +11092,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37228,8 +37868,7 @@
+@@ -37228,8 +37869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11092,7 +11102,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37269,8 +37908,7 @@
+@@ -37269,8 +37909,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11102,7 +11112,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37326,8 +37964,7 @@
+@@ -37326,8 +37965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11112,7 +11122,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37367,8 +38004,7 @@
+@@ -37367,8 +38005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11122,7 +11132,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37432,8 +38068,7 @@
+@@ -37432,8 +38069,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11132,7 +11142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37464,10 +38099,8 @@
+@@ -37464,10 +38100,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11145,7 +11155,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37578,8 +38211,7 @@
+@@ -37578,8 +38212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11155,7 +11165,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37641,8 +38273,7 @@
+@@ -37641,8 +38274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11165,7 +11175,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37682,8 +38313,7 @@
+@@ -37682,8 +38314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11175,7 +11185,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37739,8 +38369,7 @@
+@@ -37739,8 +38370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11185,7 +11195,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37780,8 +38409,7 @@
+@@ -37780,8 +38410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11195,7 +11205,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37845,8 +38473,7 @@
+@@ -37845,8 +38474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11205,7 +11215,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37877,10 +38504,8 @@
+@@ -37877,10 +38505,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11218,7 +11228,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37991,8 +38616,7 @@
+@@ -37991,8 +38617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11228,7 +11238,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38054,8 +38678,7 @@
+@@ -38054,8 +38679,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11238,7 +11248,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38095,8 +38718,7 @@
+@@ -38095,8 +38719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11248,7 +11258,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38152,8 +38774,7 @@
+@@ -38152,8 +38775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11258,7 +11268,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38193,8 +38814,7 @@
+@@ -38193,8 +38815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11268,7 +11278,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38258,8 +38878,7 @@
+@@ -38258,8 +38879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11278,7 +11288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38290,10 +38909,8 @@
+@@ -38290,10 +38910,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11291,7 +11301,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38404,8 +39021,7 @@
+@@ -38404,8 +39022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11301,7 +11311,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38467,8 +39083,7 @@
+@@ -38467,8 +39084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11311,7 +11321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38508,8 +39123,7 @@
+@@ -38508,8 +39124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11321,7 +11331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38565,8 +39179,7 @@
+@@ -38565,8 +39180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11331,7 +11341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38606,8 +39219,7 @@
+@@ -38606,8 +39220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11341,7 +11351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38671,8 +39283,7 @@
+@@ -38671,8 +39284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11351,7 +11361,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38703,10 +39314,8 @@
+@@ -38703,10 +39315,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11364,7 +11374,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38841,8 +39450,7 @@
+@@ -38841,8 +39451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11374,7 +11384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39011,8 +39619,7 @@
+@@ -39011,8 +39620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11384,7 +11394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39089,8 +39696,7 @@
+@@ -39089,8 +39697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11394,7 +11404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39249,8 +39855,7 @@
+@@ -39249,8 +39856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11404,7 +11414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39313,8 +39918,7 @@
+@@ -39313,8 +39919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11414,7 +11424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39396,8 +40000,7 @@
+@@ -39396,8 +40001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11424,7 +11434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39477,8 +40080,7 @@
+@@ -39477,8 +40081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11434,7 +11444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39608,8 +40210,7 @@
+@@ -39608,8 +40211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11444,7 +11454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39737,8 +40338,20 @@
+@@ -39737,8 +40339,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -11467,7 +11477,7 @@
if ( maj != 1 ) {
return 1;
}
-@@ -39891,8 +40504,7 @@
+@@ -39891,8 +40505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11477,16 +11487,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39981,7 +40593,7 @@
+@@ -39981,7 +40594,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 39984: $i/$j" >&5
-+ echo "configure: 40596: $i/$j" >&5
++ echo "configure: 40597: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -40036,8 +40648,7 @@
+@@ -40036,8 +40649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11496,7 +11506,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40353,8 +40964,7 @@
+@@ -40353,8 +40965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11506,7 +11516,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40459,8 +41069,7 @@
+@@ -40459,8 +41070,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11516,7 +11526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40559,8 +41168,7 @@
+@@ -40559,8 +41169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11526,7 +11536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40730,8 +41338,7 @@
+@@ -40730,8 +41339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11536,7 +11546,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41149,8 +41756,7 @@
+@@ -41149,8 +41757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11546,7 +11556,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41192,8 +41798,7 @@
+@@ -41192,8 +41799,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11556,7 +11566,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41250,8 +41855,7 @@
+@@ -41250,8 +41856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11566,7 +11576,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41419,8 +42023,7 @@
+@@ -41419,8 +42024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11576,7 +11586,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41480,8 +42083,7 @@
+@@ -41480,8 +42084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11586,7 +11596,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41554,8 +42156,7 @@
+@@ -41554,8 +42157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11596,7 +11606,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41619,8 +42220,7 @@
+@@ -41619,8 +42221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11606,7 +11616,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41684,8 +42284,7 @@
+@@ -41684,8 +42285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11616,7 +11626,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41750,8 +42349,7 @@
+@@ -41750,8 +42350,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11626,7 +11636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41816,8 +42414,7 @@
+@@ -41816,8 +42415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11636,7 +11646,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41920,8 +42517,7 @@
+@@ -41920,8 +42518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11646,7 +11656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42059,8 +42655,7 @@
+@@ -42059,8 +42656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11656,7 +11666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42126,8 +42721,7 @@
+@@ -42126,8 +42722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11666,7 +11676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42283,8 +42877,7 @@
+@@ -42283,8 +42878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11676,16 +11686,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42371,7 +42964,7 @@
+@@ -42371,7 +42965,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 42374: $i/$j" >&5
-+ echo "configure: 42967: $i/$j" >&5
++ echo "configure: 42968: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42426,8 +43019,7 @@
+@@ -42426,8 +43020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11695,7 +11705,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42659,8 +43251,7 @@
+@@ -42659,8 +43252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11705,7 +11715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42817,8 +43408,7 @@
+@@ -42817,8 +43409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11715,7 +11725,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42997,8 +43587,7 @@
+@@ -42997,8 +43588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11725,7 +11735,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43064,8 +43653,7 @@
+@@ -43064,8 +43654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11735,7 +11745,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43802,7 @@
+@@ -43214,8 +43803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11745,7 +11755,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43297,8 +43884,7 @@
+@@ -43297,8 +43885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11755,7 +11765,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43403,8 +43989,7 @@
+@@ -43403,8 +43990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11765,7 +11775,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43470,8 +44055,7 @@
+@@ -43470,8 +44056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11775,7 +11785,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43517,8 +44101,7 @@
+@@ -43517,8 +44102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11785,7 +11795,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43606,8 +44189,7 @@
+@@ -43606,8 +44190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11795,7 +11805,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43669,8 +44251,7 @@
+@@ -43669,8 +44252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11805,7 +11815,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43730,8 +44311,7 @@
+@@ -43730,8 +44312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11815,7 +11825,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44744,6 +45324,13 @@
+@@ -44744,6 +45325,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11829,7 +11839,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
-@@ -45869,6 +46456,9 @@
+@@ -45869,6 +46457,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -11839,7 +11849,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46307,11 +46897,6 @@
+@@ -46307,11 +46898,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11851,7 +11861,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -46350,6 +46935,12 @@
+@@ -46350,6 +46936,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11875,7 +11885,17 @@
KDE_SET_PREFIX
dnl generate the config header
-@@ -526,8 +528,20 @@
+@@ -214,7 +216,8 @@
+
+ KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui'
+
+-AC_ARG_ENABLE(smpppd, [ --enable-smpppd enable support for smpppd],
++AC_ARG_ENABLE(smpppd,
++[AC_HELP_STRING([--enable-smpppd], [enable support for the SuSE Meta PPP Daemon (smpppd) (default is NO)])],
+ [
+ if test $enableval = yes; then
+ AC_DEFINE(USE_SMPPPD, 1, [enable support for the smpppd])
+@@ -526,8 +529,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -16138,6 +16158,21 @@
echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
--- kopete/plugins/smpppdcs/config/Makefile.in
+++ kopete/plugins/smpppdcs/config/Makefile.in
+@@ -64,12 +64,12 @@
+ kcm_kopete_smpppdcs_la_DEPENDENCIES = ../../../libkopete/libkopete.la \
+ $(am__DEPENDENCIES_1)
+ am_kcm_kopete_smpppdcs_la_OBJECTS = smpppdcspreferences.lo \
+- smpppdsearcher.lo smpppdcsprefsimpl.lo
++ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo
+ #>- kcm_kopete_smpppdcs_la_OBJECTS = $(am_kcm_kopete_smpppdcs_la_OBJECTS)
+ #>+ 5
+ kcm_kopete_smpppdcs_la_final_OBJECTS = kcm_kopete_smpppdcs_la.all_cpp.lo
+ kcm_kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcspreferences.lo \
+- smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdcsprefs.lo
++ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo smpppdcsprefs.lo smpppdlocationui.lo
+ @KDE_USE_FINAL_FALSE at kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -247,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -16148,8 +16183,29 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -442,10 +445,10 @@
+ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
+ kde_module_LTLIBRARIES = kcm_kopete_smpppdcs.la
+ #>- kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
+-#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp
++#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationui.ui smpppdlocationwidget.cpp
+ #>+ 2
+ kcm_kopete_smpppdcs_la_SOURCES= smpppdcspreferences.cpp \
+- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdcsprefs.cpp
++ smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp
+ #>- kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+ #>+ 1
+@@ -453,14 +456,14 @@
+ kcm_kopete_smpppdcs_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
+ kcm_DATA = kopete_smpppdcs_config.desktop
+ kcmdir = $(kde_servicesdir)/kconfiguredialog
+-noinst_HEADERS = smpppdsearcher.h smpppdcsprefsimpl.h
++noinst_HEADERS = smpppdsearcher.h smpppdcsprefsimpl.h smpppdlocationwidget.h
+ #>- all: all-am
+ #>+ 1
+ all: docs-am all-am
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -16169,6 +16225,110 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -543,6 +546,7 @@
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcspreferences.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsprefsimpl.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdlocationwidget.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdsearcher.Plo at am__quote@
+
+ .cpp.o:
+@@ -801,6 +805,13 @@
+ mocs: smpppdcspreferences.moc
+
+ #>+ 3
++smpppdlocationwidget.moc: $(srcdir)/smpppdlocationwidget.h
++ $(MOC) $(srcdir)/smpppdlocationwidget.h -o smpppdlocationwidget.moc
++
++#>+ 2
++mocs: smpppdlocationwidget.moc
++
++#>+ 3
+ smpppdsearcher.moc: $(srcdir)/smpppdsearcher.h
+ $(MOC) $(srcdir)/smpppdsearcher.h -o smpppdsearcher.moc
+
+@@ -809,15 +820,16 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdsearcher.moc
++ -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdlocationwidget.moc smpppdsearcher.moc
+
+ #>+ 2
+-KDE_DIST=kopete_smpppdcs_config.desktop smpppdcspreferences.h smpppdcsprefs.ui Makefile.in Makefile.am
++KDE_DIST=kopete_smpppdcs_config.desktop smpppdlocationui.ui smpppdcspreferences.h smpppdcsprefs.ui Makefile.in Makefile.am
+
+-#>+ 4
++#>+ 5
+ clean-ui:
+ -rm -f \
+- smpppdcsprefs.cpp smpppdcsprefs.h smpppdcsprefs.moc
++ smpppdcsprefs.cpp smpppdcsprefs.h smpppdcsprefs.moc \
++ smpppdlocationui.cpp smpppdlocationui.h smpppdlocationui.moc
+
+ #>+ 3
+ clean-closures:
+@@ -865,11 +877,11 @@
+
+
+ #>+ 11
+-kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp smpppdcsprefs.cpp smpppdcspreferences.moc smpppdcsprefsimpl.moc smpppdsearcher.moc smpppdcsprefs.moc
++kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcspreferences.moc smpppdcsprefsimpl.moc smpppdlocationwidget.moc smpppdlocationui.moc smpppdsearcher.moc smpppdcsprefs.moc
+ @echo 'creating kcm_kopete_smpppdcs_la.all_cpp.cpp ...'; \
+ rm -f kcm_kopete_smpppdcs_la.all_cpp.files kcm_kopete_smpppdcs_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kopete_smpppdcs_la.all_cpp.final; \
+- for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdcsprefs.cpp ; do \
++ for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp ; do \
+ echo "#include \"$$file\"" >> kcm_kopete_smpppdcs_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_kopete_smpppdcs_la.all_cpp.final; \
+ done; \
+@@ -900,20 +912,38 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 12
+-nmcheck:
++#>+ 15
++$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h smpppdlocationui.h
++smpppdlocationwidget.lo: smpppdlocationwidget.moc
++smpppdcsprefsimpl.lo: smpppdcsprefsimpl.moc
++smpppdlocationwidget.o: smpppdlocationwidget.moc
++$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h smpppdlocationui.h
++smpppdcspreferences.lo: smpppdcspreferences.moc
+ smpppdsearcher.lo: smpppdsearcher.moc
+-$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h
+-$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h
++nmcheck:
+ smpppdsearcher.o: smpppdsearcher.moc
+-smpppdcsprefsimpl.lo: smpppdcsprefsimpl.moc
++$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h smpppdlocationui.h
+ smpppdcsprefsimpl.o: smpppdcsprefsimpl.moc
+ nmcheck-am: nmcheck
+-$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h
++$(srcdir)/smpppdlocationwidget.cpp: smpppdcsprefs.h smpppdlocationui.h
+ smpppdcspreferences.o: smpppdcspreferences.moc
+-smpppdcspreferences.lo: smpppdcspreferences.moc
+
+-#>+ 15
++#>+ 30
++smpppdlocationui.cpp: $(srcdir)/smpppdlocationui.ui smpppdlocationui.h smpppdlocationui.moc
++ rm -f smpppdlocationui.cpp
++ echo '#include <kdialog.h>' > smpppdlocationui.cpp
++ echo '#include <klocale.h>' >> smpppdlocationui.cpp
++ $(UIC) -tr ${UIC_TR} -i smpppdlocationui.h $(srcdir)/smpppdlocationui.ui > smpppdlocationui.cpp.temp ; ret=$$?; \
++ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" smpppdlocationui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_smpppdlocationui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> smpppdlocationui.cpp ;\
++ rm -f smpppdlocationui.cpp.temp ;\
++ if test "$$ret" = 0; then echo '#include "smpppdlocationui.moc"' >> smpppdlocationui.cpp; else rm -f smpppdlocationui.cpp ; exit $$ret ; fi
++
++smpppdlocationui.h: $(srcdir)/smpppdlocationui.ui
++ rm -rf smpppdlocationui.h;
++ $(UIC) $(srcdir)/smpppdlocationui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> smpppdlocationui.h ;
++smpppdlocationui.moc: smpppdlocationui.h
++ $(MOC) smpppdlocationui.h -o smpppdlocationui.moc
++
+ smpppdcsprefs.cpp: $(srcdir)/smpppdcsprefs.ui smpppdcsprefs.h smpppdcsprefs.moc
+ rm -f smpppdcsprefs.cpp
+ echo '#include <kdialog.h>' > smpppdcsprefs.cpp
--- kopete/plugins/smpppdcs/icons/Makefile.in
+++ kopete/plugins/smpppdcs/icons/Makefile.in
@@ -196,6 +196,9 @@
More information about the pkg-kde-commits
mailing list