[pkg-kde-commits] rev 2636 - trunk/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Dec 15 03:59:27 UTC 2005
Author: chrsmrtn
Date: 2005-12-15 03:59:24 +0000 (Thu, 15 Dec 2005)
New Revision: 2636
Modified:
trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Buildprep update for kdelibs.
Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2005-12-15 03:58:52 UTC (rev 2635)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2005-12-15 03:59:24 UTC (rev 2636)
@@ -3169,7 +3169,17 @@
@$(NORMAL_INSTALL)
--- config.h.in
+++ config.h.in
-@@ -283,6 +283,9 @@
+@@ -217,6 +217,9 @@
+ /* Define if you have the initgroups prototype */
+ #undef HAVE_INITGROUPS_PROTO
+
++/* Define if your system has Linux Inode Notification */
++#undef HAVE_INOTIFY
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+@@ -283,6 +286,9 @@
/* Define to 1 if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
@@ -3179,7 +3189,7 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
-@@ -552,6 +555,9 @@
+@@ -552,6 +558,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
@@ -3189,7 +3199,7 @@
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
-@@ -579,6 +585,12 @@
+@@ -579,6 +588,12 @@
/* Define if sys/stat.h declares S_ISSOCK. */
#undef HAVE_S_ISSOCK
@@ -3241,7 +3251,15 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1213,7 +1215,7 @@
+@@ -1068,6 +1070,7 @@
+ --disable-cups disable CUPS support default=auto
+ --disable-libfam don't search for libfam and do not use it
+ --enable-dnotify enable use of Linux directory notifications
++ --enable-inotify enable use of Linux inode notifications
+ --disable-pcre don't require libpcre (poor RegExp support in
+ Javascript)
+
+@@ -1213,7 +1216,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -3250,7 +3268,7 @@
done
fi
-@@ -2155,6 +2157,31 @@
+@@ -2155,6 +2158,31 @@
@@ -3282,7 +3300,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -2947,8 +2974,7 @@
+@@ -2947,8 +2975,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3292,7 +3310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3006,8 +3032,7 @@
+@@ -3006,8 +3033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3302,7 +3320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3123,8 +3148,7 @@
+@@ -3123,8 +3149,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3312,7 +3330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3178,8 +3202,7 @@
+@@ -3178,8 +3203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3322,7 +3340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3224,8 +3247,7 @@
+@@ -3224,8 +3248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3332,7 +3350,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3269,8 +3291,7 @@
+@@ -3269,8 +3292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3342,7 +3360,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3827,8 +3848,7 @@
+@@ -3827,8 +3849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3352,7 +3370,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3886,8 +3906,7 @@
+@@ -3886,8 +3907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3362,7 +3380,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3958,8 +3977,7 @@
+@@ -3958,8 +3978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3372,7 +3390,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4003,8 +4021,7 @@
+@@ -4003,8 +4022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3382,7 +3400,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4182,8 +4199,7 @@
+@@ -4182,8 +4200,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3392,7 +3410,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4294,8 +4310,7 @@
+@@ -4294,8 +4311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3402,7 +3420,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4383,8 +4398,7 @@
+@@ -4383,8 +4399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3412,7 +3430,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4486,8 +4500,7 @@
+@@ -4486,8 +4501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3422,7 +3440,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4586,8 +4599,7 @@
+@@ -4586,8 +4600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3432,7 +3450,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4671,8 +4683,7 @@
+@@ -4671,8 +4684,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3442,7 +3460,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4761,8 +4772,7 @@
+@@ -4761,8 +4773,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3452,7 +3470,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4849,8 +4859,7 @@
+@@ -4849,8 +4860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3462,7 +3480,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4937,8 +4946,7 @@
+@@ -4937,8 +4947,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3472,7 +3490,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5044,8 +5052,7 @@
+@@ -5044,8 +5053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3482,7 +3500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5132,8 +5139,7 @@
+@@ -5132,8 +5140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3492,7 +3510,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5220,8 +5226,7 @@
+@@ -5220,8 +5227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3502,7 +3520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5308,8 +5313,7 @@
+@@ -5308,8 +5314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3512,7 +3530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5440,8 +5444,7 @@
+@@ -5440,8 +5445,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3522,7 +3540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5529,8 +5532,7 @@
+@@ -5529,8 +5533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3532,7 +3550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5617,8 +5619,7 @@
+@@ -5617,8 +5620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3542,7 +3560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5705,8 +5706,7 @@
+@@ -5705,8 +5707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3552,7 +3570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5793,8 +5793,7 @@
+@@ -5793,8 +5794,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3562,7 +3580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5881,8 +5880,7 @@
+@@ -5881,8 +5881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3572,7 +3590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6305,8 +6303,7 @@
+@@ -6305,8 +6304,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3582,7 +3600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6432,8 +6429,7 @@
+@@ -6432,8 +6430,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3592,7 +3610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6521,8 +6517,7 @@
+@@ -6521,8 +6518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3602,7 +3620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6605,185 +6600,6 @@
+@@ -6605,185 +6601,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3788,7 +3806,7 @@
fi
-@@ -6960,7 +6776,7 @@
+@@ -6960,7 +6777,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
@@ -3797,7 +3815,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7065,7 +6881,7 @@
+@@ -7065,7 +6882,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,
@@ -3806,7 +3824,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'*)
-@@ -7099,7 +6915,7 @@
+@@ -7099,7 +6916,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3815,7 +3833,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7129,6 +6945,15 @@
+@@ -7129,6 +6946,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3831,7 +3849,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7215,44 +7040,36 @@
+@@ -7215,44 +7041,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3886,7 +3904,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7268,7 +7085,7 @@
+@@ -7268,7 +7086,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3895,7 +3913,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
-@@ -7285,42 +7102,21 @@
+@@ -7285,42 +7103,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3945,7 +3963,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
-@@ -7339,19 +7135,14 @@
+@@ -7339,19 +7136,14 @@
;;
openbsd*)
@@ -3967,7 +3985,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7361,7 +7152,6 @@
+@@ -7361,7 +7153,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3975,16 +3993,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7438,7 +7228,7 @@
+@@ -7438,7 +7229,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7441 "configure"' > conftest.$ac_ext
-+ echo '#line 7231 "configure"' > conftest.$ac_ext
++ echo '#line 7232 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7481,14 +7271,13 @@
+@@ -7481,14 +7272,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4001,7 +4019,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7500,7 +7289,6 @@
+@@ -7500,7 +7290,6 @@
esac
;;
*64-bit*)
@@ -4009,7 +4027,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7560,8 +7348,7 @@
+@@ -7560,8 +7349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4019,7 +4037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7636,8 +7423,7 @@
+@@ -7636,8 +7424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4029,7 +4047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7807,8 +7593,7 @@
+@@ -7807,8 +7594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4039,7 +4057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7875,8 +7660,7 @@
+@@ -7875,8 +7661,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4049,7 +4067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7991,6 +7775,243 @@
+@@ -7991,6 +7776,243 @@
done
@@ -4293,16 +4311,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'
-@@ -8083,7 +8104,7 @@
+@@ -8083,7 +8105,7 @@
# Provide some information about the compiler.
-echo "$as_me:8086:" \
-+echo "$as_me:8107:" \
++echo "$as_me:8108:" \
"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
-@@ -8129,8 +8150,7 @@
+@@ -8129,8 +8151,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4312,7 +4330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8179,8 +8199,7 @@
+@@ -8179,8 +8200,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4322,7 +4340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8238,7 +8257,7 @@
+@@ -8238,7 +8258,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4331,7 +4349,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8267,20 +8286,53 @@
+@@ -8267,20 +8287,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4391,7 +4409,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.
-@@ -8317,9 +8369,6 @@
+@@ -8317,9 +8370,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4401,7 +4419,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'"
-@@ -8341,6 +8390,13 @@
+@@ -8341,6 +8391,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'"
;;
@@ -4415,7 +4433,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8348,7 +8404,7 @@
+@@ -8348,7 +8405,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4424,7 +4442,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8366,14 +8422,17 @@
+@@ -8366,14 +8423,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4444,7 +4462,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8535,7 +8594,7 @@
+@@ -8535,7 +8595,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4453,7 +4471,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8555,7 +8614,7 @@
+@@ -8555,7 +8615,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4462,7 +4480,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8840,6 +8899,17 @@
+@@ -8840,6 +8900,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4480,7 +4498,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8865,7 +8935,7 @@
+@@ -8865,7 +8936,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4489,7 +4507,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
-@@ -8927,7 +8997,7 @@
+@@ -8927,7 +8998,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4498,7 +4516,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
-@@ -9026,6 +9096,20 @@
+@@ -9026,6 +9097,20 @@
compiler=$CC
@@ -4519,7 +4537,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9062,11 +9146,16 @@
+@@ -9062,11 +9147,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
@@ -4537,7 +4555,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9112,18 +9201,20 @@
+@@ -9112,18 +9202,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 \
@@ -4546,12 +4564,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9118: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9207: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9208: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9122: \$? = $ac_status" >&5
-+ echo "$as_me:9211: \$? = $ac_status" >&5
++ echo "$as_me:9212: \$? = $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
@@ -4563,7 +4581,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9200,7 +9291,7 @@
+@@ -9200,7 +9292,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4572,7 +4590,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9226,6 +9317,16 @@
+@@ -9226,6 +9318,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4589,7 +4607,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9237,7 +9338,7 @@
+@@ -9237,7 +9339,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.
@@ -4598,7 +4616,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9261,12 +9362,19 @@
+@@ -9261,12 +9363,19 @@
;;
linux*)
@@ -4619,7 +4637,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9287,9 +9395,14 @@
+@@ -9287,9 +9396,14 @@
;;
solaris*)
@@ -4635,7 +4653,7 @@
;;
sunos4*)
-@@ -9311,6 +9424,11 @@
+@@ -9311,6 +9425,11 @@
fi
;;
@@ -4647,7 +4665,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9345,18 +9463,20 @@
+@@ -9345,18 +9464,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 \
@@ -4656,12 +4674,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9351: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9355: \$? = $ac_status" >&5
-+ echo "$as_me:9473: \$? = $ac_status" >&5
++ echo "$as_me:9474: \$? = $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
@@ -4673,7 +4691,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9377,7 +9497,7 @@
+@@ -9377,7 +9498,7 @@
fi
fi
@@ -4682,7 +4700,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9399,38 +9519,36 @@
+@@ -9399,38 +9520,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4704,12 +4722,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9531: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9422: \$? = $ac_status" >&5
-+ echo "$as_me:9535: \$? = $ac_status" >&5
++ echo "$as_me:9536: \$? = $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
@@ -4733,7 +4751,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9501,6 +9619,16 @@
+@@ -9501,6 +9620,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4750,7 +4768,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9521,6 +9649,27 @@
+@@ -9521,6 +9650,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4778,7 +4796,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9558,7 +9707,7 @@
+@@ -9558,7 +9708,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4787,7 +4805,7 @@
else
ld_shlibs=no
fi
-@@ -9568,13 +9717,13 @@
+@@ -9568,13 +9718,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'
@@ -4804,7 +4822,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
-@@ -9583,19 +9732,51 @@
+@@ -9583,19 +9733,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4860,7 +4878,7 @@
fi
;;
-@@ -9613,8 +9794,8 @@
+@@ -9613,8 +9795,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4871,7 +4889,7 @@
else
ld_shlibs=no
fi
-@@ -9629,24 +9810,19 @@
+@@ -9629,24 +9811,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4903,7 +4921,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9680,9 +9856,20 @@
+@@ -9680,9 +9857,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
@@ -4926,7 +4944,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9699,7 +9886,7 @@
+@@ -9699,7 +9887,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4935,7 +4953,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`
-@@ -9720,6 +9907,9 @@
+@@ -9720,6 +9908,9 @@
fi
esac
shared_flag='-shared'
@@ -4945,7 +4963,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9728,21 +9918,22 @@
+@@ -9728,21 +9919,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4973,7 +4991,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9766,8 +9957,7 @@
+@@ -9766,8 +9958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4983,7 +5001,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9794,14 +9984,13 @@
+@@ -9794,14 +9985,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5001,7 +5019,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9828,8 +10017,7 @@
+@@ -9828,8 +10018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5011,7 +5029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9866,8 +10054,8 @@
+@@ -9866,8 +10055,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -5022,7 +5040,7 @@
fi
fi
;;
-@@ -9880,7 +10068,7 @@
+@@ -9880,7 +10069,7 @@
ld_shlibs=no
;;
@@ -5031,7 +5049,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9890,13 +10078,13 @@
+@@ -9890,13 +10079,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5048,7 +5066,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.
-@@ -9906,52 +10094,52 @@
+@@ -9906,52 +10095,52 @@
;;
darwin* | rhapsody*)
@@ -5141,7 +5159,7 @@
fi
;;
-@@ -9985,8 +10173,8 @@
+@@ -9985,8 +10174,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5152,7 +5170,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9994,7 +10182,7 @@
+@@ -9994,7 +10183,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5161,7 +5179,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
-@@ -10010,16 +10198,16 @@
+@@ -10010,16 +10199,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5182,7 +5200,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10029,7 +10217,7 @@
+@@ -10029,7 +10218,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5191,7 +5209,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10062,7 +10250,7 @@
+@@ -10062,7 +10251,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5200,7 +5218,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'
-@@ -10072,7 +10260,7 @@
+@@ -10072,7 +10261,7 @@
link_all_deplibs=yes
;;
@@ -5209,7 +5227,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10095,7 +10283,8 @@
+@@ -10095,7 +10284,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
@@ -5219,7 +5237,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10105,7 +10294,7 @@
+@@ -10105,7 +10295,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5228,7 +5246,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10116,14 +10305,14 @@
+@@ -10116,14 +10306,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5245,7 +5263,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'
-@@ -10135,13 +10324,13 @@
+@@ -10135,13 +10325,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5261,7 +5279,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10160,10 +10349,12 @@
+@@ -10160,10 +10350,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5276,7 +5294,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'
-@@ -10172,8 +10363,18 @@
+@@ -10172,8 +10364,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5297,7 +5315,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10182,7 +10383,7 @@
+@@ -10182,7 +10384,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.
@@ -5306,7 +5324,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10242,9 +10443,9 @@
+@@ -10242,9 +10444,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5318,7 +5336,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10350,7 +10551,7 @@
+@@ -10350,7 +10552,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5327,7 +5345,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10360,7 +10561,20 @@
+@@ -10360,7 +10562,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5349,7 +5367,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10425,7 +10639,7 @@
+@@ -10425,7 +10640,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5358,7 +5376,7 @@
;;
beos*)
-@@ -10434,7 +10648,7 @@
+@@ -10434,7 +10649,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5367,7 +5385,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10450,7 +10664,7 @@
+@@ -10450,7 +10665,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5376,7 +5394,7 @@
need_version=no
need_lib_prefix=no
-@@ -10462,7 +10676,8 @@
+@@ -10462,7 +10677,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5386,7 +5404,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10492,7 +10707,7 @@
+@@ -10492,7 +10708,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5395,7 +5413,7 @@
;;
esac
;;
-@@ -10515,7 +10730,7 @@
+@@ -10515,7 +10731,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5404,7 +5422,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"`
-@@ -10538,7 +10753,7 @@
+@@ -10538,7 +10754,7 @@
dynamic_linker=no
;;
@@ -5413,7 +5431,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10550,8 +10765,17 @@
+@@ -10550,8 +10766,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5433,7 +5451,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10569,7 +10793,7 @@
+@@ -10569,7 +10794,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5442,7 +5460,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10596,9 +10820,9 @@
+@@ -10596,9 +10821,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5454,7 +5472,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10613,7 +10837,7 @@
+@@ -10613,7 +10838,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5463,7 +5481,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10624,7 +10848,7 @@
+@@ -10624,7 +10849,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5472,7 +5490,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10686,22 +10910,19 @@
+@@ -10686,22 +10911,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'
@@ -5501,7 +5519,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,
-@@ -10711,6 +10932,30 @@
+@@ -10711,6 +10933,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5532,7 +5550,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10720,7 +10965,7 @@
+@@ -10720,7 +10966,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5541,7 +5559,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10749,7 +10994,11 @@
+@@ -10749,7 +10995,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5554,7 +5572,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
-@@ -10769,7 +11018,7 @@
+@@ -10769,7 +11019,7 @@
os2*)
libname_spec='$name'
@@ -5563,7 +5581,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10871,8 +11120,8 @@
+@@ -10871,8 +11121,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5574,7 +5592,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -10998,8 +11247,7 @@
+@@ -10998,8 +11248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5584,7 +5602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11102,8 +11350,7 @@
+@@ -11102,8 +11351,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5594,7 +5612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11168,8 +11415,7 @@
+@@ -11168,8 +11416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5604,7 +5622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11262,8 +11508,7 @@
+@@ -11262,8 +11509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5614,7 +5632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11328,8 +11573,7 @@
+@@ -11328,8 +11574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5624,7 +5642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11395,8 +11639,7 @@
+@@ -11395,8 +11640,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5634,7 +5652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11462,8 +11705,7 @@
+@@ -11462,8 +11706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5644,16 +5662,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11538,7 +11780,7 @@
+@@ -11538,7 +11781,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11541 "configure"
-+#line 11783 "configure"
++#line 11784 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11604,7 +11846,7 @@
+@@ -11604,7 +11847,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5662,16 +5680,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11636,7 +11878,7 @@
+@@ -11636,7 +11879,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11639 "configure"
-+#line 11881 "configure"
++#line 11882 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11702,7 +11944,7 @@
+@@ -11702,7 +11945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5680,7 +5698,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11752,7 +11994,7 @@
+@@ -11752,7 +11995,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5689,7 +5707,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11761,47 +12003,10 @@
+@@ -11761,47 +12004,10 @@
fi
;;
@@ -5738,7 +5756,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11827,7 +12032,8 @@
+@@ -11827,7 +12033,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.
@@ -5748,7 +5766,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 \
-@@ -11941,11 +12147,11 @@
+@@ -11941,11 +12148,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5762,7 +5780,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11975,6 +12181,12 @@
+@@ -11975,6 +12182,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5775,7 +5793,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12005,7 +12217,7 @@
+@@ -12005,7 +12218,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5784,7 +5802,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12036,7 +12248,7 @@
+@@ -12036,7 +12249,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5793,7 +5811,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12051,7 +12263,7 @@
+@@ -12051,7 +12264,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5802,7 +5820,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12278,7 +12490,10 @@
+@@ -12278,7 +12491,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.
@@ -5814,7 +5832,7 @@
fi
-@@ -12343,7 +12558,9 @@
+@@ -12343,7 +12559,9 @@
case $tagname in
CXX)
@@ -5825,7 +5843,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12380,7 +12597,7 @@
+@@ -12380,7 +12598,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5834,7 +5852,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12401,6 +12618,20 @@
+@@ -12401,6 +12619,20 @@
compiler=$CC
@@ -5855,7 +5873,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12422,7 +12653,16 @@
+@@ -12422,7 +12654,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5873,7 +5891,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12493,7 +12733,7 @@
+@@ -12493,7 +12734,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,
@@ -5882,7 +5900,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'*)
-@@ -12527,7 +12767,7 @@
+@@ -12527,7 +12768,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5891,7 +5909,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12546,8 +12786,8 @@
+@@ -12546,8 +12787,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
@@ -5902,7 +5920,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12573,7 +12813,7 @@
+@@ -12573,7 +12814,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.
@@ -5911,7 +5929,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12604,8 +12844,22 @@
+@@ -12604,8 +12845,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5936,7 +5954,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12622,7 +12876,7 @@
+@@ -12622,7 +12877,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5945,7 +5963,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`
-@@ -12643,6 +12897,9 @@
+@@ -12643,6 +12898,9 @@
fi
esac
shared_flag='-shared'
@@ -5955,7 +5973,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12651,15 +12908,16 @@
+@@ -12651,15 +12909,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5976,7 +5994,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.
-@@ -12689,8 +12947,7 @@
+@@ -12689,8 +12948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5986,7 +6004,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12719,13 +12976,12 @@
+@@ -12719,13 +12977,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6002,7 +6020,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12752,8 +13008,7 @@
+@@ -12752,8 +13009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6012,7 +6030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12790,8 +13045,8 @@
+@@ -12790,8 +13046,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -6023,7 +6041,7 @@
fi
fi
;;
-@@ -12804,16 +13059,17 @@
+@@ -12804,16 +13060,17 @@
esac
;;
@@ -6043,7 +6061,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
-@@ -12822,70 +13078,81 @@
+@@ -12822,70 +13079,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6177,7 +6195,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12896,14 +13163,14 @@
+@@ -12896,14 +13164,14 @@
;;
esac
;;
@@ -6194,7 +6212,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12920,12 +13187,12 @@
+@@ -12920,12 +13188,12 @@
# location of the library.
case $cc_basename in
@@ -6210,7 +6228,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12934,11 +13201,11 @@
+@@ -12934,11 +13202,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.
@@ -6224,7 +6242,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12948,7 +13215,7 @@
+@@ -12948,7 +13216,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6233,7 +6251,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12964,7 +13231,7 @@
+@@ -12964,7 +13232,7 @@
;;
esac
fi
@@ -6242,7 +6260,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12985,17 +13252,17 @@
+@@ -12985,17 +13253,17 @@
esac
case $cc_basename in
@@ -6264,7 +6282,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13011,12 +13278,12 @@
+@@ -13011,12 +13279,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6279,7 +6297,7 @@
;;
esac
fi
-@@ -13029,9 +13296,9 @@
+@@ -13029,9 +13297,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6291,7 +6309,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13042,9 +13309,9 @@
+@@ -13042,9 +13310,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6303,7 +6321,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13055,14 +13322,14 @@
+@@ -13055,14 +13323,14 @@
;;
linux*)
case $cc_basename in
@@ -6321,7 +6339,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13080,20 +13347,44 @@
+@@ -13080,20 +13348,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6372,7 +6390,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13121,7 +13412,7 @@
+@@ -13121,7 +13413,7 @@
;;
mvs*)
case $cc_basename in
@@ -6381,7 +6399,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13131,7 +13422,7 @@
+@@ -13131,7 +13423,7 @@
;;
esac
;;
@@ -6390,7 +6408,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=
-@@ -13142,15 +13433,31 @@
+@@ -13142,15 +13434,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::"'
;;
@@ -6424,7 +6442,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13160,14 +13467,14 @@
+@@ -13160,14 +13468,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6442,7 +6460,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13185,7 +13492,7 @@
+@@ -13185,7 +13493,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6451,7 +6469,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13204,13 +13511,13 @@
+@@ -13204,13 +13512,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6467,7 +6485,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13219,17 +13526,17 @@
+@@ -13219,17 +13527,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6489,7 +6507,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13248,7 +13555,7 @@
+@@ -13248,7 +13556,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6498,7 +6516,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13272,7 +13579,7 @@
+@@ -13272,7 +13580,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6507,7 +6525,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13284,12 +13591,12 @@
+@@ -13284,12 +13592,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6522,7 +6540,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13302,36 +13609,33 @@
+@@ -13302,36 +13610,33 @@
;;
solaris*)
case $cc_basename in
@@ -6571,7 +6589,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13339,9 +13643,9 @@
+@@ -13339,9 +13644,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6583,7 +6601,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13351,9 +13655,9 @@
+@@ -13351,9 +13656,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
@@ -6595,7 +6613,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13362,9 +13666,9 @@
+@@ -13362,9 +13667,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6607,7 +6625,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13382,7 +13686,7 @@
+@@ -13382,7 +13687,7 @@
;;
tandem*)
case $cc_basename in
@@ -6616,7 +6634,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13439,7 +13743,7 @@
+@@ -13439,7 +13744,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.
@@ -6625,7 +6643,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13479,7 +13783,7 @@
+@@ -13479,7 +13784,7 @@
fi
;;
@@ -6634,7 +6652,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13515,6 +13819,20 @@
+@@ -13515,6 +13820,20 @@
$rm -f confest.$objext
@@ -6655,7 +6673,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13570,7 +13888,7 @@
+@@ -13570,7 +13889,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6664,7 +6682,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13595,18 +13913,28 @@
+@@ -13595,18 +13914,28 @@
;;
chorus*)
case $cc_basename in
@@ -6696,7 +6714,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13614,22 +13942,22 @@
+@@ -13614,22 +13943,22 @@
;;
esac
;;
@@ -6723,7 +6741,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13644,7 +13972,7 @@
+@@ -13644,7 +13973,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6732,7 +6750,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13655,18 +13983,24 @@
+@@ -13655,18 +13984,24 @@
;;
linux*)
case $cc_basename in
@@ -6760,7 +6778,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13683,25 +14017,25 @@
+@@ -13683,25 +14018,25 @@
;;
mvs*)
case $cc_basename in
@@ -6791,7 +6809,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13717,7 +14051,7 @@
+@@ -13717,7 +14052,7 @@
;;
sco*)
case $cc_basename in
@@ -6800,7 +6818,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13726,13 +14060,13 @@
+@@ -13726,13 +14061,13 @@
;;
solaris*)
case $cc_basename in
@@ -6816,7 +6834,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13742,12 +14076,12 @@
+@@ -13742,12 +14077,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6831,7 +6849,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13757,7 +14091,7 @@
+@@ -13757,7 +14092,7 @@
;;
tandem*)
case $cc_basename in
@@ -6840,7 +6858,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13798,18 +14132,20 @@
+@@ -13798,18 +14133,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 \
@@ -6849,12 +6867,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13804: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14138: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14139: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13808: \$? = $ac_status" >&5
-+ echo "$as_me:14142: \$? = $ac_status" >&5
++ echo "$as_me:14143: \$? = $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
@@ -6866,7 +6884,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13830,7 +14166,7 @@
+@@ -13830,7 +14167,7 @@
fi
fi
@@ -6875,7 +6893,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13852,38 +14188,36 @@
+@@ -13852,38 +14189,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6897,12 +6915,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13871: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14200: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13875: \$? = $ac_status" >&5
-+ echo "$as_me:14204: \$? = $ac_status" >&5
++ echo "$as_me:14205: \$? = $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
@@ -6926,7 +6944,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13933,7 +14267,10 @@
+@@ -13933,7 +14268,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6938,7 +6956,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14016,7 +14353,7 @@
+@@ -14016,7 +14354,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6947,7 +6965,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14026,7 +14363,20 @@
+@@ -14026,7 +14364,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6969,7 +6987,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14091,7 +14441,7 @@
+@@ -14091,7 +14442,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6978,7 +6996,7 @@
;;
beos*)
-@@ -14100,7 +14450,7 @@
+@@ -14100,7 +14451,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6987,7 +7005,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14116,7 +14466,7 @@
+@@ -14116,7 +14467,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6996,7 +7014,7 @@
need_version=no
need_lib_prefix=no
-@@ -14128,7 +14478,8 @@
+@@ -14128,7 +14479,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7006,7 +7024,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14158,7 +14509,7 @@
+@@ -14158,7 +14510,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7015,7 +7033,7 @@
;;
esac
;;
-@@ -14181,7 +14532,7 @@
+@@ -14181,7 +14533,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7024,7 +7042,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"`
-@@ -14204,7 +14555,7 @@
+@@ -14204,7 +14556,7 @@
dynamic_linker=no
;;
@@ -7033,7 +7051,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14216,8 +14567,17 @@
+@@ -14216,8 +14568,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7053,7 +7071,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14235,7 +14595,7 @@
+@@ -14235,7 +14596,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7062,7 +7080,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14262,9 +14622,9 @@
+@@ -14262,9 +14623,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7074,7 +7092,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14279,7 +14639,7 @@
+@@ -14279,7 +14640,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7083,7 +7101,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14290,7 +14650,7 @@
+@@ -14290,7 +14651,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7092,7 +7110,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14352,22 +14712,19 @@
+@@ -14352,22 +14713,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'
@@ -7121,7 +7139,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,
-@@ -14377,6 +14734,30 @@
+@@ -14377,6 +14735,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7152,7 +7170,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14386,7 +14767,7 @@
+@@ -14386,7 +14768,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7161,7 +7179,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14415,7 +14796,11 @@
+@@ -14415,7 +14797,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7174,7 +7192,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
-@@ -14435,7 +14820,7 @@
+@@ -14435,7 +14821,7 @@
os2*)
libname_spec='$name'
@@ -7183,7 +7201,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14537,8 +14922,8 @@
+@@ -14537,8 +14923,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" || \
@@ -7194,7 +7212,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14664,8 +15049,7 @@
+@@ -14664,8 +15050,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7204,7 +7222,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14768,8 +15152,7 @@
+@@ -14768,8 +15153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7214,7 +7232,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14834,8 +15217,7 @@
+@@ -14834,8 +15218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7224,7 +7242,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14928,8 +15310,7 @@
+@@ -14928,8 +15311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7234,7 +7252,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14994,8 +15375,7 @@
+@@ -14994,8 +15376,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7244,7 +7262,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15061,8 +15441,7 @@
+@@ -15061,8 +15442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7254,7 +7272,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15128,8 +15507,7 @@
+@@ -15128,8 +15508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7264,16 +7282,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15204,7 +15582,7 @@
+@@ -15204,7 +15583,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15207 "configure"
-+#line 15585 "configure"
++#line 15586 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15270,7 +15648,7 @@
+@@ -15270,7 +15649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7282,16 +7300,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15302,7 +15680,7 @@
+@@ -15302,7 +15681,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15305 "configure"
-+#line 15683 "configure"
++#line 15684 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15368,7 +15746,7 @@
+@@ -15368,7 +15747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7300,7 +7318,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15419,7 +15797,8 @@
+@@ -15419,7 +15798,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.
@@ -7310,7 +7328,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 \
-@@ -15519,6 +15898,12 @@
+@@ -15519,6 +15899,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7323,7 +7341,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15549,7 +15934,7 @@
+@@ -15549,7 +15935,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7332,7 +7350,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15580,7 +15965,7 @@
+@@ -15580,7 +15966,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7341,7 +7359,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15595,7 +15980,7 @@
+@@ -15595,7 +15981,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7350,7 +7368,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15797,7 +16182,10 @@
+@@ -15797,7 +16183,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.
@@ -7362,7 +7380,7 @@
fi
-@@ -15873,12 +16261,35 @@
+@@ -15873,12 +16262,35 @@
compiler=$CC
@@ -7399,7 +7417,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15891,7 +16302,7 @@
+@@ -15891,7 +16303,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7408,7 +7426,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15899,8 +16310,10 @@
+@@ -15899,8 +16311,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7421,7 +7439,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15977,7 +16390,7 @@
+@@ -15977,7 +16391,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7430,7 +7448,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16003,6 +16416,16 @@
+@@ -16003,6 +16417,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7447,7 +7465,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16014,7 +16437,7 @@
+@@ -16014,7 +16438,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.
@@ -7456,7 +7474,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16038,12 +16461,19 @@
+@@ -16038,12 +16462,19 @@
;;
linux*)
@@ -7477,7 +7495,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16064,9 +16494,14 @@
+@@ -16064,9 +16495,14 @@
;;
solaris*)
@@ -7493,7 +7511,7 @@
;;
sunos4*)
-@@ -16088,6 +16523,11 @@
+@@ -16088,6 +16524,11 @@
fi
;;
@@ -7505,7 +7523,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16122,18 +16562,20 @@
+@@ -16122,18 +16563,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 \
@@ -7514,12 +7532,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16128: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16568: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16569: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16132: \$? = $ac_status" >&5
-+ echo "$as_me:16572: \$? = $ac_status" >&5
++ echo "$as_me:16573: \$? = $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
@@ -7531,7 +7549,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16154,7 +16596,7 @@
+@@ -16154,7 +16597,7 @@
fi
fi
@@ -7540,7 +7558,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16176,38 +16618,36 @@
+@@ -16176,38 +16619,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7562,12 +7580,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16195: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16631: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16199: \$? = $ac_status" >&5
-+ echo "$as_me:16634: \$? = $ac_status" >&5
++ echo "$as_me:16635: \$? = $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
@@ -7591,7 +7609,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16278,6 +16718,16 @@
+@@ -16278,6 +16719,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7608,7 +7626,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16298,6 +16748,27 @@
+@@ -16298,6 +16749,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7636,7 +7654,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16335,7 +16806,7 @@
+@@ -16335,7 +16807,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7645,7 +7663,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16345,13 +16816,13 @@
+@@ -16345,13 +16817,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'
@@ -7662,7 +7680,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
-@@ -16360,19 +16831,51 @@
+@@ -16360,19 +16832,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7671,10 +7689,9 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -7704,9 +7721,10 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7719,7 +7737,7 @@
fi
;;
-@@ -16390,8 +16893,8 @@
+@@ -16390,8 +16894,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7730,7 +7748,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16406,24 +16909,19 @@
+@@ -16406,24 +16910,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7762,7 +7780,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16457,9 +16955,20 @@
+@@ -16457,9 +16956,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
@@ -7785,7 +7803,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16476,7 +16985,7 @@
+@@ -16476,7 +16986,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7794,7 +7812,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`
-@@ -16497,6 +17006,9 @@
+@@ -16497,6 +17007,9 @@
fi
esac
shared_flag='-shared'
@@ -7804,7 +7822,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16505,21 +17017,22 @@
+@@ -16505,21 +17018,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7832,7 +7850,7 @@
program main
end
-@@ -16533,8 +17046,7 @@
+@@ -16533,8 +17047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7842,7 +7860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16561,14 +17073,13 @@
+@@ -16561,14 +17074,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7860,7 +7878,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16585,8 +17096,7 @@
+@@ -16585,8 +17097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7870,7 +7888,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16623,8 +17133,8 @@
+@@ -16623,8 +17134,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7881,7 +7899,7 @@
fi
fi
;;
-@@ -16637,7 +17147,7 @@
+@@ -16637,7 +17148,7 @@
ld_shlibs_F77=no
;;
@@ -7890,7 +7908,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16647,68 +17157,68 @@
+@@ -16647,68 +17158,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8003,7 +8021,7 @@
fi
;;
-@@ -16742,8 +17252,8 @@
+@@ -16742,8 +17253,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8014,7 +8032,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16751,7 +17261,7 @@
+@@ -16751,7 +17262,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8023,7 +8041,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
-@@ -16767,16 +17277,16 @@
+@@ -16767,16 +17278,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8044,7 +8062,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16786,7 +17296,7 @@
+@@ -16786,7 +17297,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8053,7 +8071,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16819,7 +17329,7 @@
+@@ -16819,7 +17330,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8062,7 +8080,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'
-@@ -16829,7 +17339,7 @@
+@@ -16829,7 +17340,7 @@
link_all_deplibs_F77=yes
;;
@@ -8071,7 +8089,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
-@@ -16852,7 +17362,8 @@
+@@ -16852,7 +17363,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
@@ -8081,7 +8099,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16862,7 +17373,7 @@
+@@ -16862,7 +17374,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8090,7 +8108,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16873,14 +17384,14 @@
+@@ -16873,14 +17385,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8107,7 +8125,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'
-@@ -16892,13 +17403,13 @@
+@@ -16892,13 +17404,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8123,7 +8141,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16917,10 +17428,12 @@
+@@ -16917,10 +17429,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8138,7 +8156,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'
-@@ -16929,8 +17442,18 @@
+@@ -16929,8 +17443,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8159,7 +8177,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16939,7 +17462,7 @@
+@@ -16939,7 +17463,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.
@@ -8168,7 +8186,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16999,9 +17522,9 @@
+@@ -16999,9 +17523,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8180,7 +8198,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17107,7 +17630,7 @@
+@@ -17107,7 +17631,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8189,7 +8207,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17117,7 +17640,20 @@
+@@ -17117,7 +17641,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8211,7 +8229,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17182,7 +17718,7 @@
+@@ -17182,7 +17719,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8220,7 +8238,7 @@
;;
beos*)
-@@ -17191,7 +17727,7 @@
+@@ -17191,7 +17728,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8229,7 +8247,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17207,7 +17743,7 @@
+@@ -17207,7 +17744,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8238,7 +8256,7 @@
need_version=no
need_lib_prefix=no
-@@ -17219,7 +17755,8 @@
+@@ -17219,7 +17756,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8248,7 +8266,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17249,7 +17786,7 @@
+@@ -17249,7 +17787,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8257,7 +8275,7 @@
;;
esac
;;
-@@ -17272,7 +17809,7 @@
+@@ -17272,7 +17810,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8266,7 +8284,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"`
-@@ -17295,7 +17832,7 @@
+@@ -17295,7 +17833,7 @@
dynamic_linker=no
;;
@@ -8275,7 +8293,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17307,8 +17844,17 @@
+@@ -17307,8 +17845,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8295,7 +8313,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17326,7 +17872,7 @@
+@@ -17326,7 +17873,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8304,7 +8322,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17353,9 +17899,9 @@
+@@ -17353,9 +17900,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8316,7 +8334,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17370,7 +17916,7 @@
+@@ -17370,7 +17917,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8325,7 +8343,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17381,7 +17927,7 @@
+@@ -17381,7 +17928,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8334,7 +8352,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17443,22 +17989,19 @@
+@@ -17443,22 +17990,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'
@@ -8363,7 +8381,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,
-@@ -17468,6 +18011,30 @@
+@@ -17468,6 +18012,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8394,7 +8412,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17477,7 +18044,7 @@
+@@ -17477,7 +18045,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8403,7 +8421,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17506,7 +18073,11 @@
+@@ -17506,7 +18074,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8416,7 +8434,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
-@@ -17526,7 +18097,7 @@
+@@ -17526,7 +18098,7 @@
os2*)
libname_spec='$name'
@@ -8425,7 +8443,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17628,8 +18199,8 @@
+@@ -17628,8 +18200,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" || \
@@ -8436,7 +8454,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17705,7 +18276,8 @@
+@@ -17705,7 +18277,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.
@@ -8446,7 +8464,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 \
-@@ -17805,6 +18377,12 @@
+@@ -17805,6 +18378,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8459,7 +8477,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17835,7 +18413,7 @@
+@@ -17835,7 +18414,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8468,7 +8486,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17866,7 +18444,7 @@
+@@ -17866,7 +18445,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8477,7 +8495,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17881,7 +18459,7 @@
+@@ -17881,7 +18460,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8486,7 +8504,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18083,7 +18661,10 @@
+@@ -18083,7 +18662,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.
@@ -8498,7 +8516,7 @@
fi
-@@ -18116,7 +18697,7 @@
+@@ -18116,7 +18698,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8507,7 +8525,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18127,15 +18708,41 @@
+@@ -18127,15 +18709,41 @@
compiler=$CC
@@ -8549,7 +8567,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
-@@ -18162,18 +18769,20 @@
+@@ -18162,18 +18770,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 \
@@ -8558,12 +8576,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18168: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18775: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18776: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18172: \$? = $ac_status" >&5
-+ echo "$as_me:18779: \$? = $ac_status" >&5
++ echo "$as_me:18780: \$? = $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
@@ -8575,7 +8593,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18250,7 +18859,7 @@
+@@ -18250,7 +18860,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8584,7 +8602,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18276,6 +18885,16 @@
+@@ -18276,6 +18886,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8601,7 +8619,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18287,7 +18906,7 @@
+@@ -18287,7 +18907,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.
@@ -8610,7 +8628,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18311,12 +18930,19 @@
+@@ -18311,12 +18931,19 @@
;;
linux*)
@@ -8631,7 +8649,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18337,9 +18963,14 @@
+@@ -18337,9 +18964,14 @@
;;
solaris*)
@@ -8647,7 +8665,7 @@
;;
sunos4*)
-@@ -18361,6 +18992,11 @@
+@@ -18361,6 +18993,11 @@
fi
;;
@@ -8659,7 +8677,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18395,18 +19031,20 @@
+@@ -18395,18 +19032,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 \
@@ -8668,12 +8686,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19037: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19038: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18405: \$? = $ac_status" >&5
-+ echo "$as_me:19041: \$? = $ac_status" >&5
++ echo "$as_me:19042: \$? = $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
@@ -8685,7 +8703,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18427,7 +19065,7 @@
+@@ -18427,7 +19066,7 @@
fi
fi
@@ -8694,7 +8712,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18449,38 +19087,36 @@
+@@ -18449,38 +19088,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8716,12 +8734,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19099: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19100: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18472: \$? = $ac_status" >&5
-+ echo "$as_me:19103: \$? = $ac_status" >&5
++ echo "$as_me:19104: \$? = $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
@@ -8745,7 +8763,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18551,6 +19187,16 @@
+@@ -18551,6 +19188,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8762,7 +8780,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18571,6 +19217,27 @@
+@@ -18571,6 +19218,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8790,7 +8808,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18608,7 +19275,7 @@
+@@ -18608,7 +19276,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8799,7 +8817,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18618,13 +19285,13 @@
+@@ -18618,13 +19286,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'
@@ -8816,7 +8834,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
-@@ -18633,19 +19300,51 @@
+@@ -18633,19 +19301,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8825,9 +8843,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -8857,10 +8876,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -8873,7 +8891,7 @@
fi
;;
-@@ -18663,8 +19362,8 @@
+@@ -18663,8 +19363,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8884,7 +8902,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18679,24 +19378,19 @@
+@@ -18679,24 +19379,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8916,7 +8934,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18730,9 +19424,20 @@
+@@ -18730,9 +19425,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
@@ -8939,7 +8957,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18749,7 +19454,7 @@
+@@ -18749,7 +19455,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8948,7 +8966,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`
-@@ -18770,6 +19475,9 @@
+@@ -18770,6 +19476,9 @@
fi
esac
shared_flag='-shared'
@@ -8958,7 +8976,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18778,21 +19486,22 @@
+@@ -18778,21 +19487,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8986,7 +9004,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18816,8 +19525,7 @@
+@@ -18816,8 +19526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8996,7 +9014,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18844,14 +19552,13 @@
+@@ -18844,14 +19553,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9014,7 +9032,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18878,8 +19585,7 @@
+@@ -18878,8 +19586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9024,7 +9042,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18916,8 +19622,8 @@
+@@ -18916,8 +19623,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -9035,7 +9053,7 @@
fi
fi
;;
-@@ -18930,7 +19636,7 @@
+@@ -18930,7 +19637,7 @@
ld_shlibs_GCJ=no
;;
@@ -9044,7 +9062,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18940,68 +19646,68 @@
+@@ -18940,68 +19647,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9157,7 +9175,7 @@
fi
;;
-@@ -19035,8 +19741,8 @@
+@@ -19035,8 +19742,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9168,7 +9186,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19044,7 +19750,7 @@
+@@ -19044,7 +19751,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9177,7 +9195,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
-@@ -19060,16 +19766,16 @@
+@@ -19060,16 +19767,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9198,7 +9216,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19079,7 +19785,7 @@
+@@ -19079,7 +19786,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9207,7 +9225,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19112,7 +19818,7 @@
+@@ -19112,7 +19819,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9216,7 +9234,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'
-@@ -19122,7 +19828,7 @@
+@@ -19122,7 +19829,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9225,7 +9243,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
-@@ -19145,7 +19851,8 @@
+@@ -19145,7 +19852,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
@@ -9235,7 +9253,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19155,7 +19862,7 @@
+@@ -19155,7 +19863,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9244,7 +9262,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19166,14 +19873,14 @@
+@@ -19166,14 +19874,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9261,7 +9279,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'
-@@ -19185,13 +19892,13 @@
+@@ -19185,13 +19893,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9277,7 +9295,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19210,10 +19917,12 @@
+@@ -19210,10 +19918,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9292,7 +9310,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'
-@@ -19222,8 +19931,18 @@
+@@ -19222,8 +19932,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9313,7 +9331,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19232,7 +19951,7 @@
+@@ -19232,7 +19952,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.
@@ -9322,7 +9340,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19292,9 +20011,9 @@
+@@ -19292,9 +20012,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9334,7 +9352,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19400,7 +20119,7 @@
+@@ -19400,7 +20120,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9343,7 +9361,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19410,7 +20129,20 @@
+@@ -19410,7 +20130,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9365,7 +9383,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19475,7 +20207,7 @@
+@@ -19475,7 +20208,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9374,7 +9392,7 @@
;;
beos*)
-@@ -19484,7 +20216,7 @@
+@@ -19484,7 +20217,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9383,7 +9401,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19500,7 +20232,7 @@
+@@ -19500,7 +20233,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9392,7 +9410,7 @@
need_version=no
need_lib_prefix=no
-@@ -19512,7 +20244,8 @@
+@@ -19512,7 +20245,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9402,7 +9420,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19542,7 +20275,7 @@
+@@ -19542,7 +20276,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9411,7 +9429,7 @@
;;
esac
;;
-@@ -19565,7 +20298,7 @@
+@@ -19565,7 +20299,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9420,7 +9438,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"`
-@@ -19588,7 +20321,7 @@
+@@ -19588,7 +20322,7 @@
dynamic_linker=no
;;
@@ -9429,7 +9447,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19600,8 +20333,17 @@
+@@ -19600,8 +20334,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9449,7 +9467,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19619,7 +20361,7 @@
+@@ -19619,7 +20362,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9458,7 +9476,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19646,9 +20388,9 @@
+@@ -19646,9 +20389,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9470,7 +9488,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19663,7 +20405,7 @@
+@@ -19663,7 +20406,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9479,7 +9497,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19674,7 +20416,7 @@
+@@ -19674,7 +20417,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9488,7 +9506,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19736,22 +20478,19 @@
+@@ -19736,22 +20479,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'
@@ -9517,7 +9535,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,
-@@ -19761,6 +20500,30 @@
+@@ -19761,6 +20501,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9548,7 +9566,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19770,7 +20533,7 @@
+@@ -19770,7 +20534,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9557,7 +9575,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19799,7 +20562,11 @@
+@@ -19799,7 +20563,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9570,7 +9588,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
-@@ -19819,7 +20586,7 @@
+@@ -19819,7 +20587,7 @@
os2*)
libname_spec='$name'
@@ -9579,7 +9597,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19921,8 +20688,8 @@
+@@ -19921,8 +20689,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" || \
@@ -9590,7 +9608,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20048,8 +20815,7 @@
+@@ -20048,8 +20816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9600,7 +9618,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20152,8 +20918,7 @@
+@@ -20152,8 +20919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9610,7 +9628,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20218,8 +20983,7 @@
+@@ -20218,8 +20984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9620,7 +9638,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20312,8 +21076,7 @@
+@@ -20312,8 +21077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9630,7 +9648,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20378,8 +21141,7 @@
+@@ -20378,8 +21142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9640,7 +9658,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20445,8 +21207,7 @@
+@@ -20445,8 +21208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9650,7 +9668,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20512,8 +21273,7 @@
+@@ -20512,8 +21274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9660,16 +9678,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20588,7 +21348,7 @@
+@@ -20588,7 +21349,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20591 "configure"
-+#line 21351 "configure"
++#line 21352 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20654,7 +21414,7 @@
+@@ -20654,7 +21415,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9678,16 +9696,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20686,7 +21446,7 @@
+@@ -20686,7 +21447,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20689 "configure"
-+#line 21449 "configure"
++#line 21450 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20752,7 +21512,7 @@
+@@ -20752,7 +21513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9696,7 +9714,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20803,7 +21563,8 @@
+@@ -20803,7 +21564,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.
@@ -9706,7 +9724,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 \
-@@ -20903,6 +21664,12 @@
+@@ -20903,6 +21665,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9719,7 +9737,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20933,7 +21700,7 @@
+@@ -20933,7 +21701,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9728,7 +9746,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20964,7 +21731,7 @@
+@@ -20964,7 +21732,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9737,7 +9755,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20979,7 +21746,7 @@
+@@ -20979,7 +21747,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9746,7 +9764,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21181,7 +21948,10 @@
+@@ -21181,7 +21949,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.
@@ -9758,7 +9776,7 @@
fi
-@@ -21224,11 +21994,35 @@
+@@ -21224,11 +21995,35 @@
compiler=$CC
@@ -9794,7 +9812,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21244,7 +22038,8 @@
+@@ -21244,7 +22039,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.
@@ -9804,7 +9822,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 \
-@@ -21344,6 +22139,12 @@
+@@ -21344,6 +22140,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9817,7 +9835,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21374,7 +22175,7 @@
+@@ -21374,7 +22176,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9826,7 +9844,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21405,7 +22206,7 @@
+@@ -21405,7 +22207,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9835,7 +9853,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21420,7 +22221,7 @@
+@@ -21420,7 +22222,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9844,7 +9862,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21622,7 +22423,10 @@
+@@ -21622,7 +22424,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.
@@ -9856,7 +9874,7 @@
fi
-@@ -21669,7 +22473,7 @@
+@@ -21669,7 +22474,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9865,7 +9883,7 @@
# Prevent multiple expansion
-@@ -22110,8 +22914,7 @@
+@@ -22110,8 +22915,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9875,7 +9893,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22208,8 +23011,7 @@
+@@ -22208,8 +23012,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9885,7 +9903,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22278,8 +23080,7 @@
+@@ -22278,8 +23081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9895,7 +9913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22382,8 +23183,7 @@
+@@ -22382,8 +23184,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9905,7 +9923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22452,8 +23252,7 @@
+@@ -22452,8 +23253,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9915,7 +9933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22528,8 +23327,7 @@
+@@ -22528,8 +23328,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9925,7 +9943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22636,8 +23434,7 @@
+@@ -22636,8 +23435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9935,7 +9953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22908,8 +23705,7 @@
+@@ -22908,8 +23706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9945,7 +9963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23059,8 +23855,7 @@
+@@ -23059,8 +23856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9955,7 +9973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23245,8 +24040,7 @@
+@@ -23245,8 +24041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9965,7 +9983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23348,8 +24142,7 @@
+@@ -23348,8 +24143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9975,7 +9993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23451,8 +24244,7 @@
+@@ -23451,8 +24245,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9985,7 +10003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23553,8 +24345,7 @@
+@@ -23553,8 +24346,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9995,7 +10013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23845,8 +24636,7 @@
+@@ -23845,8 +24637,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10005,7 +10023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23911,8 +24701,7 @@
+@@ -23911,8 +24702,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10015,7 +10033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23976,8 +24765,7 @@
+@@ -23976,8 +24766,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10025,7 +10043,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24058,8 +24846,7 @@
+@@ -24058,8 +24847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10035,7 +10053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24200,8 +24987,7 @@
+@@ -24200,8 +24988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10045,7 +10063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24339,8 +25125,7 @@
+@@ -24339,8 +25126,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10055,7 +10073,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24524,8 +25309,7 @@
+@@ -24524,8 +25310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10065,7 +10083,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24771,8 +25555,7 @@
+@@ -24771,8 +25556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10075,7 +10093,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24965,8 +25748,7 @@
+@@ -24965,8 +25749,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10085,7 +10103,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25047,8 +25829,7 @@
+@@ -25047,8 +25830,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10095,7 +10113,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25118,8 +25899,7 @@
+@@ -25118,8 +25900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10105,7 +10123,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25228,8 +26008,7 @@
+@@ -25228,8 +26009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10115,7 +10133,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25321,8 +26100,7 @@
+@@ -25321,8 +26101,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10125,7 +10143,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25394,8 +26172,7 @@
+@@ -25394,8 +26173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10135,7 +10153,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25449,8 +26226,7 @@
+@@ -25449,8 +26227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10145,7 +10163,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25521,8 +26297,7 @@
+@@ -25521,8 +26298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10155,7 +10173,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25576,8 +26351,7 @@
+@@ -25576,8 +26352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10165,7 +10183,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25644,8 +26418,7 @@
+@@ -25644,8 +26419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10175,7 +10193,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25790,7 +26563,8 @@
+@@ -25790,7 +26564,8 @@
@@ -10185,7 +10203,7 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -25823,8 +26597,7 @@
+@@ -25823,8 +26598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10195,7 +10213,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25998,8 +26771,7 @@
+@@ -25998,8 +26772,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10205,7 +10223,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26165,8 +26937,7 @@
+@@ -26165,8 +26938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10215,7 +10233,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26342,8 +27113,7 @@
+@@ -26342,8 +27114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10225,7 +10243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26423,8 +27193,7 @@
+@@ -26423,8 +27194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10235,7 +10253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26592,8 +27361,7 @@
+@@ -26592,8 +27362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10245,7 +10263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26671,8 +27439,7 @@
+@@ -26671,8 +27440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10255,7 +10273,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26850,9 +27617,6 @@
+@@ -26850,9 +27618,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10265,7 +10283,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26886,8 +27650,7 @@
+@@ -26886,8 +27651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10275,7 +10293,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26991,8 +27754,7 @@
+@@ -26991,8 +27755,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10285,7 +10303,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27071,9 +27833,6 @@
+@@ -27071,9 +27834,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10295,7 +10313,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27106,8 +27865,7 @@
+@@ -27106,8 +27866,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10305,7 +10323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27210,8 +27968,7 @@
+@@ -27210,8 +27969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10315,7 +10333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27301,8 +28058,7 @@
+@@ -27301,8 +28059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10325,7 +10343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27363,8 +28119,7 @@
+@@ -27363,8 +28120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10335,7 +10353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27432,8 +28187,7 @@
+@@ -27432,8 +28188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10345,7 +10363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27499,8 +28253,7 @@
+@@ -27499,8 +28254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10355,7 +10373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27593,8 +28346,7 @@
+@@ -27593,8 +28347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10365,7 +10383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27672,8 +28424,7 @@
+@@ -27672,8 +28425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10375,7 +10393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27757,8 +28508,7 @@
+@@ -27757,8 +28509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10385,7 +10403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27826,8 +28576,7 @@
+@@ -27826,8 +28577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10395,7 +10413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27922,8 +28671,7 @@
+@@ -27922,8 +28672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10405,7 +10423,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27987,8 +28735,7 @@
+@@ -27987,8 +28736,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10415,7 +10433,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28083,8 +28830,7 @@
+@@ -28083,8 +28831,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10425,7 +10443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28148,8 +28894,7 @@
+@@ -28148,8 +28895,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10435,7 +10453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28245,8 +28990,7 @@
+@@ -28245,8 +28991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10445,7 +10463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28310,8 +29054,7 @@
+@@ -28310,8 +29055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10455,7 +10473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28408,8 +29151,7 @@
+@@ -28408,8 +29152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10465,7 +10483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28474,8 +29216,7 @@
+@@ -28474,8 +29217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10475,7 +10493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28543,8 +29284,7 @@
+@@ -28543,8 +29285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10485,7 +10503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28695,8 +29435,7 @@
+@@ -28695,8 +29436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10495,7 +10513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28851,8 +29590,7 @@
+@@ -28851,8 +29591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10505,7 +10523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28917,8 +29655,7 @@
+@@ -28917,8 +29656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10515,7 +10533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29065,8 +29802,7 @@
+@@ -29065,8 +29803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10525,7 +10543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29221,8 +29957,7 @@
+@@ -29221,8 +29958,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10535,7 +10553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29278,9 +30013,6 @@
+@@ -29278,9 +30014,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10545,7 +10563,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29314,8 +30046,7 @@
+@@ -29314,8 +30047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10555,7 +10573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29419,8 +30150,7 @@
+@@ -29419,8 +30151,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10565,7 +10583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29520,8 +30250,7 @@
+@@ -29520,8 +30251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10575,7 +10593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29595,8 +30324,7 @@
+@@ -29595,8 +30325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10585,7 +10603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29659,8 +30387,7 @@
+@@ -29659,8 +30388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10595,7 +10613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29722,8 +30449,7 @@
+@@ -29722,8 +30450,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10605,7 +10623,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29763,8 +30489,7 @@
+@@ -29763,8 +30490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10615,7 +10633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29820,8 +30545,7 @@
+@@ -29820,8 +30546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10625,7 +10643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29861,8 +30585,7 @@
+@@ -29861,8 +30586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10635,7 +10653,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29926,8 +30649,7 @@
+@@ -29926,8 +30650,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10645,7 +10663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29958,10 +30680,8 @@
+@@ -29958,10 +30681,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10658,7 +10676,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30072,8 +30792,7 @@
+@@ -30072,8 +30793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10668,7 +10686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30135,8 +30854,7 @@
+@@ -30135,8 +30855,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10678,7 +10696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30176,8 +30894,7 @@
+@@ -30176,8 +30895,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10688,7 +10706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30233,8 +30950,7 @@
+@@ -30233,8 +30951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10698,7 +10716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30274,8 +30990,7 @@
+@@ -30274,8 +30991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10708,7 +10726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30339,8 +31054,7 @@
+@@ -30339,8 +31055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10718,7 +10736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30371,10 +31085,8 @@
+@@ -30371,10 +31086,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10731,7 +10749,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30485,8 +31197,7 @@
+@@ -30485,8 +31198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10741,7 +10759,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30548,8 +31259,7 @@
+@@ -30548,8 +31260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10751,7 +10769,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30589,8 +31299,7 @@
+@@ -30589,8 +31300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10761,7 +10779,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30646,8 +31355,7 @@
+@@ -30646,8 +31356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10771,7 +10789,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30687,8 +31395,7 @@
+@@ -30687,8 +31396,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10781,7 +10799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30752,8 +31459,7 @@
+@@ -30752,8 +31460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10791,7 +10809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30784,10 +31490,8 @@
+@@ -30784,10 +31491,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10804,7 +10822,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30898,8 +31602,7 @@
+@@ -30898,8 +31603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10814,7 +10832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30961,8 +31664,7 @@
+@@ -30961,8 +31665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10824,7 +10842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31002,8 +31704,7 @@
+@@ -31002,8 +31705,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10834,7 +10852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31059,8 +31760,7 @@
+@@ -31059,8 +31761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10844,7 +10862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31100,8 +31800,7 @@
+@@ -31100,8 +31801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10854,7 +10872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31165,8 +31864,7 @@
+@@ -31165,8 +31865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10864,7 +10882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31197,10 +31895,8 @@
+@@ -31197,10 +31896,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10877,7 +10895,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31319,8 +32015,7 @@
+@@ -31319,8 +32016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10887,7 +10905,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31391,8 +32086,7 @@
+@@ -31391,8 +32087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10897,7 +10915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31462,8 +32156,7 @@
+@@ -31462,8 +32157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10907,7 +10925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31525,8 +32218,7 @@
+@@ -31525,8 +32219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10917,7 +10935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31566,8 +32258,7 @@
+@@ -31566,8 +32259,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10927,7 +10945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31623,8 +32314,7 @@
+@@ -31623,8 +32315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10937,7 +10955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31664,8 +32354,7 @@
+@@ -31664,8 +32355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10947,7 +10965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31729,8 +32418,7 @@
+@@ -31729,8 +32419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10957,7 +10975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31761,10 +32449,8 @@
+@@ -31761,10 +32450,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10970,7 +10988,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31876,8 +32562,7 @@
+@@ -31876,8 +32563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10980,7 +10998,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31939,8 +32624,7 @@
+@@ -31939,8 +32625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10990,7 +11008,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31980,8 +32664,7 @@
+@@ -31980,8 +32665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11000,7 +11018,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32037,8 +32720,7 @@
+@@ -32037,8 +32721,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11010,7 +11028,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32078,8 +32760,7 @@
+@@ -32078,8 +32761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11020,7 +11038,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32143,8 +32824,7 @@
+@@ -32143,8 +32825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11030,7 +11048,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32175,10 +32855,8 @@
+@@ -32175,10 +32856,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11043,7 +11061,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32289,8 +32967,7 @@
+@@ -32289,8 +32968,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11053,7 +11071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32371,8 +33048,7 @@
+@@ -32371,8 +33049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11063,7 +11081,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32472,8 +33148,7 @@
+@@ -32472,8 +33149,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11073,7 +11091,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32653,8 +33328,7 @@
+@@ -32653,8 +33329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11083,7 +11101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32763,8 +33437,7 @@
+@@ -32763,8 +33438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11093,7 +11111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32988,8 +33661,7 @@
+@@ -32988,8 +33662,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11103,7 +11121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33212,8 +33884,7 @@
+@@ -33212,8 +33885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11113,7 +11131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33289,8 +33960,7 @@
+@@ -33289,8 +33961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11123,7 +11141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33516,8 +34186,7 @@
+@@ -33516,8 +34187,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11133,7 +11151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33592,8 +34261,7 @@
+@@ -33592,8 +34262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11143,7 +11161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33653,8 +34321,7 @@
+@@ -33653,8 +34322,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11153,7 +11171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33737,8 +34404,7 @@
+@@ -33737,8 +34405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11163,7 +11181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33831,8 +34497,7 @@
+@@ -33831,8 +34498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11173,7 +11191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34006,8 +34671,7 @@
+@@ -34006,8 +34672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11183,7 +11201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34105,8 +34769,7 @@
+@@ -34105,8 +34770,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11193,7 +11211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34193,8 +34856,7 @@
+@@ -34193,8 +34857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11203,7 +11221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34271,8 +34933,7 @@
+@@ -34271,8 +34934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11213,25 +11231,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34325,7 +34986,7 @@
+@@ -34325,7 +34987,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 34328: $i/$j" >&5
-+ echo "configure: 34989: $i/$j" >&5
++ echo "configure: 34990: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34623,7 +35284,7 @@
+@@ -34623,7 +35285,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 34626: $i/$j" >&5
-+ echo "configure: 35287: $i/$j" >&5
++ echo "configure: 35288: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -35300,8 +35961,7 @@
+@@ -35300,8 +35962,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11241,34 +11259,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35459,7 +36119,7 @@
+@@ -35459,7 +36120,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 35462: $i/$j" >&5
-+ echo "configure: 36122: $i/$j" >&5
++ echo "configure: 36123: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -35489,7 +36149,7 @@
+@@ -35489,7 +36150,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 35492: $i/$j" >&5
-+ echo "configure: 36152: $i/$j" >&5
++ echo "configure: 36153: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -35507,7 +36167,7 @@
+@@ -35507,7 +36168,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 35510: $i/$j" >&5
-+ echo "configure: 36170: $i/$j" >&5
++ echo "configure: 36171: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -35795,8 +36455,7 @@
+@@ -35795,8 +36456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11278,7 +11296,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35891,8 +36550,7 @@
+@@ -35891,8 +36551,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11288,7 +11306,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35985,8 +36643,7 @@
+@@ -35985,8 +36644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11298,16 +11316,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37360,7 +38017,7 @@
+@@ -37360,7 +38018,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 37363: $i/$j" >&5
-+ echo "configure: 38020: $i/$j" >&5
++ echo "configure: 38021: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -37597,8 +38254,7 @@
+@@ -37597,8 +38255,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11317,7 +11335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37682,8 +38338,7 @@
+@@ -37682,8 +38339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11327,7 +11345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37775,8 +38430,7 @@
+@@ -37775,8 +38431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11337,7 +11355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37943,8 +38597,7 @@
+@@ -37943,8 +38598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11347,7 +11365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38099,8 +38752,7 @@
+@@ -38099,8 +38753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11357,7 +11375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38175,8 +38827,7 @@
+@@ -38175,8 +38828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11367,7 +11385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38218,8 +38869,7 @@
+@@ -38218,8 +38870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11377,7 +11395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38276,8 +38926,7 @@
+@@ -38276,8 +38927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11387,7 +11405,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38407,9 +39056,6 @@
+@@ -38407,9 +39057,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11397,7 +11415,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38440,8 +39086,7 @@
+@@ -38440,8 +39087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11407,7 +11425,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38542,8 +39187,7 @@
+@@ -38542,8 +39188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11417,7 +11435,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38622,9 +39266,6 @@
+@@ -38622,9 +39267,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11427,7 +11445,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38655,8 +39296,7 @@
+@@ -38655,8 +39297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11437,7 +11455,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38757,8 +39397,7 @@
+@@ -38757,8 +39398,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11447,7 +11465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38837,9 +39476,6 @@
+@@ -38837,9 +39477,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11457,7 +11475,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38872,8 +39508,7 @@
+@@ -38872,8 +39509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11467,7 +11485,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38976,8 +39611,7 @@
+@@ -38976,8 +39612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11477,7 +11495,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39055,9 +39689,6 @@
+@@ -39055,9 +39690,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11487,7 +11505,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39090,8 +39721,7 @@
+@@ -39090,8 +39722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11497,7 +11515,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39194,8 +39824,7 @@
+@@ -39194,8 +39825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11507,7 +11525,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39275,9 +39904,6 @@
+@@ -39275,9 +39905,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11517,7 +11535,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39311,8 +39937,7 @@
+@@ -39311,8 +39938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11527,7 +11545,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39416,8 +40041,7 @@
+@@ -39416,8 +40042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11537,7 +11555,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,9 +40120,6 @@
+@@ -39496,9 +40121,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11547,7 +11565,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39532,8 +40153,7 @@
+@@ -39532,8 +40154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11557,7 +11575,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39637,8 +40257,7 @@
+@@ -39637,8 +40258,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11567,7 +11585,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39717,9 +40336,6 @@
+@@ -39717,9 +40337,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11577,7 +11595,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39753,8 +40369,7 @@
+@@ -39753,8 +40370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11587,7 +11605,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39858,8 +40473,7 @@
+@@ -39858,8 +40474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11597,7 +11615,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39925,7 +40539,9 @@
+@@ -39925,7 +40540,9 @@
@@ -11608,7 +11626,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39993,8 +40609,7 @@
+@@ -39993,8 +40610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11618,7 +11636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40052,9 +40667,6 @@
+@@ -40052,9 +40668,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11628,7 +11646,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40087,8 +40699,7 @@
+@@ -40087,8 +40700,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11638,7 +11656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40191,8 +40802,7 @@
+@@ -40191,8 +40803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11648,7 +11666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40271,9 +40881,6 @@
+@@ -40271,9 +40882,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11658,7 +11676,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40308,8 +40915,7 @@
+@@ -40308,8 +40916,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11668,7 +11686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40414,8 +41020,7 @@
+@@ -40414,8 +41021,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11678,7 +11696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40494,9 +41099,6 @@
+@@ -40494,9 +41100,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11688,7 +11706,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40529,8 +41131,7 @@
+@@ -40529,8 +41132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11698,7 +11716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40633,8 +41234,7 @@
+@@ -40633,8 +41235,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11708,7 +11726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40712,9 +41312,6 @@
+@@ -40712,9 +41313,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11718,7 +11736,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40747,8 +41344,7 @@
+@@ -40747,8 +41345,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11728,7 +11746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40851,8 +41447,7 @@
+@@ -40851,8 +41448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11738,7 +11756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40946,8 +41541,7 @@
+@@ -40946,8 +41542,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11748,7 +11766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41007,9 +41601,6 @@
+@@ -41007,9 +41602,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11758,7 +11776,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41045,8 +41636,7 @@
+@@ -41045,8 +41637,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11768,7 +11786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41152,8 +41742,7 @@
+@@ -41152,8 +41743,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11778,7 +11796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41411,8 +42000,7 @@
+@@ -41411,8 +42001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11788,7 +11806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41532,8 +42120,7 @@
+@@ -41532,8 +42121,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11798,7 +11816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41714,8 +42301,7 @@
+@@ -41714,8 +42302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11808,16 +11826,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41775,7 +42361,7 @@
+@@ -41775,7 +42362,7 @@
do
for j in qsql.html;
do
- echo "configure: 41778: $i/$j" >&5
-+ echo "configure: 42364: $i/$j" >&5
++ echo "configure: 42365: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41970,8 +42556,7 @@
+@@ -41970,8 +42557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11827,7 +11845,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42204,8 +42789,7 @@
+@@ -42204,8 +42790,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11837,7 +11855,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42343,8 +42927,7 @@
+@@ -42343,8 +42928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11847,7 +11865,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42490,8 +43073,7 @@
+@@ -42490,8 +43074,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11857,7 +11875,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42649,8 +43231,7 @@
+@@ -42649,8 +43232,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11867,7 +11885,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42716,8 +43297,7 @@
+@@ -42716,8 +43298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11877,7 +11895,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42917,8 +43497,7 @@
+@@ -42917,8 +43498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11887,7 +11905,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43080,8 +43659,7 @@
+@@ -43080,8 +43660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11897,7 +11915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43792,7 @@
+@@ -43214,8 +43793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11907,7 +11925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +43861,7 @@
+@@ -43284,8 +43862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11917,7 +11935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43373,8 +43949,7 @@
+@@ -43373,8 +43950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11927,7 +11945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43464,8 +44039,7 @@
+@@ -43464,8 +44040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11937,7 +11955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43590,7 +44164,8 @@
+@@ -43590,7 +44165,8 @@
@@ -11947,7 +11965,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -43658,8 +44233,7 @@
+@@ -43658,8 +44234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11957,7 +11975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43725,8 +44299,7 @@
+@@ -43725,8 +44300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11967,7 +11985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43830,8 +44403,7 @@
+@@ -43830,8 +44404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11977,7 +11995,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43932,8 +44504,7 @@
+@@ -43932,8 +44505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11987,7 +12005,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44088,8 +44659,7 @@
+@@ -44088,8 +44660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11997,7 +12015,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44133,8 +44703,7 @@
+@@ -44133,8 +44704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12007,7 +12025,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44202,8 +44771,7 @@
+@@ -44202,8 +44772,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12017,7 +12035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44264,8 +44832,7 @@
+@@ -44264,8 +44833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12027,7 +12045,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44309,8 +44876,7 @@
+@@ -44309,8 +44877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12037,7 +12055,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +44944,7 @@
+@@ -44378,8 +44945,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12047,7 +12065,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +45010,7 @@
+@@ -44445,8 +45011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12057,7 +12075,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44732,8 +45296,7 @@
+@@ -44732,8 +45297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12067,7 +12085,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44878,8 +45441,7 @@
+@@ -44878,8 +45442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12077,7 +12095,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45013,8 +45575,7 @@
+@@ -45013,8 +45576,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12087,7 +12105,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45160,8 +45721,7 @@
+@@ -45160,8 +45722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12097,7 +12115,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45252,8 +45812,7 @@
+@@ -45252,8 +45813,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12107,7 +12125,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45422,8 +45981,7 @@
+@@ -45422,8 +45982,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12117,7 +12135,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45494,8 +46052,7 @@
+@@ -45494,8 +46053,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12127,7 +12145,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45547,8 +46104,7 @@
+@@ -45547,8 +46105,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12137,7 +12155,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45600,8 +46156,7 @@
+@@ -45600,8 +46157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12147,7 +12165,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45653,8 +46208,7 @@
+@@ -45653,8 +46209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12157,7 +12175,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45710,8 +46264,7 @@
+@@ -45710,8 +46265,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12167,7 +12185,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45855,8 +46408,7 @@
+@@ -45855,8 +46409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12177,7 +12195,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45927,8 +46479,7 @@
+@@ -45927,8 +46480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12187,7 +12205,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46266,8 +46817,7 @@
+@@ -46266,8 +46818,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12197,7 +12215,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46370,8 +46920,7 @@
+@@ -46370,8 +46921,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12207,7 +12225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46440,8 +46989,7 @@
+@@ -46440,8 +46990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12217,7 +12235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46594,8 +47142,7 @@
+@@ -46594,8 +47143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12227,7 +12245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46705,8 +47252,7 @@
+@@ -46705,8 +47253,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12237,7 +12255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46811,8 +47357,7 @@
+@@ -46811,8 +47358,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12247,7 +12265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46879,8 +47424,7 @@
+@@ -46879,8 +47425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12257,7 +12275,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46982,8 +47526,7 @@
+@@ -46982,8 +47527,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12267,7 +12285,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47316,8 +47859,7 @@
+@@ -47316,8 +47860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12277,7 +12295,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47406,8 +47948,7 @@
+@@ -47406,8 +47949,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12287,7 +12305,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47496,8 +48037,7 @@
+@@ -47496,8 +48038,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12297,7 +12315,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47591,8 +48131,7 @@
+@@ -47591,8 +48132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12307,7 +12325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47765,8 +48304,7 @@
+@@ -47765,8 +48305,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12317,7 +12335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47896,8 +48434,7 @@
+@@ -47896,8 +48435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12327,7 +12345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47993,8 +48530,7 @@
+@@ -47993,8 +48531,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12337,7 +12355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48112,8 +48648,7 @@
+@@ -48112,8 +48649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12347,7 +12365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48190,8 +48725,7 @@
+@@ -48190,8 +48726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12357,16 +12375,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48244,7 +48778,7 @@
+@@ -48244,7 +48779,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 48247: $i/$j" >&5
-+ echo "configure: 48781: $i/$j" >&5
++ echo "configure: 48782: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -48337,8 +48871,7 @@
+@@ -48337,8 +48872,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12376,7 +12394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48434,8 +48967,7 @@
+@@ -48434,8 +48968,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12386,7 +12404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48607,8 +49139,7 @@
+@@ -48607,8 +49140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12396,7 +12414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48742,8 +49273,7 @@
+@@ -48742,8 +49274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12406,7 +12424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49035,8 +49565,7 @@
+@@ -49035,8 +49566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12416,7 +12434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49245,8 +49774,7 @@
+@@ -49245,8 +49775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12426,7 +12444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49341,8 +49869,7 @@
+@@ -49341,8 +49870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12436,7 +12454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49432,8 +49959,7 @@
+@@ -49432,8 +49960,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12446,7 +12464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49618,8 +50144,7 @@
+@@ -49618,8 +50145,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12456,7 +12474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49694,8 +50219,7 @@
+@@ -49694,8 +50220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12466,7 +12484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49832,8 +50356,7 @@
+@@ -49832,8 +50357,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12476,16 +12494,166 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49919,7 +50442,7 @@
+@@ -49878,6 +50402,149 @@
+ fi
+
+
++# Check whether --enable-inotify or --disable-inotify was given.
++if test "${enable_inotify+set}" = set; then
++ enableval="$enable_inotify"
++ kde_enable_inotify=$enableval
++else
++ kde_enable_inotify=yes
++fi;
++
++echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
++echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6
++if test "${ac_cv_gnu_extensions+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat > conftest.c << EOF
++#include <features.h>
++
++#ifdef __GNU_LIBRARY__
++yes
++#endif
++EOF
++
++if (eval "$ac_cpp conftest.c") 2>&5 |
++ egrep "yes" >/dev/null 2>&1; then
++ rm -rf conftest*
++ ac_cv_gnu_extensions=yes
++else
++ ac_cv_gnu_extensions=no
++fi
++
++fi
++
++
++echo "$as_me:$LINENO: result: $ac_cv_gnu_extensions" >&5
++echo "${ECHO_T}$ac_cv_gnu_extensions" >&6
++if test "$ac_cv_gnu_extensions" = "yes"; then
++
++cat >>confdefs.h <<_ACEOF
++#define _GNU_SOURCE 1
++_ACEOF
++
++fi
++
++
++if test "x$kde_enable_inotify" = "xyes"; then
++ echo "$as_me:$LINENO: checking for Linux Inotify Notification" >&5
++echo $ECHO_N "checking for Linux Inotify Notification... $ECHO_C" >&6
++ if test "${kde_cv_have_inotify+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ kde_cv_have_inotify=no
++
++
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#include <asm/unistd.h>
++#define _S390_BITOPS_H
++#include <linux/inotify.h>
++
++int
++main ()
++{
++
++#ifndef IN_ALL_EVENTS
++#error no inotify notification
++#endif
++#ifndef __NR_inotify_init
++#error no __NR_inotify_init
++#endif
++
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ kde_cv_have_inotify=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++kde_cv_have_inotify=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++fi
++
++
++ if test "$kde_cv_have_inotify" = "yes" ; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_INOTIFY 1
++_ACEOF
++
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++ fi
++fi
++
++
+ LIBSSL="-lssl -lcrypto"
+
+
+@@ -49919,7 +50586,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 49922: $i/$j" >&5
-+ echo "configure: 50445: $i/$j" >&5
++ echo "configure: 50589: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49974,8 +50497,7 @@
+@@ -49974,8 +50641,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12495,7 +12663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50275,8 +50797,7 @@
+@@ -50275,8 +50941,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12505,7 +12673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50496,8 +51017,7 @@
+@@ -50496,8 +51161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12515,25 +12683,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50650,7 +51170,7 @@
+@@ -50650,7 +51314,7 @@
do
for j in gssapi.h;
do
- echo "configure: 50653: $i/$j" >&5
-+ echo "configure: 51173: $i/$j" >&5
++ echo "configure: 51317: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -50672,7 +51192,7 @@
+@@ -50672,7 +51336,7 @@
do
for j in libgssapi.$ext;
do
- echo "configure: 50675: $i/$j" >&5
-+ echo "configure: 51195: $i/$j" >&5
++ echo "configure: 51339: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -50790,8 +51310,7 @@
+@@ -50790,8 +51454,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12543,7 +12711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50944,8 +51463,7 @@
+@@ -50944,8 +51607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12553,7 +12721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51018,8 +51536,7 @@
+@@ -51018,8 +51680,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12563,7 +12731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51092,8 +51609,7 @@
+@@ -51092,8 +51753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12573,7 +12741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51166,8 +51682,7 @@
+@@ -51166,8 +51826,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12583,7 +12751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51317,8 +51832,7 @@
+@@ -51317,8 +51976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12593,7 +12761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51438,8 +51952,7 @@
+@@ -51438,8 +52096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12603,7 +12771,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51515,8 +52028,7 @@
+@@ -51515,8 +52172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12613,7 +12781,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51723,8 +52235,7 @@
+@@ -51723,8 +52379,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12623,7 +12791,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51800,8 +52311,7 @@
+@@ -51800,8 +52455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12633,7 +12801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52017,8 +52527,7 @@
+@@ -52017,8 +52671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12643,7 +12811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52185,8 +52694,7 @@
+@@ -52185,8 +52838,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12653,7 +12821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52351,8 +52859,7 @@
+@@ -52351,8 +53003,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12663,7 +12831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52413,8 +52920,7 @@
+@@ -52413,8 +53064,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12673,7 +12841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52481,8 +52987,7 @@
+@@ -52481,8 +53131,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12683,7 +12851,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52562,8 +53067,7 @@
+@@ -52562,8 +53211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12693,7 +12861,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53575,6 +54079,13 @@
+@@ -53575,6 +54223,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -12707,7 +12875,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
-@@ -54779,6 +55290,9 @@
+@@ -54779,6 +55434,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -12717,7 +12885,7 @@
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -55286,11 +55800,6 @@
+@@ -55286,11 +55944,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12729,7 +12897,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. */
-@@ -55329,6 +55838,12 @@
+@@ -55329,6 +55982,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -12780,6 +12948,58 @@
dnl Check for struct addrinfo
AC_CHECK_TYPES([struct addrinfo],,,[$netincludes])
+@@ -1681,6 +1683,51 @@
+ AC_MSG_RESULT(no)
+ fi
+ fi
++
++dnl ------------------------------------------------------------------------
++dnl Try to find if we have Linux Inode based Dir Notification
++dnl ------------------------------------------------------------------------
++
++AC_ARG_ENABLE(inotify,
++AC_HELP_STRING([--enable-inotify],[enable use of Linux inode notifications]),
++[ kde_enable_inotify=$enableval ], [kde_enable_inotify=yes])dnl
++
++AC_CHECK_GNU_EXTENSIONS
++
++if test "x$kde_enable_inotify" = "xyes"; then
++ AC_MSG_CHECKING([for Linux Inotify Notification])
++ AC_CACHE_VAL(kde_cv_have_inotify,
++ [
++ kde_cv_have_inotify=no
++ AC_LANG_SAVE
++ AC_LANG_C
++
++ AC_TRY_COMPILE(
++ [
++#include <asm/unistd.h>
++#define _S390_BITOPS_H
++#include <linux/inotify.h>
++ ],
++ [
++#ifndef IN_ALL_EVENTS
++#error no inotify notification
++#endif
++#ifndef __NR_inotify_init
++#error no __NR_inotify_init
++#endif
++
++ ],kde_cv_have_inotify=yes,kde_cv_have_inotify=no)
++
++ AC_LANG_RESTORE
++ ])
++
++ if test "$kde_cv_have_inotify" = "yes" ; then
++ AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ fi
++fi
+ dnl =======================================================
+ dnl FILE: ./kio/kssl/configure.in.in
+ dnl =======================================================
--- dcop/client/Makefile.in
+++ dcop/client/Makefile.in
@@ -303,6 +303,9 @@
More information about the pkg-kde-commits
mailing list