rev 4236 - trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jul 30 00:25:59 UTC 2006
Author: chrsmrtn
Date: 2006-07-30 00:25:54 +0000 (Sun, 30 Jul 2006)
New Revision: 4236
Modified:
trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-07-30 00:21:16 UTC (rev 4235)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-07-30 00:25:54 UTC (rev 4236)
@@ -3875,7 +3875,7 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- akode_artsplugin/Makefile.in
+++ akode_artsplugin/Makefile.in
-@@ -162,6 +162,7 @@
+@@ -161,6 +161,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
GMSGFMT = @GMSGFMT@
@@ -3883,7 +3883,7 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-@@ -253,6 +254,9 @@
+@@ -252,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3893,7 +3893,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
+@@ -307,18 +311,16 @@
XINE_CFLAGS = @XINE_CFLAGS@
XINE_CONFIG = @XINE_CONFIG@
XINE_LIBS = @XINE_LIBS@
@@ -3913,7 +3913,7 @@
akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
akode_includes = @akode_includes@
-@@ -355,14 +357,18 @@
+@@ -354,14 +356,18 @@
compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
datadir = @datadir@
@@ -3932,7 +3932,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
-@@ -444,6 +450,7 @@
+@@ -443,6 +449,7 @@
libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
link_lib_MB_FALSE = @link_lib_MB_FALSE@
link_lib_MB_TRUE = @link_lib_MB_TRUE@
@@ -3940,7 +3940,7 @@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
-@@ -458,8 +465,10 @@
+@@ -457,8 +464,10 @@
oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
oldincludedir = @oldincludedir@
@@ -3951,7 +3951,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -510,7 +519,7 @@
+@@ -511,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -3960,7 +3960,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -548,9 +557,9 @@
+@@ -549,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3972,7 +3972,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -887,7 +896,7 @@
+@@ -888,7 +897,7 @@
#>+ 2
@@ -6388,7 +6388,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59e.
++# Generated by GNU Autoconf 2.60.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -6670,8 +6670,8 @@
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells which exist, to save several forks.
-+ if test -f "$as_shell" &&
++ # Try only shells that exist, to save several forks.
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -8123,7 +8123,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.59e
++generated by GNU Autoconf 2.60
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -8142,7 +8142,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59e. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -8776,7 +8776,7 @@
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9878,8 +9878,9 @@
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -9952,7 +9953,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3124,285 +3975,273 @@
+@@ -3124,285 +3975,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10228,15 +10229,16 @@
-continue
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -10302,6 +10304,11 @@
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
@@ -10374,7 +10381,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
-+rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
@@ -10409,7 +10416,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3411,8 +4250,8 @@
+@@ -3411,8 +4255,8 @@
depcc="$CC" am_compiler_list=
@@ -10420,7 +10427,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3501,8 +4340,8 @@
+@@ -3501,8 +4345,8 @@
fi
fi
@@ -10431,7 +10438,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3524,8 +4363,8 @@
+@@ -3524,8 +4368,8 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -10442,7 +10449,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3559,8 +4398,13 @@
+@@ -3559,8 +4403,13 @@
#endif
Syntax error
_ACEOF
@@ -10458,7 +10465,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3585,9 +4429,10 @@
+@@ -3585,9 +4434,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10470,7 +10477,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3597,8 +4442,13 @@
+@@ -3597,8 +4447,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10486,7 +10493,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3625,6 +4475,7 @@
+@@ -3625,6 +4480,7 @@
ac_preproc_ok=:
break
fi
@@ -10494,7 +10501,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3642,8 +4493,8 @@
+@@ -3642,8 +4498,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -10505,7 +10512,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3666,8 +4517,13 @@
+@@ -3666,8 +4522,13 @@
#endif
Syntax error
_ACEOF
@@ -10521,7 +10528,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3692,9 +4548,10 @@
+@@ -3692,9 +4553,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10533,7 +10540,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3704,8 +4561,13 @@
+@@ -3704,8 +4566,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10549,7 +10556,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3732,6 +4594,7 @@
+@@ -3732,6 +4599,7 @@
ac_preproc_ok=:
break
fi
@@ -10557,7 +10564,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3782,18 +4645,22 @@
+@@ -3782,18 +4650,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -10585,7 +10592,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3806,36 +4673,38 @@
+@@ -3806,36 +4678,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10632,7 +10639,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3848,55 +4717,85 @@
+@@ -3848,55 +4722,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10736,7 +10743,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3919,24 +4818,36 @@
+@@ -3919,24 +4823,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -10781,15 +10788,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3945,24 +4856,28 @@
+@@ -3945,24 +4861,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -10817,7 +10825,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3978,24 +4893,36 @@
+@@ -3978,24 +4898,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -10862,7 +10870,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4004,70 +4931,53 @@
+@@ -4004,70 +4936,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10957,7 +10965,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4076,61 +4986,91 @@
+@@ -4076,61 +4991,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11034,20 +11042,21 @@
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -11070,7 +11079,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4139,8 +5079,8 @@
+@@ -4139,8 +5084,8 @@
depcc="$CXX" am_compiler_list=
@@ -11081,7 +11090,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4229,8 +5169,8 @@
+@@ -4229,8 +5174,8 @@
fi
fi
@@ -11092,7 +11101,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4248,8 +5188,8 @@
+@@ -4248,8 +5193,8 @@
@@ -11103,7 +11112,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4274,24 +5214,36 @@
+@@ -4274,24 +5219,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11148,7 +11157,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4300,13 +5252,14 @@
+@@ -4300,13 +5257,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11156,17 +11165,18 @@
+ kde_bad_compiler=yes
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-echo "${ECHO_T}$kde_bad_compiler" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+echo "${ECHO_T}$kde_bad_compiler" >&6; }
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4348,17 +5301,16 @@
+@@ -4348,17 +5306,16 @@
fi
fi
@@ -11188,7 +11198,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4386,24 +5338,36 @@
+@@ -4386,24 +5343,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11233,17 +11243,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4412,7 +5376,9 @@
+@@ -4412,8 +5381,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4426,29 +5392,28 @@
+ ac_ext=c
+@@ -4426,29 +5397,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11281,7 +11293,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4475,24 +5440,36 @@
+@@ -4475,24 +5445,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11326,17 +11338,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4501,7 +5478,9 @@
+@@ -4501,8 +5483,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4515,13 +5494,13 @@
+ ac_ext=c
+@@ -4515,13 +5499,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11354,7 +11368,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4542,16 +5521,15 @@
+@@ -4542,16 +5526,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -11375,7 +11389,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4578,24 +5556,36 @@
+@@ -4578,24 +5561,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11420,17 +11434,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4604,7 +5594,9 @@
+@@ -4604,8 +5599,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4618,16 +5610,16 @@
+ ac_ext=c
+@@ -4618,16 +5615,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11451,7 +11467,7 @@
:
fi
-@@ -4642,16 +5634,15 @@
+@@ -4642,16 +5639,15 @@
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
@@ -11472,7 +11488,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4678,24 +5669,36 @@
+@@ -4678,24 +5674,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11517,17 +11533,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4704,7 +5707,9 @@
+@@ -4704,8 +5712,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4718,27 +5723,26 @@
+ ac_ext=c
+@@ -4718,27 +5728,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11562,7 +11580,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4763,24 +5767,36 @@
+@@ -4763,24 +5772,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11607,17 +11625,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4789,7 +5805,9 @@
+@@ -4789,8 +5810,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
-@@ -4803,13 +5821,13 @@
+ ac_ext=c
+@@ -4803,13 +5826,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -11635,7 +11655,7 @@
:
fi
-@@ -4817,16 +5835,15 @@
+@@ -4817,16 +5840,15 @@
;;
esac
@@ -11656,7 +11676,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4853,24 +5870,36 @@
+@@ -4853,24 +5875,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11701,17 +11721,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4879,7 +5908,9 @@
+@@ -4879,8 +5913,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4893,28 +5924,27 @@
+ ac_ext=c
+@@ -4893,28 +5929,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11748,7 +11770,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4941,24 +5971,36 @@
+@@ -4941,24 +5976,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11793,17 +11815,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4967,7 +6009,9 @@
+@@ -4967,8 +6014,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -4981,28 +6025,27 @@
+ ac_ext=c
+@@ -4981,28 +6030,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11840,7 +11864,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5029,24 +6072,36 @@
+@@ -5029,24 +6077,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11885,17 +11909,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5055,7 +6110,9 @@
+@@ -5055,8 +6115,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5069,13 +6126,13 @@
+ ac_ext=c
+@@ -5069,13 +6131,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11913,7 +11939,7 @@
:
fi
-@@ -5087,13 +6144,13 @@
+@@ -5087,13 +6149,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -11931,7 +11957,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5101,16 +6158,15 @@
+@@ -5101,16 +6163,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -11952,7 +11978,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5137,24 +6193,36 @@
+@@ -5137,24 +6198,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11997,17 +12023,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5163,7 +6231,9 @@
+@@ -5163,8 +6236,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5177,13 +6247,13 @@
+ ac_ext=c
+@@ -5177,13 +6252,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12025,7 +12053,7 @@
:
fi
-@@ -5195,16 +6265,15 @@
+@@ -5195,16 +6270,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -12046,7 +12074,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5231,24 +6300,36 @@
+@@ -5231,24 +6305,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12091,17 +12119,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5257,7 +6338,9 @@
+@@ -5257,8 +6343,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5271,28 +6354,27 @@
+ ac_ext=c
+@@ -5271,28 +6359,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12138,7 +12168,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5319,24 +6401,36 @@
+@@ -5319,24 +6406,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12183,17 +12213,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5345,7 +6439,9 @@
+@@ -5345,8 +6444,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5359,28 +6455,27 @@
+ ac_ext=c
+@@ -5359,28 +6460,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12230,7 +12262,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5407,24 +6502,36 @@
+@@ -5407,24 +6507,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12275,17 +12307,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5433,7 +6540,9 @@
+@@ -5433,8 +6545,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5447,28 +6556,27 @@
+ ac_ext=c
+@@ -5447,28 +6561,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12322,7 +12356,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5495,24 +6603,36 @@
+@@ -5495,24 +6608,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12367,17 +12401,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5521,7 +6641,9 @@
+@@ -5521,8 +6646,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5535,13 +6657,13 @@
+ ac_ext=c
+@@ -5535,13 +6662,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12395,7 +12431,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5549,37 +6671,37 @@
+@@ -5549,37 +6676,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -12447,7 +12483,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5611,24 +6733,36 @@
+@@ -5611,24 +6738,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12492,7 +12528,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5637,9 +6771,10 @@
+@@ -5637,18 +6776,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12500,11 +12536,12 @@
+ kde_cv_opt_noinline_match=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -5647,8 +6782,8 @@
+ CFLAGS="$ac_cflags_save"
fi
fi
@@ -12515,7 +12552,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5668,16 +6803,15 @@
+@@ -5668,16 +6808,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -12536,7 +12573,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5704,24 +6838,36 @@
+@@ -5704,24 +6843,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12581,17 +12618,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5730,7 +6876,9 @@
+@@ -5730,8 +6881,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5744,29 +6892,28 @@
+ ac_ext=c
+@@ -5744,29 +6897,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12629,7 +12668,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5793,24 +6940,36 @@
+@@ -5793,24 +6945,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12674,17 +12713,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5819,7 +6978,9 @@
+@@ -5819,8 +6983,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5833,28 +6994,27 @@
+ ac_ext=c
+@@ -5833,28 +6999,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12721,7 +12762,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5881,24 +7041,36 @@
+@@ -5881,24 +7046,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12766,17 +12807,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5907,7 +7079,9 @@
+@@ -5907,8 +7084,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -5921,28 +7095,27 @@
+ ac_ext=c
+@@ -5921,28 +7100,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12813,7 +12856,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5969,24 +7142,36 @@
+@@ -5969,24 +7147,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12858,17 +12901,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5995,7 +7180,9 @@
+@@ -5995,8 +7185,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6009,28 +7196,27 @@
+ ac_ext=c
+@@ -6009,28 +7201,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12905,7 +12950,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6057,24 +7243,36 @@
+@@ -6057,24 +7248,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12950,17 +12995,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6083,7 +7281,9 @@
+@@ -6083,8 +7286,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6097,28 +7297,27 @@
+ ac_ext=c
+@@ -6097,28 +7302,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12997,7 +13044,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6145,24 +7344,36 @@
+@@ -6145,24 +7349,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13042,17 +13089,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6171,7 +7382,9 @@
+@@ -6171,8 +7387,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6185,13 +7398,13 @@
+ ac_ext=c
+@@ -6185,13 +7403,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13070,7 +13119,7 @@
:
fi
-@@ -6298,13 +7511,13 @@
+@@ -6298,13 +7516,13 @@
fi
@@ -13087,7 +13136,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6334,8 +7547,13 @@
+@@ -6334,8 +7552,13 @@
#endif
Syntax error
_ACEOF
@@ -13103,7 +13152,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6360,9 +7578,10 @@
+@@ -6360,9 +7583,10 @@
# Broken: fails on valid input.
continue
fi
@@ -13115,7 +13164,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6372,8 +7591,13 @@
+@@ -6372,8 +7596,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -13131,7 +13180,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6400,6 +7624,7 @@
+@@ -6400,6 +7629,7 @@
ac_preproc_ok=:
break
fi
@@ -13139,7 +13188,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6417,8 +7642,8 @@
+@@ -6417,8 +7647,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -13150,7 +13199,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6441,8 +7666,13 @@
+@@ -6441,8 +7671,13 @@
#endif
Syntax error
_ACEOF
@@ -13166,7 +13215,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6467,9 +7697,10 @@
+@@ -6467,9 +7702,10 @@
# Broken: fails on valid input.
continue
fi
@@ -13178,7 +13227,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6479,8 +7710,13 @@
+@@ -6479,8 +7715,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -13194,7 +13243,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6507,6 +7743,7 @@
+@@ -6507,6 +7748,7 @@
ac_preproc_ok=:
break
fi
@@ -13202,7 +13251,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6533,16 +7770,15 @@
+@@ -6533,16 +7775,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -13223,7 +13272,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6569,24 +7805,36 @@
+@@ -6569,24 +7810,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13268,17 +13317,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6595,7 +7843,9 @@
+@@ -6595,8 +7848,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6609,22 +7859,21 @@
+ ac_ext=c
+@@ -6609,22 +7864,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13307,7 +13358,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6640,36 +7889,36 @@
+@@ -6640,36 +7894,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -13354,7 +13405,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6696,24 +7945,36 @@
+@@ -6696,24 +7950,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13399,17 +13450,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6722,7 +7983,9 @@
+@@ -6722,8 +7988,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6736,29 +7999,28 @@
+ ac_ext=c
+@@ -6736,29 +8004,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13447,7 +13500,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6785,24 +8047,36 @@
+@@ -6785,24 +8052,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13492,17 +13545,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6811,7 +8085,9 @@
+@@ -6811,8 +8090,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -6825,13 +8101,13 @@
+ ac_ext=c
+@@ -6825,13 +8106,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13520,7 +13575,7 @@
:
fi
-@@ -6841,13 +8117,13 @@
+@@ -6841,13 +8122,13 @@
@@ -13538,7 +13593,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6860,13 +8136,13 @@
+@@ -6860,13 +8141,13 @@
@@ -13556,23 +13611,23 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6877,240 +8153,60 @@
+@@ -6877,272 +8158,93 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
--
++ fi
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
--
--
-+ fi
+
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13580,6 +13635,12 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -13590,6 +13651,13 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
-int
-main ()
@@ -13622,15 +13690,11 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "kde_cv_prog_cxx_$kde_cache=yes"
-+ # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-+ kde_use_nmcheck=no
- fi
+
+-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
@@ -13639,39 +13703,20 @@
-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 eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
-+ if test "$kde_use_nmcheck" = "yes"; then
-+ KDE_USE_NMCHECK_TRUE=""
-+ KDE_USE_NMCHECK_FALSE="#"
-+ else
-+ KDE_USE_NMCHECK_TRUE="#"
-+ KDE_USE_NMCHECK_FALSE=""
-+ fi
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-
-
-
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
@@ -13691,10 +13736,21 @@
+ IFS="$lt_save_ifs"
+ ;;
+ esac
-+else
+ else
+ enable_shared=yes
+fi
+
+-
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -13703,7 +13759,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+-
-int
-main ()
-{
@@ -13774,11 +13830,33 @@
- ;;
- esac
- fi
--
--
--
--
--
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then
++ enableval=$enable_static; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_static=no
++fi
+
+
+
+
+
- # Check whether --enable-nmcheck or --disable-nmcheck was given.
-if test "${enable_nmcheck+set}" = set; then
- enableval="$enable_nmcheck"
@@ -13825,25 +13903,33 @@
-fi;
-
-# Check whether --enable-static or --disable-static was given.
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
+-if test "${enable_static+set}" = set; then
- enableval="$enable_static"
- p=${PACKAGE-default}
-+ enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
-@@ -7129,7 +8225,8 @@
- esac
- else
- enable_static=no
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac
+-else
+- enable_static=no
-fi;
-+fi
-+
-
-
-
-@@ -7138,11 +8235,11 @@
+-
+-
+-
+-
+ kdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then
kdelibsuff="no"
fi
@@ -13859,7 +13945,7 @@
if test "$kdelibsuff" = "auto"; then
-@@ -7163,8 +8260,8 @@
+@@ -7163,8 +8265,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -13870,7 +13956,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7180,14 +8277,13 @@
+@@ -7180,14 +8282,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -13889,7 +13975,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7206,10 +8302,11 @@
+@@ -7206,10 +8307,11 @@
esac
else
enable_fast_install=yes
@@ -13904,7 +13990,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7233,7 +8330,7 @@
+@@ -7233,7 +8335,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
@@ -13913,7 +13999,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7262,37 +8359,184 @@
+@@ -7262,37 +8364,184 @@
fi
SED=$lt_cv_path_SED
@@ -13979,11 +14065,8 @@
+
+done
+IFS=$as_save_IFS
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
+
++
+fi
+
+GREP="$ac_cv_path_GREP"
@@ -13992,7 +14075,10 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -14115,7 +14201,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7321,11 +8565,11 @@
+@@ -7321,11 +8570,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14131,7 +14217,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7338,7 +8582,7 @@
+@@ -7338,7 +8587,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,
@@ -14140,7 +14226,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'*)
-@@ -7358,21 +8602,21 @@
+@@ -7358,21 +8607,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14169,7 +14255,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7382,29 +8626,38 @@
+@@ -7382,29 +8631,38 @@
;;
esac
fi
@@ -14216,7 +14302,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7412,56 +8665,63 @@
+@@ -7412,56 +8670,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -14314,7 +14400,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7488,44 +8748,36 @@
+@@ -7488,44 +8753,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -14369,7 +14455,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7541,7 +8793,7 @@
+@@ -7541,7 +8798,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -14378,7 +14464,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
-@@ -7557,43 +8809,27 @@
+@@ -7557,43 +8814,27 @@
esac
;;
@@ -14435,7 +14521,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
-@@ -7612,32 +8848,22 @@
+@@ -7612,32 +8853,22 @@
;;
openbsd*)
@@ -14471,7 +14557,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7658,17 +8884,20 @@
+@@ -7658,17 +8889,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -14495,7 +14581,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7677,14 +8906,17 @@
+@@ -7677,14 +8911,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14516,16 +14602,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7711,7 +8943,7 @@
+@@ -7711,7 +8948,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7714 "configure"' > conftest.$ac_ext
-+ echo '#line 8946 "configure"' > conftest.$ac_ext
++ echo '#line 8951 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7754,14 +8986,13 @@
+@@ -7754,14 +8991,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -14542,7 +14628,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7773,7 +9004,6 @@
+@@ -7773,7 +9009,6 @@
esac
;;
*64-bit*)
@@ -14550,7 +14636,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7798,8 +9028,8 @@
+@@ -7798,8 +9033,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -14561,7 +14647,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7825,24 +9055,36 @@
+@@ -7825,24 +9060,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14606,18 +14692,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7851,8 +9093,9 @@
+@@ -7851,9 +9098,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -7862,13 +9105,33 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7862,13 +9110,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -14653,7 +14741,7 @@
esac
-@@ -7876,8 +9139,8 @@
+@@ -7876,8 +9144,8 @@
@@ -14664,7 +14752,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7901,24 +9164,36 @@
+@@ -7901,24 +9169,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14709,18 +14797,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7927,8 +9202,9 @@
+@@ -7927,9 +9207,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -7985,6 +9261,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -7985,6 +9266,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -14728,7 +14818,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8004,18 +9281,27 @@
+@@ -8004,18 +9286,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -14762,7 +14852,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8028,12 +9314,14 @@
+@@ -8028,12 +9319,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -14780,7 +14870,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8056,9 +9344,9 @@
+@@ -8056,9 +9349,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14793,7 +14883,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8072,24 +9360,36 @@
+@@ -8072,24 +9365,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -14838,15 +14928,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8098,12 +9398,14 @@
+@@ -8098,12 +9403,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -14856,7 +14947,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8118,18 +9420,19 @@
+@@ -8118,18 +9425,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14884,7 +14975,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8140,24 +9443,36 @@
+@@ -8140,24 +9448,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -14929,17 +15020,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8166,15 +9481,16 @@
+@@ -8166,15 +9486,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -14951,7 +15043,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8183,8 +9499,13 @@
+@@ -8183,8 +9504,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -14967,7 +15059,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8208,9 +9529,10 @@
+@@ -8208,9 +9534,10 @@
ac_header_preproc=no
fi
@@ -14980,7 +15072,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8234,25 +9556,19 @@
+@@ -8234,25 +9561,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -15013,12 +15105,64 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8264,17 +9580,278 @@
+@@ -8264,221 +9585,540 @@
done
-+
-+
+-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'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$F77"; then
+- ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- test -n "$F77" && break
+- done
+-fi
+-if test -z "$F77"; then
+- ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
@@ -15031,21 +15175,88 @@
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_F77"; then
+- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_F77="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- test -n "$ac_ct_F77" && break
+-done
+-
+- F77=$ac_ct_F77
+-fi
+-
+-
+-# Provide some information about the compiler.
+-echo "$as_me:8359:" \
+- "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
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-rm -f a.out
+-
+-# If we don't use `.F' as extension, the preprocessor is not run on the
+-# input file. (Note that this only needs to work for GNU compilers.)
+-ac_save_ext=$ac_ext
+-ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+- program main
+-#ifndef __GNUC__
+- choke me
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
@@ -15055,9 +15266,14 @@
+# include <limits.h>
+#else
+# include <assert.h>
-+#endif
+ #endif
+-
+- end
+ Syntax error
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15065,11 +15281,26 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 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
+ 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_f77_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
+- ac_compiler_gnu=yes
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -15082,21 +15313,43 @@
+fi
+if test -z "$ac_cpp_err"; then
+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
+ # Broken: fails on valid input.
+continue
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+-ac_ext=$ac_save_ext
+-ac_test_FFLAGS=${FFLAGS+set}
+-ac_save_FFLAGS=$FFLAGS
+-FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_f77_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- FFLAGS=-g
+-cat >conftest.$ac_ext <<_ACEOF
+- program main
+rm -f conftest.err conftest.$ac_ext
-+
+
+- end
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
@@ -15109,11 +15362,26 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 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
+ 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_f77_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
+- ac_cv_prog_f77_g=yes
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -15127,15 +15395,17 @@
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
+ # Passes both tests.
+ac_preproc_ok=:
+break
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -15143,7 +15413,11 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+-if test "$ac_test_FFLAGS" = set; then
+- FFLAGS=$ac_save_FFLAGS
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -15278,104 +15552,97 @@
+
+fi
+
- 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'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++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'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8287,36 +9864,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$F77"; then
++ ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
++ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+IFS=$as_save_IFS
-
- fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
-- echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
+ { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
-
++fi
+
- test -n "$F77" && break
- done
- fi
- if test -z "$F77"; then
- ac_ct_F77=$F77
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++
++ test -n "$F77" && break
++ done
++fi
++if test -z "$F77"; then
++ ac_ct_F77=$F77
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8329,48 +9908,78 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_F77"; then
++ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
++ ac_cv_prog_ac_ct_F77="$ac_prog"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
-- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
-
++fi
+
- test -n "$ac_ct_F77" && break
- done
-
-- F77=$ac_ct_F77
++
++ test -n "$ac_ct_F77" && break
++done
++
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
@@ -15391,16 +15658,12 @@
+esac
+ F77=$ac_ct_F77
+ fi
- fi
-
-
- # Provide some information about the compiler.
--echo "$as_me:8359:" \
-- "checking for Fortran 77 compiler version" >&5
++fi
++
++
++# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
++ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15408,11 +15671,9 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15420,11 +15681,9 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15432,26 +15691,29 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -8380,8 +9989,8 @@
- # input file. (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file. (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8394,24 +10003,36 @@
- end
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++ program main
++#ifndef __GNUC__
++ choke me
++#endif
++
++ end
++_ACEOF
++rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15459,16 +15721,12 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
++ 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_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15476,54 +15734,49 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8420,20 +10041,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_compiler_gnu=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
- fi
++fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8444,24 +10066,36 @@
- end
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
++if test "${ac_cv_prog_f77_g+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++ program main
++
++ end
++_ACEOF
++rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15531,16 +15784,12 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
++ 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_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -15548,40 +15797,38 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8470,13 +10104,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_f77_g=no
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_prog_f77_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_f77_g=no
- fi
++fi
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
++if test "$ac_test_FFLAGS" = set; then
++ FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -8505,13 +10140,13 @@
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-g -O2"
+@@ -8505,13 +10145,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -15598,7 +15845,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8540,20 +10175,70 @@
+@@ -8540,20 +10180,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -15675,7 +15922,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.
-@@ -8564,19 +10249,19 @@
+@@ -8564,19 +10254,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -15701,7 +15948,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8590,9 +10275,6 @@
+@@ -8590,9 +10280,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -15711,7 +15958,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'"
-@@ -8614,14 +10296,30 @@
+@@ -8614,14 +10301,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -15744,7 +15991,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8639,14 +10337,17 @@
+@@ -8639,14 +10342,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -15764,7 +16011,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8764,15 +10465,15 @@
+@@ -8764,15 +10470,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -15786,7 +16033,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8786,8 +10487,8 @@
+@@ -8786,8 +10492,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -15797,7 +16044,7 @@
objdir=$lt_cv_objdir
-@@ -8808,7 +10509,7 @@
+@@ -8808,7 +10514,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -15806,7 +16053,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8828,7 +10529,7 @@
+@@ -8828,7 +10534,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -15815,7 +16062,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8838,8 +10539,8 @@
+@@ -8838,8 +10544,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -15826,7 +16073,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8852,32 +10553,34 @@
+@@ -8852,32 +10558,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15868,7 +16115,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8890,27 +10593,41 @@
+@@ -8890,27 +10598,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15917,7 +16164,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8918,8 +10635,8 @@
+@@ -8918,8 +10640,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -15928,7 +16175,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8932,32 +10649,34 @@
+@@ -8932,32 +10654,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15970,7 +16217,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8970,27 +10689,41 @@
+@@ -8970,27 +10694,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16019,7 +16266,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8998,8 +10731,8 @@
+@@ -8998,8 +10736,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -16030,7 +16277,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9012,32 +10745,34 @@
+@@ -9012,32 +10750,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16072,7 +16319,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9050,27 +10785,41 @@
+@@ -9050,27 +10790,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16121,7 +16368,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9085,6 +10834,7 @@
+@@ -9085,6 +10839,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -16129,7 +16376,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9104,21 +10854,32 @@
+@@ -9104,21 +10859,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -16166,7 +16413,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9138,7 +10899,7 @@
+@@ -9138,7 +10904,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -16175,7 +16422,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
-@@ -9170,17 +10931,17 @@
+@@ -9170,17 +10936,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16199,7 +16446,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9200,7 +10961,7 @@
+@@ -9200,7 +10966,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -16208,7 +16455,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
-@@ -9232,11 +10993,11 @@
+@@ -9232,11 +10998,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16224,7 +16471,7 @@
fi
else
-@@ -9251,21 +11012,21 @@
+@@ -9251,21 +11017,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -16253,7 +16500,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9295,68 +11056,25 @@
+@@ -9295,68 +11061,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -16337,7 +16584,7 @@
## CAVEAT EMPTOR:
-@@ -9370,8 +11088,8 @@
+@@ -9370,8 +11093,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -16348,7 +16595,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9385,26 +11103,28 @@
+@@ -9385,26 +11108,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -16357,12 +16604,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9391: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11109: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9395: \$? = $ac_status" >&5
-+ echo "$as_me:11113: \$? = $ac_status" >&5
++ echo "$as_me:11118: \$? = $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
@@ -16384,7 +16631,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9418,8 +11138,8 @@
+@@ -9418,8 +11143,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -16395,7 +16642,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9457,6 +11177,11 @@
+@@ -9457,6 +11182,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -16407,7 +16654,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9473,7 +11198,7 @@
+@@ -9473,7 +11203,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -16416,7 +16663,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9499,6 +11224,16 @@
+@@ -9499,6 +11229,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -16433,7 +16680,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9510,7 +11245,7 @@
+@@ -9510,7 +11250,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.
@@ -16442,7 +16689,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9533,13 +11268,20 @@
+@@ -9533,13 +11273,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16465,7 +16712,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9554,15 +11296,15 @@
+@@ -9554,15 +11301,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -16487,7 +16734,7 @@
;;
sunos4*)
-@@ -9571,7 +11313,7 @@
+@@ -9571,7 +11318,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16496,7 +16743,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9584,6 +11326,17 @@
+@@ -9584,6 +11331,17 @@
fi
;;
@@ -16514,7 +16761,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9595,16 +11348,16 @@
+@@ -9595,16 +11353,16 @@
esac
fi
@@ -16535,7 +16782,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9618,26 +11371,28 @@
+@@ -9618,26 +11376,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -16544,12 +16791,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9624: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11377: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11382: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9628: \$? = $ac_status" >&5
-+ echo "$as_me:11381: \$? = $ac_status" >&5
++ echo "$as_me:11386: \$? = $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
@@ -16571,7 +16818,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9650,7 +11405,7 @@
+@@ -9650,7 +11410,7 @@
fi
fi
@@ -16580,7 +16827,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9660,8 +11415,50 @@
+@@ -9660,8 +11420,50 @@
;;
esac
@@ -16633,7 +16880,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9672,60 +11469,58 @@
+@@ -9672,60 +11474,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -16655,12 +16902,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9691: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11481: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11486: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9695: \$? = $ac_status" >&5
-+ echo "$as_me:11485: \$? = $ac_status" >&5
++ echo "$as_me:11490: \$? = $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
@@ -16712,7 +16959,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9735,8 +11530,8 @@
+@@ -9735,8 +11535,8 @@
need_locks=no
fi
@@ -16723,7 +16970,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9774,6 +11569,16 @@
+@@ -9774,6 +11574,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -16740,7 +16987,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9784,6 +11589,10 @@
+@@ -9784,6 +11594,10 @@
with_gnu_ld=no
fi
;;
@@ -16751,7 +16998,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9794,6 +11603,27 @@
+@@ -9794,6 +11608,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -16779,7 +17026,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9831,7 +11661,7 @@
+@@ -9831,7 +11666,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -16788,7 +17035,7 @@
else
ld_shlibs=no
fi
-@@ -9841,13 +11671,13 @@
+@@ -9841,13 +11676,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'
@@ -16805,7 +17052,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
-@@ -9856,23 +11686,70 @@
+@@ -9856,23 +11691,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -16881,7 +17128,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9886,13 +11763,40 @@
+@@ -9886,13 +11768,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16924,7 +17171,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9902,24 +11806,19 @@
+@@ -9902,24 +11811,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16956,7 +17203,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9931,7 +11830,7 @@
+@@ -9931,7 +11835,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -16965,7 +17212,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9953,9 +11852,21 @@
+@@ -9953,9 +11857,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -16989,7 +17236,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9972,7 +11883,7 @@
+@@ -9972,7 +11888,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -16998,7 +17245,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`
-@@ -9991,8 +11902,12 @@
+@@ -9991,8 +11907,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -17011,7 +17258,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10000,22 +11915,23 @@
+@@ -10000,22 +11920,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -17042,7 +17289,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10031,24 +11947,36 @@
+@@ -10031,24 +11952,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17087,14 +17334,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10062,19 +11990,20 @@
+@@ -10062,19 +11995,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17112,7 +17360,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10093,24 +12022,36 @@
+@@ -10093,24 +12027,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17157,17 +17405,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10124,7 +12065,9 @@
+@@ -10124,8 +12070,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10134,13 +12077,11 @@
+
+@@ -10134,13 +12082,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -17184,7 +17434,7 @@
fi
fi
;;
-@@ -10153,7 +12094,7 @@
+@@ -10153,7 +12099,7 @@
ld_shlibs=no
;;
@@ -17193,7 +17443,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10163,13 +12104,13 @@
+@@ -10163,13 +12109,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -17210,7 +17460,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.
-@@ -10179,52 +12120,52 @@
+@@ -10179,52 +12125,52 @@
;;
darwin* | rhapsody*)
@@ -17303,7 +17553,7 @@
fi
;;
-@@ -10258,8 +12199,8 @@
+@@ -10258,8 +12204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17314,7 +17564,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10267,7 +12208,7 @@
+@@ -10267,7 +12213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -17323,7 +17573,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
-@@ -10281,47 +12222,62 @@
+@@ -10281,47 +12227,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -17410,7 +17660,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10335,7 +12291,7 @@
+@@ -10335,7 +12296,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -17419,7 +17669,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'
-@@ -10345,7 +12301,7 @@
+@@ -10345,7 +12306,7 @@
link_all_deplibs=yes
;;
@@ -17428,7 +17678,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10368,7 +12324,8 @@
+@@ -10368,7 +12329,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
@@ -17438,7 +17688,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10378,7 +12335,7 @@
+@@ -10378,7 +12340,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -17447,7 +17697,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10389,14 +12346,14 @@
+@@ -10389,14 +12351,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -17464,7 +17714,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'
-@@ -10408,13 +12365,13 @@
+@@ -10408,13 +12370,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17480,7 +17730,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10422,21 +12379,15 @@
+@@ -10422,21 +12384,15 @@
hardcode_libdir_separator=:
;;
@@ -17506,7 +17756,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'
-@@ -10445,8 +12396,18 @@
+@@ -10445,8 +12401,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -17527,7 +17777,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10455,7 +12416,7 @@
+@@ -10455,7 +12421,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.
@@ -17536,7 +17786,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10503,36 +12464,45 @@
+@@ -10503,36 +12469,45 @@
fi
;;
@@ -17603,7 +17853,7 @@
;;
uts4*)
-@@ -10547,15 +12517,10 @@
+@@ -10547,15 +12522,10 @@
esac
fi
@@ -17621,7 +17871,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10573,8 +12538,8 @@
+@@ -10573,8 +12543,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -17632,7 +17882,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10588,6 +12553,7 @@
+@@ -10588,6 +12558,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -17640,7 +17890,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10610,20 +12576,20 @@
+@@ -10610,20 +12581,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -17666,7 +17916,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10633,7 +12599,20 @@
+@@ -10633,7 +12604,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17688,7 +17938,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10698,7 +12677,7 @@
+@@ -10698,7 +12682,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -17697,7 +17947,7 @@
;;
beos*)
-@@ -10707,7 +12686,7 @@
+@@ -10707,7 +12691,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -17706,7 +17956,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10723,7 +12702,7 @@
+@@ -10723,7 +12707,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -17715,7 +17965,7 @@
need_version=no
need_lib_prefix=no
-@@ -10735,7 +12714,8 @@
+@@ -10735,7 +12719,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -17725,7 +17975,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10765,7 +12745,7 @@
+@@ -10765,7 +12750,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -17734,7 +17984,7 @@
;;
esac
;;
-@@ -10788,7 +12768,7 @@
+@@ -10788,7 +12773,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -17743,7 +17993,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"`
-@@ -10811,20 +12791,17 @@
+@@ -10811,20 +12796,17 @@
dynamic_linker=no
;;
@@ -17775,7 +18025,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10842,14 +12819,19 @@
+@@ -10842,14 +12824,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -17797,7 +18047,7 @@
esac
;;
-@@ -10869,9 +12851,9 @@
+@@ -10869,9 +12856,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -17809,7 +18059,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10886,7 +12868,7 @@
+@@ -10886,7 +12873,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -17818,7 +18068,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10897,7 +12879,7 @@
+@@ -10897,7 +12884,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -17827,7 +18077,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10909,6 +12891,18 @@
+@@ -10909,6 +12896,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17846,7 +18096,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10952,29 +12946,26 @@
+@@ -10952,29 +12951,26 @@
;;
# This must be Linux ELF.
@@ -17883,7 +18133,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,
-@@ -10984,6 +12975,18 @@
+@@ -10984,6 +12980,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17902,7 +18152,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10993,7 +12996,7 @@
+@@ -10993,7 +13001,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -17911,7 +18161,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11021,8 +13024,13 @@
+@@ -11021,8 +13029,13 @@
openbsd*)
version_type=sunos
@@ -17926,7 +18176,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
-@@ -11042,7 +13050,7 @@
+@@ -11042,7 +13055,7 @@
os2*)
libname_spec='$name'
@@ -17935,7 +18185,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11060,13 +13068,6 @@
+@@ -11060,13 +13073,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17949,7 +18199,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11092,7 +13093,7 @@
+@@ -11092,7 +13098,7 @@
need_version=yes
;;
@@ -17958,7 +18208,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11125,6 +13126,29 @@
+@@ -11125,6 +13131,29 @@
fi
;;
@@ -17988,7 +18238,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11136,16 +13160,21 @@
+@@ -11136,16 +13165,21 @@
dynamic_linker=no
;;
esac
@@ -18016,7 +18266,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11165,8 +13194,8 @@
+@@ -11165,8 +13199,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -18027,7 +18277,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11179,29 +13208,29 @@
+@@ -11179,29 +13213,29 @@
striplib=
old_striplib=
@@ -18067,7 +18317,7 @@
;;
esac
fi
-@@ -11233,8 +13262,8 @@
+@@ -11233,8 +13267,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -18078,7 +18328,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11247,40 +13276,52 @@
+@@ -11247,40 +13281,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18143,15 +18393,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11289,14 +13330,15 @@
+@@ -11289,14 +13335,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18162,7 +18413,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11310,8 +13352,8 @@
+@@ -11310,8 +13357,8 @@
;;
*)
@@ -18173,7 +18424,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11338,53 +13380,59 @@
+@@ -11338,53 +13385,59 @@
#undef shl_load
@@ -18252,15 +18503,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11393,18 +13441,19 @@
+@@ -11393,18 +13446,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -18277,7 +18529,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11417,40 +13466,52 @@
+@@ -11417,40 +13471,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18342,15 +18594,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11459,19 +13520,20 @@
+@@ -11459,19 +13525,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18368,7 +18621,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11498,53 +13560,59 @@
+@@ -11498,53 +13565,59 @@
#undef dlopen
@@ -18447,15 +18700,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11553,18 +13621,19 @@
+@@ -11553,18 +13626,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -18472,7 +18726,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11577,40 +13646,52 @@
+@@ -11577,40 +13651,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18537,15 +18791,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11619,19 +13700,20 @@
+@@ -11619,19 +13705,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18563,7 +18818,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11644,40 +13726,52 @@
+@@ -11644,40 +13731,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18628,15 +18883,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11686,19 +13780,20 @@
+@@ -11686,19 +13785,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18654,7 +18910,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11711,40 +13806,52 @@
+@@ -11711,40 +13811,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18719,15 +18975,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11753,14 +13860,15 @@
+@@ -11753,14 +13865,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18738,7 +18995,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11795,13 +13903,13 @@
+@@ -11795,13 +13908,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -18755,16 +19012,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11811,7 +13919,7 @@
+@@ -11811,7 +13924,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
-+#line 13922 "configure"
++#line 13927 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11868,6 +13976,8 @@
+@@ -11868,6 +13981,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -18773,7 +19030,7 @@
exit (status);
}
-@@ -11877,12 +13987,12 @@
+@@ -11877,12 +13992,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18788,7 +19045,7 @@
esac
else :
# compilation failed
-@@ -11893,13 +14003,13 @@
+@@ -11893,13 +14008,13 @@
fi
@@ -18807,16 +19064,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11909,7 +14019,7 @@
+@@ -11909,7 +14024,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11912 "configure"
-+#line 14022 "configure"
++#line 14027 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11966,6 +14076,8 @@
+@@ -11966,6 +14081,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -18825,7 +19082,7 @@
exit (status);
}
-@@ -11975,12 +14087,12 @@
+@@ -11975,12 +14092,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18840,7 +19097,7 @@
esac
else :
# compilation failed
-@@ -11991,8 +14103,8 @@
+@@ -11991,8 +14108,8 @@
fi
@@ -18851,7 +19108,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12013,19 +14125,19 @@
+@@ -12013,19 +14130,19 @@
fi
@@ -18879,7 +19136,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12034,58 +14146,21 @@
+@@ -12034,58 +14151,21 @@
fi
;;
@@ -18945,7 +19202,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12100,7 +14175,8 @@
+@@ -12100,7 +14180,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.
@@ -18955,7 +19212,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 \
-@@ -12214,11 +14290,11 @@
+@@ -12214,11 +14295,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -18969,7 +19226,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12248,6 +14324,12 @@
+@@ -12248,6 +14329,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -18982,7 +19239,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12259,6 +14341,9 @@
+@@ -12259,6 +14346,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -18992,7 +19249,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12278,7 +14363,7 @@
+@@ -12278,7 +14368,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -19001,7 +19258,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12309,7 +14394,7 @@
+@@ -12309,7 +14399,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19010,7 +19267,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12324,7 +14409,7 @@
+@@ -12324,7 +14414,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -19019,7 +19276,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12551,7 +14636,10 @@
+@@ -12551,7 +14641,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.
@@ -19031,7 +19288,7 @@
fi
-@@ -12564,11 +14652,11 @@
+@@ -12564,11 +14657,11 @@
CC="$lt_save_CC"
@@ -19047,7 +19304,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12586,6 +14674,9 @@
+@@ -12586,6 +14679,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -19057,7 +19314,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12616,8 +14707,10 @@
+@@ -12616,8 +14712,10 @@
case $tagname in
CXX)
@@ -19070,7 +19327,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12636,6 +14729,7 @@
+@@ -12636,6 +14734,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -19078,7 +19335,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12653,7 +14747,7 @@
+@@ -12653,7 +14752,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -19087,7 +19344,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12663,17 +14757,34 @@
+@@ -12663,17 +14762,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -19123,7 +19380,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12684,18 +14795,27 @@
+@@ -12684,18 +14800,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -19154,7 +19411,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12709,18 +14829,18 @@
+@@ -12709,18 +14834,18 @@
# Set up default GNU C++ configuration
@@ -19179,7 +19436,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12749,11 +14869,11 @@
+@@ -12749,11 +14874,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -19195,7 +19452,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12766,7 +14886,7 @@
+@@ -12766,7 +14891,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,
@@ -19204,7 +19461,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'*)
-@@ -12786,21 +14906,21 @@
+@@ -12786,21 +14911,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -19233,7 +19490,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12810,8 +14930,8 @@
+@@ -12810,8 +14935,8 @@
;;
esac
fi
@@ -19244,7 +19501,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12819,8 +14939,8 @@
+@@ -12819,8 +14944,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
@@ -19255,7 +19512,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12846,7 +14966,7 @@
+@@ -12846,7 +14971,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.
@@ -19264,7 +19521,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12861,8 +14981,8 @@
+@@ -12861,8 +14986,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -19275,7 +19532,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12877,8 +14997,23 @@
+@@ -12877,8 +15002,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -19301,7 +19558,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12895,7 +15030,7 @@
+@@ -12895,7 +15035,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -19310,7 +19567,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`
-@@ -12914,8 +15049,12 @@
+@@ -12914,8 +15054,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -19323,7 +19580,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12924,15 +15063,16 @@
+@@ -12924,15 +15068,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -19344,7 +19601,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.
-@@ -12954,24 +15094,36 @@
+@@ -12954,24 +15099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -19389,14 +19646,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12985,20 +15137,21 @@
+@@ -12985,20 +15142,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -19414,7 +19672,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13017,24 +15170,36 @@
+@@ -13017,24 +15175,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -19459,17 +19717,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13048,7 +15213,9 @@
+@@ -13048,8 +15218,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13058,16 +15225,26 @@
+
+@@ -13058,16 +15230,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -19501,7 +19761,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13081,12 +15258,12 @@
+@@ -13081,12 +15263,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -19516,7 +19776,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
-@@ -13095,70 +15272,81 @@
+@@ -13095,70 +15277,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -19650,7 +19910,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13169,14 +15357,14 @@
+@@ -13169,14 +15362,14 @@
;;
esac
;;
@@ -19667,7 +19927,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13193,12 +15381,12 @@
+@@ -13193,12 +15386,12 @@
# location of the library.
case $cc_basename in
@@ -19683,7 +19943,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13207,11 +15395,11 @@
+@@ -13207,11 +15400,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.
@@ -19697,7 +19957,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13221,33 +15409,22 @@
+@@ -13221,33 +15414,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -19738,7 +19998,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13258,17 +15435,20 @@
+@@ -13258,17 +15440,20 @@
esac
case $cc_basename in
@@ -19765,7 +20025,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13284,12 +15464,15 @@
+@@ -13284,12 +15469,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -19785,7 +20045,7 @@
;;
esac
fi
-@@ -13300,11 +15483,25 @@
+@@ -13300,11 +15488,25 @@
;;
esac
;;
@@ -19813,7 +20073,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13315,9 +15512,9 @@
+@@ -13315,9 +15517,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -19825,7 +20085,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13326,16 +15523,16 @@
+@@ -13326,16 +15528,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -19846,7 +20106,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13353,20 +15550,44 @@
+@@ -13353,20 +15555,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -19897,7 +20157,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13394,7 +15615,7 @@
+@@ -13394,7 +15620,7 @@
;;
mvs*)
case $cc_basename in
@@ -19906,7 +20166,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13404,7 +15625,7 @@
+@@ -13404,7 +15630,7 @@
;;
esac
;;
@@ -19915,7 +20175,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=
-@@ -13415,15 +15636,31 @@
+@@ -13415,15 +15641,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::"'
;;
@@ -19949,7 +20209,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13433,14 +15670,14 @@
+@@ -13433,14 +15675,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -19967,7 +20227,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,7 +15695,7 @@
+@@ -13458,7 +15700,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19976,7 +20236,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13477,13 +15714,13 @@
+@@ -13477,13 +15719,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -19992,7 +20252,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13492,17 +15729,17 @@
+@@ -13492,17 +15734,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -20014,7 +20274,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13521,7 +15758,7 @@
+@@ -13521,7 +15763,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -20023,7 +20283,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13542,27 +15779,14 @@
+@@ -13542,27 +15784,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -20053,7 +20313,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13575,36 +15799,33 @@
+@@ -13575,36 +15804,33 @@
;;
solaris*)
case $cc_basename in
@@ -20102,7 +20362,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13612,9 +15833,9 @@
+@@ -13612,9 +15838,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -20114,7 +20374,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13624,9 +15845,9 @@
+@@ -13624,9 +15850,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
@@ -20126,7 +20386,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13635,9 +15856,9 @@
+@@ -13635,9 +15861,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -20138,7 +20398,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13650,12 +15871,63 @@
+@@ -13650,12 +15876,63 @@
;;
esac
;;
@@ -20204,7 +20464,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13675,8 +15947,8 @@
+@@ -13675,8 +15952,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -20215,7 +20475,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13712,7 +15984,7 @@
+@@ -13712,7 +15989,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.
@@ -20224,7 +20484,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13752,7 +16024,7 @@
+@@ -13752,7 +16029,7 @@
fi
;;
@@ -20233,7 +20493,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13788,6 +16060,29 @@
+@@ -13788,6 +16065,29 @@
$rm -f confest.$objext
@@ -20263,7 +20523,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13796,8 +16091,8 @@
+@@ -13796,8 +16096,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -20274,7 +20534,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13835,6 +16130,10 @@
+@@ -13835,6 +16135,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -20285,7 +20545,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13843,7 +16142,7 @@
+@@ -13843,7 +16147,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20294,7 +20554,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13868,18 +16167,28 @@
+@@ -13868,18 +16172,28 @@
;;
chorus*)
case $cc_basename in
@@ -20326,7 +20586,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13887,22 +16196,22 @@
+@@ -13887,22 +16201,22 @@
;;
esac
;;
@@ -20355,7 +20615,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13915,9 +16224,13 @@
+@@ -13915,9 +16229,13 @@
;;
esac
;;
@@ -20370,7 +20630,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13926,20 +16239,26 @@
+@@ -13926,20 +16244,26 @@
;;
esac
;;
@@ -20401,7 +20661,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13956,25 +16275,25 @@
+@@ -13956,25 +16280,25 @@
;;
mvs*)
case $cc_basename in
@@ -20432,7 +20692,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13988,24 +16307,15 @@
+@@ -13988,24 +16312,15 @@
;;
psos*)
;;
@@ -20459,7 +20719,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14015,12 +16325,12 @@
+@@ -14015,12 +16330,12 @@
;;
sunos4*)
case $cc_basename in
@@ -20474,7 +20734,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14030,7 +16340,7 @@
+@@ -14030,7 +16345,7 @@
;;
tandem*)
case $cc_basename in
@@ -20483,7 +20743,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14038,7 +16348,14 @@
+@@ -14038,7 +16353,14 @@
;;
esac
;;
@@ -20499,7 +20759,7 @@
;;
vxworks*)
;;
-@@ -14048,16 +16365,16 @@
+@@ -14048,16 +16370,16 @@
esac
fi
@@ -20520,7 +20780,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14071,26 +16388,28 @@
+@@ -14071,26 +16393,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -20529,12 +20789,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16394: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14081: \$? = $ac_status" >&5
-+ echo "$as_me:16398: \$? = $ac_status" >&5
++ echo "$as_me:16403: \$? = $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
@@ -20556,7 +20816,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14103,7 +16422,7 @@
+@@ -14103,7 +16427,7 @@
fi
fi
@@ -20565,7 +20825,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14113,8 +16432,50 @@
+@@ -14113,8 +16437,50 @@
;;
esac
@@ -20618,7 +20878,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14125,60 +16486,58 @@
+@@ -14125,60 +16491,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20640,12 +20900,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14144: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16498: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16503: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14148: \$? = $ac_status" >&5
-+ echo "$as_me:16502: \$? = $ac_status" >&5
++ echo "$as_me:16507: \$? = $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
@@ -20697,7 +20957,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14188,8 +16547,8 @@
+@@ -14188,8 +16552,8 @@
need_locks=no
fi
@@ -20708,7 +20968,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14206,22 +16565,20 @@
+@@ -14206,22 +16570,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -20737,7 +20997,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14239,8 +16596,8 @@
+@@ -14239,8 +16601,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -20748,7 +21008,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14254,6 +16611,7 @@
+@@ -14254,6 +16616,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -20756,7 +21016,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14276,20 +16634,20 @@
+@@ -14276,20 +16639,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -20782,7 +21042,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14299,7 +16657,20 @@
+@@ -14299,7 +16662,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20804,7 +21064,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14364,7 +16735,7 @@
+@@ -14364,7 +16740,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20813,7 +21073,7 @@
;;
beos*)
-@@ -14373,7 +16744,7 @@
+@@ -14373,7 +16749,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -20822,7 +21082,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14389,7 +16760,7 @@
+@@ -14389,7 +16765,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -20831,7 +21091,7 @@
need_version=no
need_lib_prefix=no
-@@ -14401,7 +16772,8 @@
+@@ -14401,7 +16777,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -20841,7 +21101,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14431,7 +16803,7 @@
+@@ -14431,7 +16808,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20850,7 +21110,7 @@
;;
esac
;;
-@@ -14454,7 +16826,7 @@
+@@ -14454,7 +16831,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -20859,7 +21119,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"`
-@@ -14477,20 +16849,17 @@
+@@ -14477,20 +16854,17 @@
dynamic_linker=no
;;
@@ -20891,7 +21151,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14508,14 +16877,19 @@
+@@ -14508,14 +16882,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -20913,7 +21173,7 @@
esac
;;
-@@ -14535,9 +16909,9 @@
+@@ -14535,9 +16914,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -20925,7 +21185,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14552,7 +16926,7 @@
+@@ -14552,7 +16931,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -20934,7 +21194,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14563,7 +16937,7 @@
+@@ -14563,7 +16942,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -20943,7 +21203,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14575,6 +16949,18 @@
+@@ -14575,6 +16954,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -20962,7 +21222,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14618,29 +17004,26 @@
+@@ -14618,29 +17009,26 @@
;;
# This must be Linux ELF.
@@ -20999,7 +21259,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,
-@@ -14650,6 +17033,18 @@
+@@ -14650,6 +17038,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21018,7 +21278,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14659,7 +17054,7 @@
+@@ -14659,7 +17059,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21027,7 +21287,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14687,8 +17082,13 @@
+@@ -14687,8 +17087,13 @@
openbsd*)
version_type=sunos
@@ -21042,7 +21302,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
-@@ -14708,7 +17108,7 @@
+@@ -14708,7 +17113,7 @@
os2*)
libname_spec='$name'
@@ -21051,7 +21311,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14726,13 +17126,6 @@
+@@ -14726,13 +17131,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21065,7 +21325,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14758,7 +17151,7 @@
+@@ -14758,7 +17156,7 @@
need_version=yes
;;
@@ -21074,17 +21334,25 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14791,6 +17184,29 @@
+@@ -14791,27 +17189,55 @@
fi
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -21101,12 +21369,16 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14802,16 +17218,21 @@
- dynamic_linker=no
- ;;
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
++
++*)
++ dynamic_linker=no
++ ;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
@@ -21132,7 +21404,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14831,8 +17252,8 @@
+@@ -14831,8 +17257,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -21143,7 +21415,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14843,1118 +17264,293 @@
+@@ -14843,1001 +17269,176 @@
enable_fast_install=needless
fi
@@ -21752,9 +22024,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -21796,10 +22066,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-
+-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -21824,9 +22091,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -21868,9 +22133,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-
+-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -21882,75 +22145,42 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-
+-
+-
-fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-
+-
+-
-fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
+-
+-
-fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-
+-
+-
-fi
-+# Do we need a version for libraries?
-+need_version=$need_version
-
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-
+-
+-
-fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-
+-
- ;;
- esac
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-
+-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
+-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
+-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
+-
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -21964,19 +22194,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15480 "configure"
-#include "confdefs.h"
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Library versioning type.
-+version_type=$version_type
-
+-
-#include <stdio.h>
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -21986,10 +22210,7 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-
+-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -22011,35 +22232,24 @@
-# endif
-# endif
-#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-
+-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
+-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
+-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
+-
- exit (status);
-}
-EOF
@@ -22061,23 +22271,12 @@
- fi
-fi
-rm -fr conftest*
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
+-
+-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-
+-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -22093,22 +22292,13 @@
- cat > conftest.$ac_ext <<EOF
-#line 15578 "configure"
-#include "confdefs.h"
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-
+-
-#include <stdio.h>
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -22363,130 +22553,30 @@
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+@@ -15853,7 +17454,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
-shrext='$shrext'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
--
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -15868,7 +17469,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
-# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_CXX
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -16070,7 +17666,10 @@
+ # Do we need the lib prefix for modules?
+@@ -16070,7 +17671,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.
@@ -22498,7 +22588,7 @@
fi
-@@ -16142,29 +17741,55 @@
+@@ -16142,29 +17746,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22538,19 +22628,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-+
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -22562,7 +22652,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16172,21 +17797,21 @@
+@@ -16172,21 +17802,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -22594,7 +22684,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16195,8 +17820,8 @@
+@@ -16195,8 +17825,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -22605,7 +22695,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16234,6 +17859,11 @@
+@@ -16234,6 +17864,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -22617,7 +22707,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16250,7 +17880,7 @@
+@@ -16250,7 +17885,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22626,7 +22716,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16276,6 +17906,16 @@
+@@ -16276,6 +17911,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22643,7 +22733,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16287,7 +17927,7 @@
+@@ -16287,7 +17932,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.
@@ -22652,7 +22742,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16310,13 +17950,20 @@
+@@ -16310,13 +17955,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22675,7 +22765,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16331,15 +17978,15 @@
+@@ -16331,15 +17983,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -22697,7 +22787,7 @@
;;
sunos4*)
-@@ -16348,7 +17995,7 @@
+@@ -16348,7 +18000,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22706,7 +22796,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16361,6 +18008,17 @@
+@@ -16361,6 +18013,17 @@
fi
;;
@@ -22724,7 +22814,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16372,16 +18030,16 @@
+@@ -16372,16 +18035,16 @@
esac
fi
@@ -22745,7 +22835,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16395,26 +18053,28 @@
+@@ -16395,26 +18058,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -22754,12 +22844,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18059: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18064: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16405: \$? = $ac_status" >&5
-+ echo "$as_me:18063: \$? = $ac_status" >&5
++ echo "$as_me:18068: \$? = $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
@@ -22781,7 +22871,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16427,7 +18087,7 @@
+@@ -16427,7 +18092,7 @@
fi
fi
@@ -22790,12 +22880,13 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16437,8 +18097,50 @@
+@@ -16437,72 +18102,112 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -22803,8 +22894,11 @@
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_cv_prog_compiler_c_o_F77=no
+- $rm -r conftest 2>/dev/null
+- mkdir conftest
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -22840,10 +22934,13 @@
+
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16449,60 +18151,58 @@
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_prog_compiler_c_o_F77=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
+ cd conftest
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22865,12 +22962,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18163: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18168: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16472: \$? = $ac_status" >&5
-+ echo "$as_me:18167: \$? = $ac_status" >&5
++ echo "$as_me:18172: \$? = $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
@@ -22922,7 +23019,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16512,8 +18212,8 @@
+@@ -16512,8 +18217,8 @@
need_locks=no
fi
@@ -22933,7 +23030,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16551,6 +18251,16 @@
+@@ -16551,6 +18256,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22950,7 +23047,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16561,6 +18271,10 @@
+@@ -16561,6 +18276,10 @@
with_gnu_ld=no
fi
;;
@@ -22961,7 +23058,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16571,6 +18285,27 @@
+@@ -16571,6 +18290,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22989,7 +23086,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16608,7 +18343,7 @@
+@@ -16608,7 +18348,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22998,7 +23095,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16618,13 +18353,13 @@
+@@ -16618,13 +18358,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'
@@ -23015,7 +23112,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
-@@ -16633,23 +18368,70 @@
+@@ -16633,23 +18373,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -23092,7 +23189,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16663,13 +18445,40 @@
+@@ -16663,13 +18450,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23135,7 +23232,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16679,24 +18488,19 @@
+@@ -16679,24 +18493,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23167,7 +23264,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16708,7 +18512,7 @@
+@@ -16708,7 +18517,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -23176,7 +23273,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16730,9 +18534,21 @@
+@@ -16730,9 +18539,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -23200,7 +23297,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16749,7 +18565,7 @@
+@@ -16749,7 +18570,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -23209,7 +23306,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`
-@@ -16768,8 +18584,12 @@
+@@ -16768,8 +18589,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -23222,7 +23319,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16777,45 +18597,58 @@
+@@ -16777,45 +18602,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23296,14 +23393,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16829,19 +18662,20 @@
+@@ -16829,19 +18667,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23321,7 +23419,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16850,24 +18684,36 @@
+@@ -16850,24 +18689,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23366,17 +23464,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16881,7 +18727,9 @@
+@@ -16881,8 +18732,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16891,13 +18739,11 @@
+
+@@ -16891,13 +18744,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -23393,7 +23493,7 @@
fi
fi
;;
-@@ -16910,7 +18756,7 @@
+@@ -16910,7 +18761,7 @@
ld_shlibs_F77=no
;;
@@ -23402,7 +23502,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16920,68 +18766,68 @@
+@@ -16920,68 +18771,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -23515,7 +23615,7 @@
fi
;;
-@@ -17015,8 +18861,8 @@
+@@ -17015,8 +18866,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23526,7 +23626,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17024,7 +18870,7 @@
+@@ -17024,7 +18875,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23535,7 +23635,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
-@@ -17038,47 +18884,62 @@
+@@ -17038,47 +18889,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -23622,7 +23722,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17092,7 +18953,7 @@
+@@ -17092,7 +18958,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23631,7 +23731,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'
-@@ -17102,7 +18963,7 @@
+@@ -17102,7 +18968,7 @@
link_all_deplibs_F77=yes
;;
@@ -23640,7 +23740,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
-@@ -17125,7 +18986,8 @@
+@@ -17125,7 +18991,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
@@ -23650,7 +23750,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17135,7 +18997,7 @@
+@@ -17135,7 +19002,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -23659,7 +23759,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17146,14 +19008,14 @@
+@@ -17146,14 +19013,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -23676,7 +23776,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'
-@@ -17165,13 +19027,13 @@
+@@ -17165,13 +19032,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -23692,7 +23792,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17179,21 +19041,15 @@
+@@ -17179,21 +19046,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -23718,7 +23818,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'
-@@ -17202,8 +19058,18 @@
+@@ -17202,8 +19063,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23739,7 +23839,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17212,7 +19078,7 @@
+@@ -17212,7 +19083,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.
@@ -23748,7 +23848,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17260,36 +19126,45 @@
+@@ -17260,36 +19131,45 @@
fi
;;
@@ -23815,7 +23915,7 @@
;;
uts4*)
-@@ -17304,15 +19179,10 @@
+@@ -17304,15 +19184,10 @@
esac
fi
@@ -23833,7 +23933,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17330,8 +19200,8 @@
+@@ -17330,8 +19205,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -23844,7 +23944,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17345,6 +19215,7 @@
+@@ -17345,6 +19220,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -23852,7 +23952,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17367,20 +19238,20 @@
+@@ -17367,20 +19243,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23878,7 +23978,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17390,7 +19261,20 @@
+@@ -17390,7 +19266,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23900,7 +24000,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17455,7 +19339,7 @@
+@@ -17455,7 +19344,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23909,7 +24009,7 @@
;;
beos*)
-@@ -17464,7 +19348,7 @@
+@@ -17464,7 +19353,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23918,7 +24018,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17480,7 +19364,7 @@
+@@ -17480,7 +19369,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23927,7 +24027,7 @@
need_version=no
need_lib_prefix=no
-@@ -17492,7 +19376,8 @@
+@@ -17492,7 +19381,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23937,7 +24037,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17522,7 +19407,7 @@
+@@ -17522,7 +19412,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23946,7 +24046,7 @@
;;
esac
;;
-@@ -17545,7 +19430,7 @@
+@@ -17545,7 +19435,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23955,7 +24055,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"`
-@@ -17568,20 +19453,17 @@
+@@ -17568,20 +19458,17 @@
dynamic_linker=no
;;
@@ -23987,7 +24087,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17599,14 +19481,19 @@
+@@ -17599,14 +19486,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -24009,7 +24109,7 @@
esac
;;
-@@ -17626,9 +19513,9 @@
+@@ -17626,9 +19518,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -24021,7 +24121,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17643,7 +19530,7 @@
+@@ -17643,7 +19535,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -24030,7 +24130,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17654,7 +19541,7 @@
+@@ -17654,7 +19546,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -24039,7 +24139,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17666,6 +19553,18 @@
+@@ -17666,6 +19558,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -24058,7 +24158,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17709,29 +19608,26 @@
+@@ -17709,29 +19613,26 @@
;;
# This must be Linux ELF.
@@ -24095,7 +24195,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,
-@@ -17741,6 +19637,18 @@
+@@ -17741,6 +19642,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -24114,7 +24214,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17750,7 +19658,7 @@
+@@ -17750,7 +19663,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -24123,7 +24223,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17778,8 +19686,13 @@
+@@ -17778,8 +19691,13 @@
openbsd*)
version_type=sunos
@@ -24138,7 +24238,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
-@@ -17799,7 +19712,7 @@
+@@ -17799,7 +19717,7 @@
os2*)
libname_spec='$name'
@@ -24147,7 +24247,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17817,13 +19730,6 @@
+@@ -17817,13 +19735,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -24161,7 +24261,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17849,7 +19755,7 @@
+@@ -17849,7 +19760,7 @@
need_version=yes
;;
@@ -24170,7 +24270,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17882,6 +19788,29 @@
+@@ -17882,6 +19793,29 @@
fi
;;
@@ -24200,7 +24300,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17893,16 +19822,21 @@
+@@ -17893,16 +19827,21 @@
dynamic_linker=no
;;
esac
@@ -24228,7 +24328,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17922,8 +19856,8 @@
+@@ -17922,8 +19861,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -24239,7 +24339,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17934,36 +19868,6 @@
+@@ -17934,36 +19873,6 @@
enable_fast_install=needless
fi
@@ -24276,7 +24376,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17978,7 +19882,8 @@
+@@ -17978,7 +19887,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.
@@ -24286,7 +24386,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 \
-@@ -18078,6 +19983,12 @@
+@@ -18078,6 +19988,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24299,7 +24399,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18089,6 +20000,9 @@
+@@ -18089,6 +20005,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24309,7 +24409,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18108,7 +20022,7 @@
+@@ -18108,7 +20027,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24318,7 +24418,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18139,7 +20053,7 @@
+@@ -18139,7 +20058,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24327,7 +24427,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18154,7 +20068,7 @@
+@@ -18154,7 +20073,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -24336,7 +24436,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18356,7 +20270,10 @@
+@@ -18356,7 +20275,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.
@@ -24348,7 +24448,7 @@
fi
-@@ -18377,7 +20294,6 @@
+@@ -18377,7 +20299,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -24356,7 +24456,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18389,26 +20305,55 @@
+@@ -18389,26 +20310,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -24413,7 +24513,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
-@@ -18420,8 +20365,8 @@
+@@ -18420,8 +20370,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -24424,7 +24524,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18435,26 +20380,28 @@
+@@ -18435,26 +20385,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -24433,12 +24533,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18441: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20386: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18445: \$? = $ac_status" >&5
-+ echo "$as_me:20390: \$? = $ac_status" >&5
++ echo "$as_me:20395: \$? = $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
@@ -24460,7 +24560,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18468,8 +20415,8 @@
+@@ -18468,8 +20420,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -24471,7 +24571,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18507,6 +20454,11 @@
+@@ -18507,6 +20459,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -24483,7 +24583,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18523,7 +20475,7 @@
+@@ -18523,7 +20480,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -24492,7 +24592,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18549,6 +20501,16 @@
+@@ -18549,6 +20506,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -24509,7 +24609,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18560,7 +20522,7 @@
+@@ -18560,7 +20527,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.
@@ -24518,7 +24618,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18583,13 +20545,20 @@
+@@ -18583,13 +20550,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -24541,7 +24641,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18604,15 +20573,15 @@
+@@ -18604,15 +20578,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -24563,7 +24663,7 @@
;;
sunos4*)
-@@ -18621,7 +20590,7 @@
+@@ -18621,7 +20595,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -24572,7 +24672,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18634,6 +20603,17 @@
+@@ -18634,6 +20608,17 @@
fi
;;
@@ -24590,7 +24690,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18645,16 +20625,16 @@
+@@ -18645,16 +20630,16 @@
esac
fi
@@ -24611,7 +24711,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18668,26 +20648,28 @@
+@@ -18668,26 +20653,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -24620,12 +24720,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20654: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20659: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18678: \$? = $ac_status" >&5
-+ echo "$as_me:20658: \$? = $ac_status" >&5
++ echo "$as_me:20663: \$? = $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
@@ -24647,7 +24747,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18700,7 +20682,7 @@
+@@ -18700,7 +20687,7 @@
fi
fi
@@ -24656,7 +24756,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18710,8 +20692,50 @@
+@@ -18710,8 +20697,50 @@
;;
esac
@@ -24709,7 +24809,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18722,60 +20746,58 @@
+@@ -18722,60 +20751,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -24731,12 +24831,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18741: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20758: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20763: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18745: \$? = $ac_status" >&5
-+ echo "$as_me:20762: \$? = $ac_status" >&5
++ echo "$as_me:20767: \$? = $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
@@ -24788,7 +24888,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18785,8 +20807,8 @@
+@@ -18785,8 +20812,8 @@
need_locks=no
fi
@@ -24799,7 +24899,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18824,6 +20846,16 @@
+@@ -18824,6 +20851,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -24816,7 +24916,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18834,6 +20866,10 @@
+@@ -18834,6 +20871,10 @@
with_gnu_ld=no
fi
;;
@@ -24827,7 +24927,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18844,6 +20880,27 @@
+@@ -18844,6 +20885,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -24855,7 +24955,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18881,7 +20938,7 @@
+@@ -18881,7 +20943,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -24864,7 +24964,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18891,13 +20948,13 @@
+@@ -18891,13 +20953,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'
@@ -24881,7 +24981,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
-@@ -18906,23 +20963,70 @@
+@@ -18906,23 +20968,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -24958,7 +25058,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18936,13 +21040,40 @@
+@@ -18936,13 +21045,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -25001,7 +25101,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18952,24 +21083,19 @@
+@@ -18952,24 +21088,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -25033,7 +25133,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18981,7 +21107,7 @@
+@@ -18981,7 +21112,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -25042,7 +25142,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19003,9 +21129,21 @@
+@@ -19003,9 +21134,21 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -25066,7 +25166,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19022,7 +21160,7 @@
+@@ -19022,7 +21165,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -25075,7 +25175,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`
-@@ -19041,8 +21179,12 @@
+@@ -19041,8 +21184,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -25088,7 +25188,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19050,22 +21192,23 @@
+@@ -19050,22 +21197,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -25119,7 +25219,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19081,24 +21224,36 @@
+@@ -19081,24 +21229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25164,14 +25264,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19112,19 +21267,20 @@
+@@ -19112,19 +21272,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -25189,7 +25290,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19143,24 +21299,36 @@
+@@ -19143,24 +21304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25234,17 +25335,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19174,7 +21342,9 @@
+@@ -19174,8 +21347,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19184,13 +21354,11 @@
+
+@@ -19184,13 +21359,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -25261,7 +25364,7 @@
fi
fi
;;
-@@ -19203,7 +21371,7 @@
+@@ -19203,7 +21376,7 @@
ld_shlibs_GCJ=no
;;
@@ -25270,7 +25373,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19213,68 +21381,68 @@
+@@ -19213,68 +21386,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -25383,7 +25486,7 @@
fi
;;
-@@ -19308,8 +21476,8 @@
+@@ -19308,8 +21481,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -25394,7 +25497,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19317,7 +21485,7 @@
+@@ -19317,7 +21490,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -25403,7 +25506,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
-@@ -19331,47 +21499,62 @@
+@@ -19331,47 +21504,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -25490,7 +25593,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19385,7 +21568,7 @@
+@@ -19385,7 +21573,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -25499,7 +25602,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'
-@@ -19395,7 +21578,7 @@
+@@ -19395,7 +21583,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -25508,7 +25611,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
-@@ -19418,7 +21601,8 @@
+@@ -19418,7 +21606,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
@@ -25518,7 +25621,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19428,7 +21612,7 @@
+@@ -19428,7 +21617,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -25527,7 +25630,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19439,14 +21623,14 @@
+@@ -19439,14 +21628,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -25544,7 +25647,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'
-@@ -19458,13 +21642,13 @@
+@@ -19458,13 +21647,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -25560,7 +25663,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19472,21 +21656,15 @@
+@@ -19472,21 +21661,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -25586,7 +25689,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'
-@@ -19495,8 +21673,18 @@
+@@ -19495,8 +21678,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -25607,7 +25710,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19505,7 +21693,7 @@
+@@ -19505,7 +21698,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.
@@ -25616,7 +25719,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19553,36 +21741,45 @@
+@@ -19553,36 +21746,45 @@
fi
;;
@@ -25683,7 +25786,7 @@
;;
uts4*)
-@@ -19597,15 +21794,10 @@
+@@ -19597,15 +21799,10 @@
esac
fi
@@ -25701,7 +25804,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19623,8 +21815,8 @@
+@@ -19623,8 +21820,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -25712,7 +25815,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19638,6 +21830,7 @@
+@@ -19638,6 +21835,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -25720,7 +25823,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19660,20 +21853,20 @@
+@@ -19660,20 +21858,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -25746,7 +25849,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19683,7 +21876,20 @@
+@@ -19683,7 +21881,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -25768,7 +25871,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19748,7 +21954,7 @@
+@@ -19748,7 +21959,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -25777,7 +25880,7 @@
;;
beos*)
-@@ -19757,7 +21963,7 @@
+@@ -19757,7 +21968,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -25786,7 +25889,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19773,7 +21979,7 @@
+@@ -19773,7 +21984,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -25795,7 +25898,7 @@
need_version=no
need_lib_prefix=no
-@@ -19785,7 +21991,8 @@
+@@ -19785,7 +21996,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -25805,7 +25908,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19815,7 +22022,7 @@
+@@ -19815,7 +22027,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -25814,7 +25917,7 @@
;;
esac
;;
-@@ -19838,7 +22045,7 @@
+@@ -19838,7 +22050,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -25823,7 +25926,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"`
-@@ -19861,20 +22068,17 @@
+@@ -19861,20 +22073,17 @@
dynamic_linker=no
;;
@@ -25855,7 +25958,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19892,14 +22096,19 @@
+@@ -19892,1174 +22101,391 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -25870,26 +25973,32 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
- ;;
-
-@@ -19919,1147 +22128,359 @@
- version_type=sunos
- need_lib_prefix=no
- need_version=no
+- esac
+- ;;
+-
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+-
+-hpux9* | hpux10* | hpux11*)
+- # Give a soname corresponding to the major version so that dld.sl refuses to
+- # link against other versions.
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
+- ia64*)
- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.so"
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
@@ -26050,7 +26159,8 @@
- ;;
- esac
- else
-- shlibpath_overrides_runpath=yes
++ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
- fi
- ;;
-
@@ -26233,8 +26343,11 @@
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-- ;;
--
++ hardcode_into_libs=yes
+ ;;
++ esac
++ ;;
+
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
@@ -26778,6 +26891,34 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+-
+-
+-fi
+-
++gnu*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ ;;
+
+-fi
++hpux9* | hpux10* | hpux11*)
++ # Give a soname corresponding to the major version so that dld.sl refuses to
++ # link against other versions.
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ case $host_cpu in
++ ia64*)
++ shrext_cmds='.so'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.so"
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
@@ -26898,6 +27039,8 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+- ;;
+- esac
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -26910,7 +27053,8 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
--fi
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -26919,16 +27063,27 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
+ else
+- enable_dlopen=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+- save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -26936,7 +27091,19 @@
+ shlibpath_overrides_runpath=yes
+ ;;
--fi
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20864 "configure"
+-#include "confdefs.h"
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
@@ -26947,7 +27114,9 @@
+ shlibpath_overrides_runpath=yes
+ ;;
-- ;;
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
@@ -26956,10 +27125,7 @@
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
- esac
--
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
++ esac
+ 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
@@ -26972,41 +27138,11 @@
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
- else
-- enable_dlopen=no
++ else
+ shlibpath_overrides_runpath=yes
- fi
++ fi
+ ;;
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
-- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
-- save_LIBS="$LIBS"
-- LIBS="$lt_cv_dlopen_libs $LIBS"
--
-- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 20864 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
-#include <stdio.h>
+os2*)
+ libname_spec='$name'
@@ -27320,14 +27456,14 @@
- LIBS="$save_LIBS"
- ;;
- esac
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
+-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
--
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
@@ -27342,7 +27478,7 @@
fi
-@@ -21076,7 +22497,8 @@
+@@ -21076,7 +22502,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.
@@ -27352,7 +27488,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 \
-@@ -21176,6 +22598,12 @@
+@@ -21176,6 +22603,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27365,7 +27501,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21187,6 +22615,9 @@
+@@ -21187,6 +22620,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27375,7 +27511,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21206,7 +22637,7 @@
+@@ -21206,7 +22642,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27384,7 +27520,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21237,7 +22668,7 @@
+@@ -21237,7 +22673,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27393,7 +27529,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21252,7 +22683,7 @@
+@@ -21252,7 +22688,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -27402,7 +27538,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21454,7 +22885,10 @@
+@@ -21454,7 +22890,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.
@@ -27414,7 +27550,7 @@
fi
-@@ -21474,7 +22908,6 @@
+@@ -21474,7 +22913,6 @@
RC)
@@ -27422,7 +27558,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21493,15 +22926,42 @@
+@@ -21493,15 +22931,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -27465,7 +27601,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21517,7 +22977,8 @@
+@@ -21517,7 +22982,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.
@@ -27475,7 +27611,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 \
-@@ -21617,6 +23078,12 @@
+@@ -21617,6 +23083,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27488,7 +27624,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21628,6 +23095,9 @@
+@@ -21628,6 +23100,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27498,7 +27634,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21647,7 +23117,7 @@
+@@ -21647,7 +23122,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27507,7 +27643,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21678,7 +23148,7 @@
+@@ -21678,7 +23153,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27516,7 +27652,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21693,7 +23163,7 @@
+@@ -21693,7 +23168,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -27525,7 +27661,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21895,7 +23365,10 @@
+@@ -21895,7 +23370,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.
@@ -27537,7 +27673,7 @@
fi
-@@ -21942,7 +23415,7 @@
+@@ -21942,7 +23420,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -27546,7 +27682,7 @@
# Prevent multiple expansion
-@@ -21997,8 +23470,8 @@
+@@ -21997,8 +23475,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -27557,7 +27693,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22024,17 +23497,17 @@
+@@ -22024,17 +23502,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -27581,7 +27717,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22049,32 +23522,33 @@
+@@ -22049,32 +23527,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27623,7 +27759,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22083,8 +23557,8 @@
+@@ -22083,8 +23562,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -27634,7 +27770,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22110,11 +23584,11 @@
+@@ -22110,11 +23589,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -27650,7 +27786,7 @@
fi
-@@ -22122,8 +23596,8 @@
+@@ -22122,8 +23601,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -27661,7 +27797,7 @@
XGETTEXT=":"
fi
fi
-@@ -22133,8 +23607,7 @@
+@@ -22133,8 +23612,7 @@
@@ -27671,7 +27807,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22146,8 +23619,8 @@
+@@ -22146,8 +23624,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -27682,7 +27818,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22175,24 +23648,36 @@
+@@ -22175,24 +23653,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27727,15 +27863,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22201,15 +23686,16 @@
+@@ -22201,15 +23691,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_stl_works=no
+ kde_cv_stl_works=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -27747,7 +27884,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22238,15 +23724,14 @@
+@@ -22238,15 +23729,14 @@
@@ -27766,7 +27903,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22258,9 +23743,6 @@
+@@ -22258,9 +23748,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27776,7 +27913,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22286,24 +23768,36 @@
+@@ -22286,24 +23773,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27821,18 +27958,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22312,8 +23806,9 @@
+@@ -22312,9 +23811,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcat=no
+ kde_cv_func_strlcat=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22327,11 +23822,11 @@
+ ac_ext=c
+@@ -22327,11 +23827,11 @@
fi
@@ -27848,7 +27987,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22352,8 +23847,7 @@
+@@ -22352,8 +23852,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -27858,7 +27997,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22391,24 +23885,36 @@
+@@ -22391,24 +23890,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27903,7 +28042,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22418,9 +23924,10 @@
+@@ -22418,10 +23929,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27911,11 +28050,13 @@
+ kde_cv_proto_strlcat="strlcat unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22434,8 +23941,8 @@
+ ac_ext=c
+@@ -22434,8 +23946,8 @@
fi
@@ -27926,7 +28067,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22459,15 +23966,14 @@
+@@ -22459,15 +23971,14 @@
@@ -27945,7 +28086,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22479,9 +23985,6 @@
+@@ -22479,9 +23990,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27955,7 +28096,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22506,24 +24009,36 @@
+@@ -22506,24 +24014,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28000,18 +28141,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22532,8 +24047,9 @@
+@@ -22532,9 +24052,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_strlcpy=no
+ kde_cv_func_strlcpy=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -22547,11 +24063,11 @@
+ ac_ext=c
+@@ -22547,11 +24068,11 @@
fi
@@ -28027,7 +28170,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22572,8 +24088,7 @@
+@@ -22572,8 +24093,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -28037,7 +28180,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22610,24 +24125,36 @@
+@@ -22610,24 +24130,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28082,7 +28225,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22637,9 +24164,10 @@
+@@ -22637,10 +24169,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28090,11 +28233,13 @@
+ kde_cv_proto_strlcpy="strlcpy unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -22653,8 +24181,8 @@
+ ac_ext=c
+@@ -22653,8 +24186,8 @@
fi
@@ -28105,7 +28250,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22677,8 +24205,8 @@
+@@ -22677,8 +24210,8 @@
@@ -28116,7 +28261,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22695,30 +24223,42 @@
+@@ -22695,30 +24228,42 @@
int
main ()
{
@@ -28168,15 +28313,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22727,20 +24267,21 @@
+@@ -22727,20 +24272,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_util_main=no
+ ac_cv_lib_util_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28195,7 +28341,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22757,30 +24298,42 @@
+@@ -22757,30 +24303,42 @@
int
main ()
{
@@ -28247,15 +28393,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22789,21 +24342,22 @@
+@@ -22789,21 +24347,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_compat_main=no
+ ac_cv_lib_compat_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28275,7 +28422,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22816,40 +24370,52 @@
+@@ -22816,40 +24375,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28340,15 +28487,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22858,19 +24424,20 @@
+@@ -22858,19 +24429,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
+ ac_cv_lib_crypt_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28366,7 +28514,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22883,40 +24450,52 @@
+@@ -22883,40 +24455,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28431,15 +28579,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22925,14 +24504,15 @@
+@@ -22925,14 +24509,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_c_crypt=no
+ ac_cv_lib_c_crypt=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28450,7 +28599,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22958,13 +24538,13 @@
+@@ -22958,13 +24543,13 @@
fi
@@ -28467,7 +28616,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22993,24 +24573,36 @@
+@@ -22993,24 +24578,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28512,17 +28661,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23022,7 +24614,9 @@
+@@ -23022,8 +24619,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23033,17 +24627,17 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -23033,17 +24632,17 @@
fi
@@ -28545,7 +28696,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23072,24 +24666,36 @@
+@@ -23072,24 +24671,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28590,17 +28741,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23101,7 +24707,9 @@
+@@ -23101,8 +24712,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
-@@ -23113,8 +24721,8 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23113,8 +24726,8 @@
fi
@@ -28611,7 +28764,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23127,8 +24735,8 @@
+@@ -23127,8 +24740,8 @@
_ACEOF
@@ -28622,7 +28775,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23141,40 +24749,52 @@
+@@ -23141,40 +24754,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28687,15 +28840,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23183,21 +24803,22 @@
+@@ -23183,21 +24808,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28715,7 +28869,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23210,40 +24831,52 @@
+@@ -23210,40 +24836,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28780,15 +28934,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23252,21 +24885,22 @@
+@@ -23252,21 +24890,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28808,7 +28963,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23293,53 +24927,59 @@
+@@ -23293,53 +24932,59 @@
#undef inet_ntoa
@@ -28887,15 +29042,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23348,17 +24988,18 @@
+@@ -23348,17 +24993,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_inet_ntoa=no
+ ac_cv_func_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -28911,7 +29067,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23371,40 +25012,52 @@
+@@ -23371,40 +25017,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28976,15 +29132,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23413,21 +25066,22 @@
+@@ -23413,21 +25071,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_nsl_inet_ntoa=no
+ ac_cv_lib_nsl_inet_ntoa=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29004,7 +29161,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23454,53 +25108,59 @@
+@@ -23454,53 +25113,59 @@
#undef connect
@@ -29083,15 +29240,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23509,17 +25169,18 @@
+@@ -23509,17 +25174,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_connect=no
+ ac_cv_func_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -29107,7 +29265,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23532,40 +25193,52 @@
+@@ -23532,40 +25198,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29172,15 +29330,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23574,22 +25247,23 @@
+@@ -23574,22 +25252,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29201,7 +29360,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23616,53 +25290,59 @@
+@@ -23616,53 +25295,59 @@
#undef remove
@@ -29280,15 +29439,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23671,17 +25351,18 @@
+@@ -23671,17 +25356,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_remove=no
+ ac_cv_func_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -29304,7 +29464,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23694,40 +25375,52 @@
+@@ -23694,40 +25380,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29369,15 +29529,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23736,14 +25429,15 @@
+@@ -23736,14 +25434,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29388,7 +29549,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23751,8 +25445,8 @@
+@@ -23751,8 +25450,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -29399,7 +29560,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23779,53 +25473,59 @@
+@@ -23779,53 +25478,59 @@
#undef shmat
@@ -29478,15 +29639,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23834,18 +25534,19 @@
+@@ -23834,18 +25539,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shmat=no
+ ac_cv_func_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -29503,7 +29665,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23858,40 +25559,52 @@
+@@ -23858,40 +25564,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29568,15 +29730,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23900,14 +25613,15 @@
+@@ -23900,14 +25618,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29587,7 +29750,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23921,18 +25635,19 @@
+@@ -23921,18 +25640,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29615,7 +29778,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23943,24 +25658,36 @@
+@@ -23943,24 +25663,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29660,17 +29823,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23969,15 +25696,16 @@
+@@ -23969,15 +25701,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -29682,7 +29846,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23986,8 +25714,13 @@
+@@ -23986,8 +25719,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29698,7 +29862,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24011,9 +25744,10 @@
+@@ -24011,9 +25749,10 @@
ac_header_preproc=no
fi
@@ -29711,7 +29875,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24037,25 +25771,19 @@
+@@ -24037,25 +25776,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29744,7 +29908,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24073,18 +25801,19 @@
+@@ -24073,18 +25806,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29772,7 +29936,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24095,24 +25824,36 @@
+@@ -24095,24 +25829,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29817,17 +29981,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24121,15 +25862,16 @@
+@@ -24121,15 +25867,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -29839,7 +30004,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24138,8 +25880,13 @@
+@@ -24138,8 +25885,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29855,7 +30020,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24163,9 +25910,10 @@
+@@ -24163,9 +25915,10 @@
ac_header_preproc=no
fi
@@ -29868,7 +30033,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24189,25 +25937,19 @@
+@@ -24189,25 +25942,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29901,7 +30066,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24221,8 +25963,8 @@
+@@ -24221,8 +25968,8 @@
# darwin requires a poll emulation library
@@ -29912,7 +30077,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24235,40 +25977,52 @@
+@@ -24235,40 +25982,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29977,15 +30142,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24277,14 +26031,15 @@
+@@ -24277,14 +26036,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_poll_poll=no
+ ac_cv_lib_poll_poll=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29996,7 +30162,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24295,18 +26050,19 @@
+@@ -24295,18 +26055,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30024,7 +30190,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24317,24 +26073,36 @@
+@@ -24317,24 +26078,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -30069,17 +30235,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24343,15 +26111,16 @@
+@@ -24343,15 +26116,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -30091,7 +30258,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24360,8 +26129,13 @@
+@@ -24360,8 +26134,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -30107,7 +30274,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24385,9 +26159,10 @@
+@@ -24385,9 +26164,10 @@
ac_header_preproc=no
fi
@@ -30120,7 +30287,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24411,25 +26186,19 @@
+@@ -24411,25 +26191,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30153,7 +30320,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24444,17 +26213,17 @@
+@@ -24444,17 +26218,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -30177,7 +30344,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24465,24 +26234,36 @@
+@@ -24465,24 +26239,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -30222,17 +30389,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24491,15 +26272,16 @@
+@@ -24491,15 +26277,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -30244,7 +30412,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24508,8 +26290,13 @@
+@@ -24508,8 +26295,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -30260,7 +30428,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24533,9 +26320,10 @@
+@@ -24533,9 +26325,10 @@
ac_header_preproc=no
fi
@@ -30273,7 +30441,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24559,25 +26347,18 @@
+@@ -24559,25 +26352,18 @@
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -30304,7 +30472,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24594,8 +26375,8 @@
+@@ -24594,8 +26380,8 @@
@@ -30315,7 +30483,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24621,31 +26402,43 @@
+@@ -24621,31 +26407,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30369,7 +30537,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24656,25 +26449,25 @@
+@@ -24656,25 +26454,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30379,8 +30547,9 @@
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -30401,7 +30570,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24686,9 +26479,6 @@
+@@ -24686,9 +26484,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -30411,7 +30580,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24714,24 +26504,36 @@
+@@ -24714,24 +26509,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30456,18 +30625,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24740,8 +26542,9 @@
+@@ -24740,9 +26547,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_func_res_init=no
+ kde_cv_func_res_init=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
-@@ -24755,11 +26558,11 @@
+ ac_ext=c
+@@ -24755,11 +26563,11 @@
fi
@@ -30483,7 +30654,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24780,8 +26583,7 @@
+@@ -24780,8 +26588,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -30493,7 +30664,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24819,24 +26621,36 @@
+@@ -24819,24 +26626,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30538,7 +30709,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24846,9 +26660,10 @@
+@@ -24846,10 +26665,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30546,11 +30717,13 @@
+ kde_cv_proto_res_init="res_init unavailable"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -24862,8 +26677,8 @@
+ ac_ext=c
+@@ -24862,8 +26682,8 @@
fi
@@ -30561,7 +30734,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24890,8 +26705,8 @@
+@@ -24890,8 +26710,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -30572,7 +30745,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24904,40 +26719,52 @@
+@@ -24904,40 +26724,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30637,15 +30810,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24946,27 +26773,28 @@
+@@ -24946,27 +26778,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ucb_killpg=no
+ ac_cv_lib_ucb_killpg=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30675,7 +30849,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24979,40 +26807,52 @@
+@@ -24979,40 +26812,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30740,15 +30914,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25021,22 +26861,23 @@
+@@ -25021,22 +26866,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30769,7 +30944,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25047,36 +26888,49 @@
+@@ -25047,36 +26893,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30829,15 +31004,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25085,20 +26939,21 @@
+@@ -25085,20 +26944,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_int=no
+ ac_cv_type_int=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
@@ -30857,7 +31033,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25111,10 +26966,11 @@
+@@ -25111,10 +26971,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30870,7 +31046,7 @@
test_array [0] = 0
;
-@@ -25122,24 +26978,36 @@
+@@ -25122,24 +26983,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30915,7 +31091,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25152,10 +27020,11 @@
+@@ -25152,10 +27025,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30928,7 +31104,7 @@
test_array [0] = 0
;
-@@ -25163,24 +27032,36 @@
+@@ -25163,24 +27037,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30973,7 +31149,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25189,30 +27070,32 @@
+@@ -25189,30 +27075,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30990,8 +31166,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31014,7 +31191,7 @@
test_array [0] = 0
;
-@@ -25220,24 +27103,36 @@
+@@ -25220,24 +27108,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31059,7 +31236,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25250,10 +27145,11 @@
+@@ -25250,10 +27150,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31072,7 +31249,7 @@
test_array [0] = 0
;
-@@ -25261,24 +27157,36 @@
+@@ -25261,24 +27162,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31117,7 +31294,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25287,23 +27195,26 @@
+@@ -25287,24 +27200,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31134,8 +31311,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31144,14 +31322,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25315,10 +27226,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25315,10 +27231,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31164,7 +31345,7 @@
test_array [0] = 0
;
-@@ -25326,24 +27238,36 @@
+@@ -25326,24 +27243,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31209,15 +31390,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25352,26 +27276,20 @@
+@@ -25352,26 +27281,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -31241,7 +31423,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25379,8 +27297,9 @@
+@@ -25379,8 +27302,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31253,7 +31435,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25389,35 +27308,44 @@
+@@ -25389,35 +27313,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31311,7 +31493,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25428,28 +27356,27 @@
+@@ -25428,28 +27361,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31348,7 +31530,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25460,36 +27387,49 @@
+@@ -25460,36 +27392,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31408,15 +31590,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25498,20 +27438,21 @@
+@@ -25498,20 +27443,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_short=no
+ ac_cv_type_short=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
@@ -31436,7 +31619,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25524,10 +27465,11 @@
+@@ -25524,10 +27470,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31449,7 +31632,7 @@
test_array [0] = 0
;
-@@ -25535,24 +27477,36 @@
+@@ -25535,24 +27482,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31494,7 +31677,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25565,10 +27519,11 @@
+@@ -25565,10 +27524,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31507,7 +31690,7 @@
test_array [0] = 0
;
-@@ -25576,24 +27531,36 @@
+@@ -25576,24 +27536,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31552,7 +31735,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25602,30 +27569,32 @@
+@@ -25602,30 +27574,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31569,8 +31752,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31593,7 +31777,7 @@
test_array [0] = 0
;
-@@ -25633,24 +27602,36 @@
+@@ -25633,24 +27607,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31638,7 +31822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25663,10 +27644,11 @@
+@@ -25663,10 +27649,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31651,7 +31835,7 @@
test_array [0] = 0
;
-@@ -25674,24 +27656,36 @@
+@@ -25674,24 +27661,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31696,7 +31880,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25700,23 +27694,26 @@
+@@ -25700,24 +27699,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31713,8 +31897,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -31723,14 +31908,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25728,10 +27725,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -25728,10 +27730,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31743,7 +31931,7 @@
test_array [0] = 0
;
-@@ -25739,24 +27737,36 @@
+@@ -25739,24 +27742,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31788,15 +31976,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25765,26 +27775,20 @@
+@@ -25765,26 +27780,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -31820,7 +32009,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25792,8 +27796,9 @@
+@@ -25792,8 +27801,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31832,7 +32021,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25802,35 +27807,44 @@
+@@ -25802,35 +27812,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31890,7 +32079,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25841,28 +27855,27 @@
+@@ -25841,28 +27860,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -31927,7 +32116,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25873,36 +27886,49 @@
+@@ -25873,36 +27891,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31987,15 +32176,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25911,20 +27937,21 @@
+@@ -25911,20 +27942,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long=no
+ ac_cv_type_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
@@ -32015,7 +32205,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -25937,10 +27964,11 @@
+@@ -25937,10 +27969,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32028,7 +32218,7 @@
test_array [0] = 0
;
-@@ -25948,24 +27976,36 @@
+@@ -25948,24 +27981,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32073,7 +32263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25978,10 +28018,11 @@
+@@ -25978,10 +28023,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32086,7 +32276,7 @@
test_array [0] = 0
;
-@@ -25989,24 +28030,36 @@
+@@ -25989,24 +28035,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32131,7 +32321,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26015,30 +28068,32 @@
+@@ -26015,30 +28073,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32148,8 +32338,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32172,7 +32363,7 @@
test_array [0] = 0
;
-@@ -26046,24 +28101,36 @@
+@@ -26046,24 +28106,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32217,7 +32408,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26076,10 +28143,11 @@
+@@ -26076,10 +28148,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32230,7 +32421,7 @@
test_array [0] = 0
;
-@@ -26087,24 +28155,36 @@
+@@ -26087,24 +28160,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32275,7 +32466,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26113,23 +28193,26 @@
+@@ -26113,24 +28198,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32292,8 +32483,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32302,14 +32494,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26141,10 +28224,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26141,10 +28229,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32322,7 +32517,7 @@
test_array [0] = 0
;
-@@ -26152,24 +28236,36 @@
+@@ -26152,24 +28241,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32367,15 +32562,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26178,26 +28274,20 @@
+@@ -26178,26 +28279,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -32399,7 +32595,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26205,8 +28295,9 @@
+@@ -26205,8 +28300,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32411,7 +32607,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26215,35 +28306,44 @@
+@@ -26215,35 +28311,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32469,7 +32665,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26254,28 +28354,27 @@
+@@ -26254,28 +28359,27 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -32506,7 +32702,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26286,36 +28385,49 @@
+@@ -26286,36 +28390,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32566,15 +32762,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26324,20 +28436,21 @@
+@@ -26324,20 +28441,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_char_p=no
+ ac_cv_type_char_p=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&6
@@ -32594,7 +32791,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26350,10 +28463,11 @@
+@@ -26350,10 +28468,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32607,7 +32804,7 @@
test_array [0] = 0
;
-@@ -26361,24 +28475,36 @@
+@@ -26361,24 +28480,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32652,7 +32849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26391,10 +28517,11 @@
+@@ -26391,10 +28522,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32665,7 +32862,7 @@
test_array [0] = 0
;
-@@ -26402,24 +28529,36 @@
+@@ -26402,24 +28534,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32710,7 +32907,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26428,30 +28567,32 @@
+@@ -26428,30 +28572,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32727,8 +32924,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32751,7 +32949,7 @@
test_array [0] = 0
;
-@@ -26459,24 +28600,36 @@
+@@ -26459,24 +28605,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32796,7 +32994,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26489,10 +28642,11 @@
+@@ -26489,10 +28647,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32809,7 +33007,7 @@
test_array [0] = 0
;
-@@ -26500,24 +28654,36 @@
+@@ -26500,24 +28659,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32854,7 +33052,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26526,23 +28692,26 @@
+@@ -26526,24 +28697,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32871,8 +33069,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -32881,14 +33080,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26554,10 +28723,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26554,10 +28728,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32901,7 +33103,7 @@
test_array [0] = 0
;
-@@ -26565,24 +28735,36 @@
+@@ -26565,24 +28740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32946,15 +33148,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26591,26 +28773,20 @@
+@@ -26591,26 +28778,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
@@ -32978,7 +33181,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26618,8 +28794,9 @@
+@@ -26618,8 +28799,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32990,7 +33193,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26628,35 +28805,44 @@
+@@ -26628,35 +28810,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33048,7 +33251,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26667,30 +28853,29 @@
+@@ -26667,30 +28858,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -33087,7 +33290,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26703,40 +28888,52 @@
+@@ -26703,40 +28893,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33152,15 +33355,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26745,14 +28942,15 @@
+@@ -26745,14 +28947,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33171,7 +33375,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26761,8 +28959,8 @@
+@@ -26761,8 +28964,8 @@
fi
@@ -33182,7 +33386,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26775,40 +28973,52 @@
+@@ -26775,40 +28978,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33247,15 +33451,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26817,14 +29027,15 @@
+@@ -26817,14 +29032,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_unload=no
+ ac_cv_lib_dld_shl_unload=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33266,7 +33471,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26838,8 +29049,8 @@
+@@ -26838,8 +29054,8 @@
@@ -33277,7 +33482,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26850,36 +29061,49 @@
+@@ -26850,36 +29066,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33337,15 +33542,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26888,20 +29112,21 @@
+@@ -26888,20 +29117,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_size_t=no
+ ac_cv_type_size_t=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -33365,7 +33571,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -26914,10 +29139,11 @@
+@@ -26914,10 +29144,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33378,7 +33584,7 @@
test_array [0] = 0
;
-@@ -26925,24 +29151,36 @@
+@@ -26925,24 +29156,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33423,7 +33629,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26955,10 +29193,11 @@
+@@ -26955,10 +29198,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33436,7 +33642,7 @@
test_array [0] = 0
;
-@@ -26966,24 +29205,36 @@
+@@ -26966,24 +29210,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33481,7 +33687,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26992,30 +29243,32 @@
+@@ -26992,30 +29248,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33498,8 +33704,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -33522,7 +33729,7 @@
test_array [0] = 0
;
-@@ -27023,24 +29276,36 @@
+@@ -27023,24 +29281,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33567,7 +33774,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27053,10 +29318,11 @@
+@@ -27053,10 +29323,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33580,7 +33787,7 @@
test_array [0] = 0
;
-@@ -27064,24 +29330,36 @@
+@@ -27064,24 +29335,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33625,7 +33832,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27090,23 +29368,26 @@
+@@ -27090,24 +29373,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33642,8 +33849,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -33652,14 +33860,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27118,10 +29399,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27118,10 +29404,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33672,7 +33883,7 @@
test_array [0] = 0
;
-@@ -27129,24 +29411,36 @@
+@@ -27129,24 +29416,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33717,15 +33928,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27155,26 +29449,20 @@
+@@ -27155,26 +29454,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -33749,7 +33961,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27182,8 +29470,9 @@
+@@ -27182,8 +29475,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33761,7 +33973,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27192,35 +29481,44 @@
+@@ -27192,35 +29486,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33819,7 +34031,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27231,29 +29529,28 @@
+@@ -27231,29 +29534,28 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -33857,7 +34069,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27264,36 +29561,49 @@
+@@ -27264,36 +29566,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33917,15 +34129,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27302,20 +29612,21 @@
+@@ -27302,20 +29617,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_unsigned_long=no
+ ac_cv_type_unsigned_long=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
@@ -33945,7 +34158,7 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-@@ -27328,10 +29639,11 @@
+@@ -27328,10 +29644,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33958,7 +34171,7 @@
test_array [0] = 0
;
-@@ -27339,24 +29651,36 @@
+@@ -27339,24 +29656,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34003,7 +34216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27369,10 +29693,11 @@
+@@ -27369,10 +29698,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34016,7 +34229,7 @@
test_array [0] = 0
;
-@@ -27380,24 +29705,36 @@
+@@ -27380,24 +29710,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34061,7 +34274,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27406,30 +29743,32 @@
+@@ -27406,30 +29748,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34078,8 +34291,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -34102,7 +34316,7 @@
test_array [0] = 0
;
-@@ -27437,24 +29776,36 @@
+@@ -27437,24 +29781,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34147,7 +34361,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27467,10 +29818,11 @@
+@@ -27467,10 +29823,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34160,7 +34374,7 @@
test_array [0] = 0
;
-@@ -27478,24 +29830,36 @@
+@@ -27478,24 +29835,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34205,7 +34419,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27504,23 +29868,26 @@
+@@ -27504,24 +29873,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34222,8 +34436,9 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
echo "$as_me: failed program was:" >&5
@@ -34232,14 +34447,17 @@
-ac_lo= ac_hi=
+ ac_lo= ac_hi=
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27532,10 +29899,11 @@
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -27532,10 +29904,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34252,7 +34470,7 @@
test_array [0] = 0
;
-@@ -27543,24 +29911,36 @@
+@@ -27543,24 +29916,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34297,42 +34515,40 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27569,25 +29949,19 @@
+@@ -27569,26 +29954,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&5
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; } ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
- See \`config.log' for more details." >&5
+-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-+echo "$as_me: error: cannot compute sizeof (unsigned long)
- See \`config.log' for more details." >&2;}
+-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; } ;;
-+esac
- else
+-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27596,8 +29970,9 @@
+ _ACEOF
+@@ -27596,8 +29975,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34344,7 +34560,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27606,35 +29981,44 @@
+@@ -27606,35 +29986,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -34402,7 +34618,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27645,30 +30029,29 @@
+@@ -27645,30 +30034,29 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -34441,7 +34657,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27689,36 +30072,48 @@
+@@ -27689,36 +30077,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34502,16 +34718,17 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27730,18 +30125,18 @@
+@@ -27730,18 +30130,18 @@
{ (exit 1); exit 1; }; }
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: checking for PIE support" >&5
-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
+ { echo "$as_me:$LINENO: checking for PIE support" >&5
+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
if test "${kde_cv_val_pie_support+set}" = set; then
@@ -34525,7 +34742,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27771,24 +30166,36 @@
+@@ -27771,24 +30171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34570,18 +34787,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27797,8 +30204,9 @@
+@@ -27797,9 +30209,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-kde_cv_val_pie_support=no
+ kde_cv_val_pie_support=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -27812,26 +30220,26 @@
+ CXXFLAGS=$safe_CXXFLAGS
+@@ -27812,26 +30225,26 @@
fi
@@ -34618,7 +34837,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27850,18 +30258,19 @@
+@@ -27850,18 +30263,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34646,7 +34865,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27872,24 +30281,36 @@
+@@ -27872,24 +30286,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -34691,17 +34910,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27898,15 +30319,16 @@
+@@ -27898,15 +30324,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -34713,7 +34933,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27915,8 +30337,13 @@
+@@ -27915,8 +30342,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -34729,7 +34949,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27940,9 +30367,10 @@
+@@ -27940,9 +30372,10 @@
ac_header_preproc=no
fi
@@ -34742,7 +34962,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27966,25 +30394,19 @@
+@@ -27966,25 +30399,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34775,7 +34995,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27996,8 +30418,8 @@
+@@ -27996,8 +30423,8 @@
done
@@ -34786,7 +35006,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28024,53 +30446,59 @@
+@@ -28024,53 +30451,59 @@
#undef _NSGetEnviron
@@ -34865,15 +35085,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28079,13 +30507,14 @@
+@@ -28079,13 +30512,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__NSGetEnviron=no
+ ac_cv_func__NSGetEnviron=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -34883,7 +35104,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28106,9 +30535,9 @@
+@@ -28106,9 +30540,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34896,7 +35117,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28134,53 +30563,59 @@
+@@ -28134,53 +30568,59 @@
#undef $ac_func
@@ -34975,15 +35196,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28189,13 +30624,15 @@
+@@ -28189,13 +30629,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -34994,7 +35216,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28212,32 +30649,32 @@
+@@ -28212,32 +30654,32 @@
@@ -35039,7 +35261,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28253,8 +30690,8 @@
+@@ -28253,8 +30695,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -35050,7 +35272,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28291,8 +30728,13 @@
+@@ -28291,8 +30733,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -35066,7 +35288,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28359,6 +30801,7 @@
+@@ -28359,6 +30806,7 @@
fi
done
fi
@@ -35074,7 +35296,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28388,24 +30831,36 @@
+@@ -28388,24 +30836,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35119,7 +35341,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28416,7 +30871,7 @@
+@@ -28416,7 +30876,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35128,15 +35350,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28464,6 +30919,7 @@
+@@ -28464,7 +30924,8 @@
done
done
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28474,21 +30930,26 @@
+
+@@ -28474,21 +30935,26 @@
*-*-solaris*)
;;
*)
@@ -35171,7 +35395,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28496,7 +30957,7 @@
+@@ -28496,7 +30962,7 @@
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
@@ -35180,7 +35404,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28505,7 +30966,7 @@
+@@ -28505,7 +30971,7 @@
esac
fi
cd ..
@@ -35189,7 +35413,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28549,12 +31010,12 @@
+@@ -28549,12 +31015,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -35206,7 +35430,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28582,8 +31043,8 @@
+@@ -28582,8 +31048,8 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -35217,7 +35441,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28596,40 +31057,52 @@
+@@ -28596,40 +31062,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35282,15 +35506,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28638,14 +31111,15 @@
+@@ -28638,14 +31116,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35301,7 +35526,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28654,8 +31128,8 @@
+@@ -28654,8 +31133,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -35312,7 +35537,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28689,24 +31163,36 @@
+@@ -28689,24 +31168,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35357,7 +35582,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28715,9 +31201,10 @@
+@@ -28715,10 +31206,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35365,11 +35590,13 @@
+ kde_cv_have_libXext=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-@@ -28727,8 +31214,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -28727,8 +31219,8 @@
fi
@@ -35380,7 +35607,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28874,8 +31361,8 @@
+@@ -28874,8 +31366,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -35391,7 +35618,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28886,9 +31373,9 @@
+@@ -28886,9 +31378,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -35404,7 +35631,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28900,40 +31387,52 @@
+@@ -28900,40 +31392,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35469,15 +35696,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28942,14 +31441,16 @@
+@@ -28942,14 +31446,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ eval "$as_ac_Lib=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35489,7 +35717,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28962,8 +31463,8 @@
+@@ -28962,8 +31468,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -35500,7 +35728,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28976,40 +31477,52 @@
+@@ -28976,40 +31482,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35565,15 +35793,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29018,14 +31531,15 @@
+@@ -29018,14 +31536,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35584,7 +35813,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29033,8 +31547,8 @@
+@@ -29033,8 +31552,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -35595,7 +35824,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29053,39 +31567,52 @@
+@@ -29053,40 +31572,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35656,11 +35885,13 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -29101,16 +31628,15 @@
+ fi
+@@ -29101,16 +31633,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -35681,7 +35912,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29137,24 +31663,36 @@
+@@ -29137,24 +31668,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35726,17 +35957,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29163,7 +31701,9 @@
+@@ -29163,8 +31706,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29177,13 +31717,13 @@
+ ac_ext=c
+@@ -29177,13 +31722,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35754,7 +35987,7 @@
:
fi
-@@ -29195,16 +31735,15 @@
+@@ -29195,16 +31740,15 @@
case $host_os in
solaris*)
@@ -35775,7 +36008,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29231,24 +31770,36 @@
+@@ -29231,24 +31775,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35820,17 +36053,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29257,7 +31808,9 @@
+@@ -29257,8 +31813,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
-@@ -29271,13 +31824,13 @@
+ ac_ext=c
+@@ -29271,13 +31829,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35848,7 +36083,7 @@
:
fi
-@@ -29304,17 +31857,17 @@
+@@ -29304,17 +31862,17 @@
@@ -35872,7 +36107,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29332,21 +31885,21 @@
+@@ -29332,21 +31890,21 @@
fi
@@ -35902,7 +36137,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29365,14 +31918,14 @@
+@@ -29365,14 +31923,14 @@
@@ -35921,7 +36156,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29406,24 +31959,36 @@
+@@ -29406,24 +31964,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35966,18 +36201,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29432,8 +31997,9 @@
+@@ -29432,9 +32002,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_z=no"
+ eval "ac_cv_lib_z=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29447,8 +32013,8 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29447,8 +32018,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -35988,7 +36225,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29468,8 +32034,8 @@
+@@ -29468,8 +32039,8 @@
@@ -35999,7 +36236,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29505,24 +32071,36 @@
+@@ -29505,24 +32076,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36044,7 +36281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29531,9 +32109,10 @@
+@@ -29531,10 +32114,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36052,11 +36289,13 @@
+ eval "ac_cv_lib_png=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
-@@ -29548,19 +32127,19 @@
+ CFLAGS="$kde_save_CFLAGS"
+@@ -29548,19 +32132,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -36082,7 +36321,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29593,24 +32172,36 @@
+@@ -29593,24 +32177,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36127,18 +36366,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29619,8 +32210,9 @@
+@@ -29619,9 +32215,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_6b=no"
+ eval "ac_cv_lib_jpeg_6b=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29631,14 +32223,14 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29631,14 +32228,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -36159,7 +36400,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29671,24 +32263,36 @@
+@@ -29671,24 +32268,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36204,18 +36445,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29697,8 +32301,9 @@
+@@ -29697,9 +32306,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "ac_cv_lib_jpeg_normal=no"
+ eval "ac_cv_lib_jpeg_normal=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -29709,11 +32314,11 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -29709,11 +32319,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -36231,16 +36474,16 @@
LIBJPEG=
-@@ -29733,7 +32338,7 @@
+@@ -29733,7 +32343,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 29736: $i/$j" >&5
-+ echo "configure: 32341: $i/$j" >&5
++ echo "configure: 32346: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29780,14 +32385,14 @@
+@@ -29780,14 +32390,14 @@
@@ -36258,7 +36501,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29830,8 +32435,8 @@
+@@ -29830,8 +32440,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36269,7 +36512,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29840,8 +32445,8 @@
+@@ -29840,8 +32450,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36280,7 +36523,7 @@
PERL=$kde_cv_path
fi
-@@ -29855,10 +32460,9 @@
+@@ -29855,10 +32465,9 @@
@@ -36293,7 +36536,7 @@
else
if test $kde_qtver = 3; then
-@@ -29868,7 +32472,8 @@
+@@ -29868,7 +32477,8 @@
fi
@@ -36303,7 +36546,7 @@
USING_QT_MT=""
-@@ -29888,13 +32493,13 @@
+@@ -29888,13 +32498,13 @@
else
kde_check_threading_default=yes
fi
@@ -36321,7 +36564,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29966,8 +32571,8 @@
+@@ -29966,8 +32576,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -36332,7 +36575,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29976,34 +32581,34 @@
+@@ -29976,34 +32586,34 @@
qt_libraries=""
qt_includes=""
@@ -36379,16 +36622,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30031,7 +32636,7 @@
+@@ -30031,7 +32641,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30034: $i/$j" >&5
-+ echo "configure: 32639: $i/$j" >&5
++ echo "configure: 32644: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30068,8 +32673,7 @@
+@@ -30068,8 +32678,7 @@
ac_qt_libraries="$qt_libdir"
@@ -36398,7 +36641,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30206,13 +32810,13 @@
+@@ -30206,13 +32815,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -36416,7 +36659,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30221,15 +32825,14 @@
+@@ -30221,15 +32830,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -36435,7 +36678,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30350,12 +32953,12 @@
+@@ -30350,12 +32958,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -36452,7 +36695,7 @@
fi
-@@ -30393,14 +32996,14 @@
+@@ -30393,14 +33001,14 @@
fi
@@ -36470,7 +36713,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30443,8 +33046,8 @@
+@@ -30443,8 +33051,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36481,7 +36724,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30465,22 +33068,22 @@
+@@ -30465,22 +33073,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36509,7 +36752,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30523,12 +33126,12 @@
+@@ -30523,12 +33131,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36526,7 +36769,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30558,10 +33161,10 @@
+@@ -30558,10 +33166,10 @@
if test $kde_qtver = 3; then
@@ -36540,7 +36783,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30584,22 +33187,22 @@
+@@ -30584,22 +33192,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36570,7 +36813,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30622,13 +33225,13 @@
+@@ -30622,13 +33230,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36588,7 +36831,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30659,15 +33262,14 @@
+@@ -30659,15 +33267,14 @@
if test -n "$LIBJPEG"; then
@@ -36607,7 +36850,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30700,24 +33302,36 @@
+@@ -30700,24 +33307,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36652,18 +36895,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30726,8 +33340,9 @@
+@@ -30726,9 +33345,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "kde_cv_qt_jpeg=yes"
+ eval "kde_cv_qt_jpeg=yes"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -30744,12 +33359,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -30744,12 +33364,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -36680,7 +36925,7 @@
LIBJPEG_QT=
fi
-@@ -30780,15 +33395,15 @@
+@@ -30780,15 +33400,15 @@
@@ -36702,7 +36947,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30812,11 +33427,11 @@
+@@ -30812,11 +33432,11 @@
@@ -36718,34 +36963,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30868,7 +33483,7 @@
+@@ -30868,7 +33488,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 30871: $i/$j" >&5
-+ echo "configure: 33486: $i/$j" >&5
++ echo "configure: 33491: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30898,7 +33513,7 @@
+@@ -30898,7 +33518,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 30901: $i/$j" >&5
-+ echo "configure: 33516: $i/$j" >&5
++ echo "configure: 33521: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30916,7 +33531,7 @@
+@@ -30916,7 +33536,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 30919: $i/$j" >&5
-+ echo "configure: 33534: $i/$j" >&5
++ echo "configure: 33539: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30975,12 +33590,12 @@
+@@ -30975,12 +33595,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -36762,7 +37007,7 @@
fi
kde_libraries="${libdir}"
-@@ -30989,8 +33604,8 @@
+@@ -30989,8 +33609,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -36773,7 +37018,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31028,8 +33643,8 @@
+@@ -31028,8 +33648,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -36784,7 +37029,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31072,8 +33687,8 @@
+@@ -31072,8 +33692,8 @@
fi
@@ -36795,7 +37040,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31105,10 +33720,9 @@
+@@ -31105,10 +33725,9 @@
@@ -36808,7 +37053,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31122,13 +33736,14 @@
+@@ -31122,13 +33741,14 @@
fi
@@ -36826,7 +37071,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31239,15 +33854,14 @@
+@@ -31239,15 +33859,14 @@
else
if test $kde_qtver = 1; then
@@ -36847,7 +37092,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31299,8 +33913,8 @@
+@@ -31299,8 +33918,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -36858,7 +37103,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31339,8 +33953,8 @@
+@@ -31339,8 +33958,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -36869,7 +37114,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31348,8 +33962,8 @@
+@@ -31348,8 +33967,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -36880,7 +37125,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31542,15 +34156,14 @@
+@@ -31542,15 +34161,14 @@
else
if test $kde_qtver = 1; then
@@ -36901,7 +37146,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31602,8 +34215,8 @@
+@@ -31602,8 +34220,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -36912,7 +37157,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31642,8 +34255,8 @@
+@@ -31642,8 +34260,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -36923,7 +37168,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31651,8 +34264,8 @@
+@@ -31651,8 +34269,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -36934,7 +37179,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31744,22 +34357,22 @@
+@@ -31744,22 +34362,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -36963,7 +37208,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31792,14 +34405,14 @@
+@@ -31792,14 +34410,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -36981,7 +37226,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31842,8 +34455,8 @@
+@@ -31842,8 +34460,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36992,7 +37237,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31854,21 +34467,21 @@
+@@ -31854,21 +34472,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37019,7 +37264,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31911,8 +34524,8 @@
+@@ -31911,8 +34529,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37030,7 +37275,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31923,22 +34536,22 @@
+@@ -31923,22 +34541,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37058,7 +37303,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31981,8 +34594,8 @@
+@@ -31981,8 +34599,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37069,7 +37314,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31995,21 +34608,21 @@
+@@ -31995,21 +34613,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37096,7 +37341,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32052,8 +34665,8 @@
+@@ -32052,8 +34670,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37107,7 +37352,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32066,22 +34679,22 @@
+@@ -32066,22 +34684,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37135,7 +37380,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32124,12 +34737,12 @@
+@@ -32124,12 +34742,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37152,7 +37397,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32158,14 +34771,14 @@
+@@ -32158,14 +34776,14 @@
if test -n "$kde32ornewer"; then
@@ -37170,7 +37415,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32208,8 +34821,8 @@
+@@ -32208,8 +34826,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37181,7 +37426,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32220,21 +34833,21 @@
+@@ -32220,21 +34838,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37208,7 +37453,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32277,8 +34890,8 @@
+@@ -32277,8 +34895,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37219,7 +37464,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32289,8 +34902,8 @@
+@@ -32289,8 +34907,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37230,7 +37475,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32298,14 +34911,14 @@
+@@ -32298,14 +34916,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -37248,7 +37493,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32348,8 +34961,8 @@
+@@ -32348,8 +34966,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37259,7 +37504,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32360,8 +34973,8 @@
+@@ -32360,8 +34978,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37270,7 +37515,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32369,14 +34982,14 @@
+@@ -32369,14 +34987,14 @@
fi
@@ -37288,7 +37533,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32419,12 +35032,12 @@
+@@ -32419,12 +35037,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37305,16 +37550,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32439,7 +35052,7 @@
+@@ -32439,7 +35057,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32442: $i/$j" >&5
-+ echo "configure: 35055: $i/$j" >&5
++ echo "configure: 35060: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32605,9 +35218,9 @@
+@@ -32605,9 +35223,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -37327,7 +37572,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32629,24 +35242,36 @@
+@@ -32629,24 +35247,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37372,15 +37617,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32655,12 +35280,14 @@
+@@ -32655,12 +35285,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -37390,7 +37636,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -32672,13 +35299,12 @@
+@@ -32672,13 +35304,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -37406,68 +37652,14 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32686,126 +35312,99 @@
+@@ -32686,126 +35317,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 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_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -37533,23 +37725,77 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
+- ac_cv_search_opendir="none required"
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-- done
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 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_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -37584,68 +37830,14 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32813,122 +35412,96 @@
+@@ -32813,122 +35417,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 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_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -37711,23 +37903,77 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
+- ac_cv_search_opendir="none required"
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-- done
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 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_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -37758,7 +38004,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32952,24 +35525,36 @@
+@@ -32952,24 +35530,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37803,18 +38049,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32978,8 +35563,9 @@
+@@ -32978,9 +35568,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -33036,6 +35622,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -33036,6 +35627,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -37822,7 +38070,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33055,18 +35642,27 @@
+@@ -33055,18 +35647,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -37856,7 +38104,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33079,12 +35675,14 @@
+@@ -33079,12 +35680,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -37874,7 +38122,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33115,18 +35713,19 @@
+@@ -33115,18 +35718,19 @@
for ac_header in fcntl.h sys/time.h unistd.h features.h alloca.h linux/awe_voice.h awe_voice.h /usr/src/sys/i386/isa/sound/awe_voice.h /usr/src/sys/gnu/i386/isa/sound/awe_voice.h linux/ucdrom.h sys/stdtypes.h sys/filio.h sys/audioio.h Alib.h sys/sem.h string.h getopt.h machine/endian.h sys/awe_voice.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37902,7 +38150,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33137,24 +35736,36 @@
+@@ -33137,24 +35741,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37947,17 +38195,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33163,15 +35774,16 @@
+@@ -33163,15 +35779,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -37969,7 +38218,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33180,8 +35792,13 @@
+@@ -33180,8 +35797,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37985,7 +38234,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33205,9 +35822,10 @@
+@@ -33205,9 +35827,10 @@
ac_header_preproc=no
fi
@@ -37998,7 +38247,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33231,25 +35849,19 @@
+@@ -33231,25 +35854,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38031,7 +38280,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33266,18 +35878,19 @@
+@@ -33266,18 +35883,19 @@
for ac_header in linux/cdrom.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38059,7 +38308,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33288,24 +35901,36 @@
+@@ -33288,24 +35906,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38104,17 +38353,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33314,15 +35939,16 @@
+@@ -33314,15 +35944,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -38126,7 +38376,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33331,8 +35957,13 @@
+@@ -33331,8 +35962,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38142,7 +38392,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33356,9 +35987,10 @@
+@@ -33356,9 +35992,10 @@
ac_header_preproc=no
fi
@@ -38155,7 +38405,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33382,25 +36014,19 @@
+@@ -33382,25 +36019,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38188,7 +38438,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33418,9 +36044,9 @@
+@@ -33418,9 +36049,9 @@
for ac_func in usleep snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38201,7 +38451,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33446,53 +36072,59 @@
+@@ -33446,53 +36077,59 @@
#undef $ac_func
@@ -38280,15 +38530,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33501,13 +36133,15 @@
+@@ -33501,13 +36138,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -38299,7 +38550,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -33517,8 +36151,8 @@
+@@ -33517,8 +36156,8 @@
done
@@ -38310,7 +38561,7 @@
ARCH_TYPE=`uname -m`
if test `uname -s` = "FreeBSD"
-@@ -33531,13 +36165,13 @@
+@@ -33531,13 +36170,13 @@
;;
esac
fi;
@@ -38328,7 +38579,7 @@
as_ver=`echo|as -v 2>&1|grep ".*version.*"`
if test -z "$as_ver"
then
-@@ -33563,16 +36197,16 @@
+@@ -33563,16 +36202,16 @@
fi
fi
fi
@@ -38349,7 +38600,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33596,24 +36230,36 @@
+@@ -33596,24 +36235,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38394,15 +38645,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33622,12 +36268,13 @@
+@@ -33622,12 +36273,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -38411,7 +38663,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33638,8 +36285,8 @@
+@@ -33638,8 +36290,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -38422,7 +38674,7 @@
if test "${ac_cv_x86_sse+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33666,24 +36313,36 @@
+@@ -33666,24 +36318,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38467,15 +38719,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33692,14 +36351,15 @@
+@@ -33692,14 +36356,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_x86_sse=no
+ ac_cv_x86_sse=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -38486,7 +38739,7 @@
if test "x$ac_cv_x86_sse" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -33724,8 +36384,8 @@
+@@ -33724,8 +36389,8 @@
@@ -38497,7 +38750,7 @@
if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33737,56 +36397,61 @@
+@@ -33737,56 +36402,61 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
@@ -38570,8 +38823,9 @@
-ac_cv_type_signal=int
+ ac_cv_type_signal=void
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
@@ -38580,7 +38834,7 @@
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
-@@ -33795,13 +36460,13 @@
+@@ -33795,13 +36465,13 @@
@@ -38598,7 +38852,7 @@
have_oggvorbis=no
if test "x$with_vorbis" != xno; then
-@@ -33818,8 +36483,8 @@
+@@ -33818,8 +36488,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38609,7 +38863,7 @@
if test "${ac_cv_lib_ogg_ogg_page_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33832,40 +36497,52 @@
+@@ -33832,40 +36502,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38674,15 +38928,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33874,14 +36551,15 @@
+@@ -33874,14 +36556,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ogg_ogg_page_version=no
+ ac_cv_lib_ogg_ogg_page_version=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38693,7 +38948,7 @@
if test $ac_cv_lib_ogg_ogg_page_version = yes; then
:
else
-@@ -33896,8 +36574,7 @@
+@@ -33896,8 +36579,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38703,7 +38958,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33907,17 +36584,17 @@
+@@ -33907,17 +36589,17 @@
if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
@@ -38727,7 +38982,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33928,24 +36605,36 @@
+@@ -33928,24 +36610,36 @@
#include <vorbis/vorbisfile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38772,17 +39027,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33954,15 +36643,16 @@
+@@ -33954,15 +36648,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -38794,7 +39050,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33971,8 +36661,13 @@
+@@ -33971,8 +36666,13 @@
/* end confdefs.h. */
#include <vorbis/vorbisfile.h>
_ACEOF
@@ -38810,7 +39066,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33996,9 +36691,10 @@
+@@ -33996,9 +36696,10 @@
ac_header_preproc=no
fi
@@ -38823,7 +39079,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34022,25 +36718,18 @@
+@@ -34022,25 +36723,18 @@
echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
@@ -38854,7 +39110,7 @@
fi
if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
-@@ -34068,8 +36757,8 @@
+@@ -34068,8 +36762,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38865,7 +39121,7 @@
if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34082,40 +36771,52 @@
+@@ -34082,40 +36776,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38930,15 +39186,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34124,14 +36825,15 @@
+@@ -34124,14 +36830,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_vorbis_vorbis_info_init=no
+ ac_cv_lib_vorbis_vorbis_info_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38949,7 +39206,7 @@
if test $ac_cv_lib_vorbis_vorbis_info_init = yes; then
:
else
-@@ -34151,8 +36853,8 @@
+@@ -34151,8 +36858,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38960,7 +39217,7 @@
if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34165,40 +36867,52 @@
+@@ -34165,40 +36872,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39025,15 +39282,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34207,14 +36921,15 @@
+@@ -34207,14 +36926,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_vorbisfile_ov_open=no
+ ac_cv_lib_vorbisfile_ov_open=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39044,7 +39302,7 @@
if test $ac_cv_lib_vorbisfile_ov_open = yes; then
:
else
-@@ -34234,8 +36949,8 @@
+@@ -34234,8 +36954,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39055,7 +39313,7 @@
if test "${ac_cv_lib_vorbisenc_vorbis_encode_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34248,40 +36963,52 @@
+@@ -34248,40 +36968,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39120,15 +39378,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34290,14 +37017,15 @@
+@@ -34290,14 +37022,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_vorbisenc_vorbis_encode_init=no
+ ac_cv_lib_vorbisenc_vorbis_encode_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39139,7 +39398,7 @@
if test $ac_cv_lib_vorbisenc_vorbis_encode_init = yes; then
:
else
-@@ -34317,8 +37045,8 @@
+@@ -34317,8 +37050,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39150,7 +39409,7 @@
if test "${ac_cv_lib_vorbis_vorbis_bitrate_addblock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34331,40 +37059,52 @@
+@@ -34331,40 +37064,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39215,15 +39474,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34373,14 +37113,15 @@
+@@ -34373,14 +37118,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_vorbis_vorbis_bitrate_addblock=no
+ ac_cv_lib_vorbis_vorbis_bitrate_addblock=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39234,7 +39494,7 @@
if test $ac_cv_lib_vorbis_vorbis_bitrate_addblock = yes; then
have_vorbis_value=2
else
-@@ -34449,13 +37190,13 @@
+@@ -34449,13 +37195,13 @@
fi
@@ -39252,7 +39512,7 @@
if test "x$with_ossaudio" != xno; then
-@@ -34466,18 +37207,19 @@
+@@ -34466,18 +37212,19 @@
for ac_header in soundcard.h sys/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39280,7 +39540,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34488,24 +37230,36 @@
+@@ -34488,24 +37235,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39325,17 +39585,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34514,15 +37268,16 @@
+@@ -34514,15 +37273,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -39347,7 +39608,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34531,8 +37286,13 @@
+@@ -34531,8 +37291,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39363,7 +39624,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34556,9 +37316,10 @@
+@@ -34556,9 +37321,10 @@
ac_header_preproc=no
fi
@@ -39376,7 +39637,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34582,25 +37343,19 @@
+@@ -34582,25 +37348,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39409,7 +39670,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34613,8 +37368,8 @@
+@@ -34613,8 +37373,8 @@
done
@@ -39420,7 +39681,7 @@
if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34627,40 +37382,52 @@
+@@ -34627,40 +37387,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39485,15 +39746,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34669,14 +37436,15 @@
+@@ -34669,14 +37441,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ossaudio__oss_ioctl=no
+ ac_cv_lib_ossaudio__oss_ioctl=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39504,7 +39766,7 @@
if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
:
else
-@@ -34700,13 +37468,13 @@
+@@ -34700,13 +37473,13 @@
fi
@@ -39522,7 +39784,7 @@
have_alsa=no
if test "x$with_alsa" != xno; then
-@@ -34718,18 +37486,19 @@
+@@ -34718,18 +37491,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39550,7 +39812,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34740,24 +37509,36 @@
+@@ -34740,24 +37514,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39595,17 +39857,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34766,15 +37547,16 @@
+@@ -34766,15 +37552,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -39617,7 +39880,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34783,8 +37565,13 @@
+@@ -34783,8 +37570,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39633,7 +39896,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34808,9 +37595,10 @@
+@@ -34808,9 +37600,10 @@
ac_header_preproc=no
fi
@@ -39646,7 +39909,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34834,25 +37622,19 @@
+@@ -34834,25 +37627,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -39679,7 +39942,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34865,8 +37647,8 @@
+@@ -34865,8 +37652,8 @@
done
@@ -39690,7 +39953,7 @@
if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34879,40 +37661,52 @@
+@@ -34879,40 +37666,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39755,15 +40018,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34921,14 +37715,15 @@
+@@ -34921,14 +37720,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_asound_snd_seq_create_simple_port=no
+ ac_cv_lib_asound_snd_seq_create_simple_port=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39774,7 +40038,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
:
else
-@@ -34937,7 +37732,6 @@
+@@ -34937,7 +37737,6 @@
@@ -39782,7 +40046,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -34975,24 +37769,36 @@
+@@ -34975,24 +37774,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39827,17 +40091,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35001,7 +37807,9 @@
+@@ -35001,8 +37812,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -35034,24 +37842,36 @@
+ /* confdefs.h. */
+@@ -35034,24 +37847,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39882,17 +40148,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35060,7 +37880,9 @@
+@@ -35060,8 +37885,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-@@ -35093,24 +37915,36 @@
+ /* confdefs.h. */
+@@ -35093,24 +37920,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39937,17 +40205,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35119,7 +37953,9 @@
+@@ -35119,8 +37958,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_ext=c
-@@ -35169,13 +38005,13 @@
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -35169,13 +38010,13 @@
fi
@@ -39965,7 +40235,7 @@
have_cdparanoia=no
if test "x$with_cdparanoia" != xno; then
-@@ -35184,14 +38020,14 @@
+@@ -35184,14 +38025,14 @@
if test -z "$CDPARANOIA"; then
@@ -39983,7 +40253,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35234,12 +38070,12 @@
+@@ -35234,12 +38075,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -40000,7 +40270,7 @@
CDPARANOIA=$kde_cv_path
fi
-@@ -35254,8 +38090,7 @@
+@@ -35254,8 +38095,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40010,7 +40280,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35265,17 +38100,17 @@
+@@ -35265,17 +38105,17 @@
if test "${ac_cv_header_cdda_interface_h+set}" = set; then
@@ -40034,7 +40304,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35286,24 +38121,36 @@
+@@ -35286,24 +38126,36 @@
#include <cdda_interface.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40079,17 +40349,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35312,15 +38159,16 @@
+@@ -35312,15 +38164,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -40101,7 +40372,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35329,8 +38177,13 @@
+@@ -35329,8 +38182,13 @@
/* end confdefs.h. */
#include <cdda_interface.h>
_ACEOF
@@ -40117,7 +40388,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35354,9 +38207,10 @@
+@@ -35354,9 +38212,10 @@
ac_header_preproc=no
fi
@@ -40130,7 +40401,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35380,25 +38234,18 @@
+@@ -35380,25 +38239,18 @@
echo "$as_me: WARNING: cdda_interface.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&2;}
@@ -40161,7 +40432,7 @@
fi
if test $ac_cv_header_cdda_interface_h = yes; then
-@@ -35418,12 +38265,11 @@
+@@ -35418,12 +38270,11 @@
# Older versions of FreeBSD's cdparanoia lack cdrom_drive.cdda_device_name
@@ -40176,7 +40447,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -35451,41 +38297,54 @@
+@@ -35451,42 +38302,55 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40239,11 +40510,13 @@
have_cdparanoia=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -35504,8 +38363,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -35504,8 +38368,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40254,7 +40527,7 @@
if test "${ac_cv_lib_cdda_paranoia_paranoia_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35518,40 +38377,52 @@
+@@ -35518,40 +38382,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40319,15 +40592,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35560,14 +38431,15 @@
+@@ -35560,14 +38436,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_cdda_paranoia_paranoia_init=no
+ ac_cv_lib_cdda_paranoia_paranoia_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40338,16 +40612,16 @@
if test $ac_cv_lib_cdda_paranoia_paranoia_init = yes; then
:
else
-@@ -35586,7 +38458,7 @@
+@@ -35586,7 +38463,7 @@
do
for j in libcdda_paranoia.$ext;
do
- echo "configure: 35589: $i/$j" >&5
-+ echo "configure: 38461: $i/$j" >&5
++ echo "configure: 38466: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_libdir=$i
-@@ -35668,13 +38540,13 @@
+@@ -35668,13 +38545,13 @@
fi
@@ -40365,7 +40639,7 @@
have_lame=no
if test "x$with_lame" != xno; then
-@@ -35685,8 +38557,7 @@
+@@ -35685,8 +38562,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40375,7 +40649,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35696,17 +38567,17 @@
+@@ -35696,17 +38572,17 @@
if test "${ac_cv_header_lame_lame_h+set}" = set; then
@@ -40399,7 +40673,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35717,24 +38588,36 @@
+@@ -35717,24 +38593,36 @@
#include <lame/lame.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40444,17 +40718,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35743,15 +38626,16 @@
+@@ -35743,15 +38631,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -40466,7 +40741,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35760,8 +38644,13 @@
+@@ -35760,8 +38649,13 @@
/* end confdefs.h. */
#include <lame/lame.h>
_ACEOF
@@ -40482,7 +40757,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35785,9 +38674,10 @@
+@@ -35785,9 +38679,10 @@
ac_header_preproc=no
fi
@@ -40495,7 +40770,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35811,25 +38701,18 @@
+@@ -35811,25 +38706,18 @@
echo "$as_me: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&2;}
@@ -40526,7 +40801,7 @@
fi
if test $ac_cv_header_lame_lame_h = yes; then
-@@ -35857,8 +38740,8 @@
+@@ -35857,8 +38745,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40537,7 +40812,7 @@
if test "${ac_cv_lib_mp3lame_lame_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35871,40 +38754,52 @@
+@@ -35871,40 +38759,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40602,15 +40877,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35913,14 +38808,15 @@
+@@ -35913,14 +38813,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_mp3lame_lame_init=no
+ ac_cv_lib_mp3lame_lame_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40621,7 +40897,7 @@
if test $ac_cv_lib_mp3lame_lame_init = yes; then
:
else
-@@ -35959,13 +38855,13 @@
+@@ -35959,13 +38860,13 @@
@@ -40639,7 +40915,7 @@
have_taglib=no
have_taglib_mpc=no
-@@ -35973,8 +38869,8 @@
+@@ -35973,8 +38874,8 @@
# Extract the first word of "taglib-config", so it can be a program name with args.
set dummy taglib-config; ac_word=$2
@@ -40650,7 +40926,7 @@
if test "${ac_cv_path_TAGLIB_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35990,29 +38886,30 @@
+@@ -35990,29 +38891,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -40687,7 +40963,7 @@
if test "x$TAGLIB_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36032,8 +38929,7 @@
+@@ -36032,8 +38934,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40697,7 +40973,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -36043,17 +38939,17 @@
+@@ -36043,17 +38944,17 @@
if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
@@ -40721,7 +40997,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36064,24 +38960,36 @@
+@@ -36064,24 +38965,36 @@
#include <taglib/mpcfile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40766,17 +41042,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36090,15 +38998,16 @@
+@@ -36090,15 +39003,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -40788,7 +41065,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36107,8 +39016,13 @@
+@@ -36107,8 +39021,13 @@
/* end confdefs.h. */
#include <taglib/mpcfile.h>
_ACEOF
@@ -40804,7 +41081,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36132,9 +39046,10 @@
+@@ -36132,9 +39051,10 @@
ac_header_preproc=no
fi
@@ -40817,7 +41094,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36158,25 +39073,18 @@
+@@ -36158,25 +39078,18 @@
echo "$as_me: WARNING: taglib/mpcfile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&2;}
@@ -40848,7 +41125,7 @@
fi
if test $ac_cv_header_taglib_mpcfile_h = yes; then
-@@ -36207,21 +39115,21 @@
+@@ -36207,21 +39120,21 @@
fi
@@ -40876,7 +41153,7 @@
if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36237,29 +39145,30 @@
+@@ -36237,29 +39150,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -40913,7 +41190,7 @@
if test "x$AKODE_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36287,8 +39196,8 @@
+@@ -36287,8 +39201,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40924,7 +41201,7 @@
if test "${ac_cv_lib_akode_mpeg_decoder_mpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36301,40 +39210,52 @@
+@@ -36301,40 +39215,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40989,15 +41266,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36343,14 +39264,15 @@
+@@ -36343,14 +39269,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_akode_mpeg_decoder_mpeg_decoder=no
+ ac_cv_lib_akode_mpeg_decoder_mpeg_decoder=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41008,7 +41286,7 @@
if test $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder = yes; then
have_akode_mpeg=yes
else
-@@ -36369,8 +39291,8 @@
+@@ -36369,8 +39296,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41019,7 +41297,7 @@
if test "${ac_cv_lib_akode_mpc_decoder_mpc_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36383,40 +39305,52 @@
+@@ -36383,40 +39310,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41084,15 +41362,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36425,14 +39359,15 @@
+@@ -36425,14 +39364,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_akode_mpc_decoder_mpc_decoder=no
+ ac_cv_lib_akode_mpc_decoder_mpc_decoder=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41103,7 +41382,7 @@
if test $ac_cv_lib_akode_mpc_decoder_mpc_decoder = yes; then
have_akode_mpc=yes
else
-@@ -36451,8 +39386,8 @@
+@@ -36451,8 +39391,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41114,7 +41393,7 @@
if test "${ac_cv_lib_akode_xiph_decoder_xiph_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36465,40 +39400,52 @@
+@@ -36465,40 +39405,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41179,15 +41458,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36507,14 +39454,15 @@
+@@ -36507,14 +39459,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_akode_xiph_decoder_xiph_decoder=no
+ ac_cv_lib_akode_xiph_decoder_xiph_decoder=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41198,7 +41478,7 @@
if test $ac_cv_lib_akode_xiph_decoder_xiph_decoder = yes; then
have_akode_xiph=yes
else
-@@ -36533,8 +39481,8 @@
+@@ -36533,8 +39486,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41209,7 +41489,7 @@
if test "${ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36547,40 +39495,52 @@
+@@ -36547,40 +39500,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41274,15 +41554,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36589,14 +39549,15 @@
+@@ -36589,14 +39554,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder=no
+ ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41293,7 +41574,7 @@
if test $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder = yes; then
have_akode_ffmpeg=yes
else
-@@ -36660,8 +39621,8 @@
+@@ -36660,8 +39626,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -41304,7 +41585,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36676,29 +39637,30 @@
+@@ -36676,29 +39642,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41341,7 +41622,7 @@
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -36737,8 +39699,8 @@
+@@ -36737,8 +39704,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -41352,7 +41633,7 @@
if test "${ac_cv_path_kde_artsplug_compiles+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36753,29 +39715,30 @@
+@@ -36753,29 +39720,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41389,7 +41670,7 @@
if test x$kde_artsplug_compiles != xno; then
ARTSCCONFIG=$kde_artsplug_compiles;
kde_artsplug_compiles=yes
-@@ -36784,25 +39747,25 @@
+@@ -36784,25 +39752,25 @@
if test x$kde_artsplug_compiles = xyes; then
ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
@@ -41423,7 +41704,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib_artsplug"
fi
-@@ -36831,13 +39794,13 @@
+@@ -36831,13 +39799,13 @@
else
kde_check_threading_default=yes
fi
@@ -41441,7 +41722,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36848,17 +39811,17 @@
+@@ -36848,17 +39816,17 @@
@@ -41465,7 +41746,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36873,28 +39836,29 @@
+@@ -36873,28 +39841,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41501,7 +41782,7 @@
if test "x$ARTSCCONFIG" = "xno" ; then
{ { echo "$as_me:$LINENO: error: Cannot find artsc-config - missing from path?" >&5
echo "$as_me: error: Cannot find artsc-config - missing from path?" >&2;}
-@@ -36919,8 +39883,8 @@
+@@ -36919,8 +39888,8 @@
ARTS_BUILD_KDE=""
ARTS_BUILD_KDE_GUI=""
else
@@ -41512,7 +41793,7 @@
arts_datadir="$kde_datadir"
arts_includes="$kde_includes/arts"
-@@ -36951,13 +39915,13 @@
+@@ -36951,13 +39920,13 @@
@@ -41530,7 +41811,7 @@
arts_audiolib_found=no
if test "x$with_audiofile" != xno; then
-@@ -36968,7 +39932,6 @@
+@@ -36968,7 +39937,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
arts_audiolib_found=no
@@ -41538,7 +41819,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -36977,17 +39940,17 @@
+@@ -36977,17 +39945,17 @@
kde_has_audio_lib=no
if test "${ac_cv_header_audiofile_h+set}" = set; then
@@ -41562,7 +41843,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36998,24 +39961,36 @@
+@@ -36998,24 +39966,36 @@
#include <audiofile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41607,17 +41888,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37024,15 +39999,16 @@
+@@ -37024,15 +40004,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -41629,7 +41911,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37041,8 +40017,13 @@
+@@ -37041,8 +40022,13 @@
/* end confdefs.h. */
#include <audiofile.h>
_ACEOF
@@ -41645,7 +41927,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37066,9 +40047,10 @@
+@@ -37066,9 +40052,10 @@
ac_header_preproc=no
fi
@@ -41658,7 +41940,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37092,25 +40074,18 @@
+@@ -37092,25 +40079,18 @@
echo "$as_me: WARNING: audiofile.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: audiofile.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: audiofile.h: in the future, the compiler will take precedence" >&2;}
@@ -41689,7 +41971,7 @@
fi
if test $ac_cv_header_audiofile_h = yes; then
-@@ -37130,8 +40105,8 @@
+@@ -37130,8 +40110,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41700,7 +41982,7 @@
if test "${ac_cv_lib_audiofile_afOpenFile+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37144,40 +40119,52 @@
+@@ -37144,40 +40124,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41765,15 +42047,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37186,14 +40173,15 @@
+@@ -37186,14 +40178,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_audiofile_afOpenFile=no
+ ac_cv_lib_audiofile_afOpenFile=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41784,7 +42067,7 @@
if test $ac_cv_lib_audiofile_afOpenFile = yes; then
LIBAUDIOFILE="$LDFLAGS -laudiofile"
-@@ -37235,13 +40223,13 @@
+@@ -37235,13 +40228,13 @@
@@ -41802,7 +42085,7 @@
have_musicbrainz=no
-@@ -37250,8 +40238,7 @@
+@@ -37250,8 +40243,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -41812,7 +42095,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37261,17 +40248,17 @@
+@@ -37261,17 +40253,17 @@
if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
@@ -41836,7 +42119,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37282,24 +40269,36 @@
+@@ -37282,24 +40274,36 @@
#include <tunepimp/tp_c.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41881,17 +42164,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37308,15 +40307,16 @@
+@@ -37308,15 +40312,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -41903,7 +42187,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37325,8 +40325,13 @@
+@@ -37325,8 +40330,13 @@
/* end confdefs.h. */
#include <tunepimp/tp_c.h>
_ACEOF
@@ -41919,7 +42203,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37350,9 +40355,10 @@
+@@ -37350,9 +40360,10 @@
ac_header_preproc=no
fi
@@ -41932,7 +42216,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37376,25 +40382,18 @@
+@@ -37376,25 +40387,18 @@
echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&2;}
@@ -41963,7 +42247,7 @@
fi
if test $ac_cv_header_tunepimp_tp_c_h = yes; then
-@@ -37419,8 +40418,8 @@
+@@ -37419,8 +40423,8 @@
fi
if test "x$have_musicbrainz" = xyes; then
@@ -41974,7 +42258,7 @@
if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37433,40 +40432,52 @@
+@@ -37433,40 +40437,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42039,15 +42323,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37475,14 +40486,15 @@
+@@ -37475,14 +40491,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no
+ ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42058,7 +42343,7 @@
if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -37517,13 +40529,13 @@
+@@ -37517,13 +40534,13 @@
@@ -42076,7 +42361,7 @@
have_gst=no
-@@ -37544,8 +40556,8 @@
+@@ -37544,8 +40561,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -42087,7 +42372,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37560,28 +40572,29 @@
+@@ -37560,28 +40577,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -42123,7 +42408,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37592,30 +40605,30 @@
+@@ -37592,30 +40610,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -42166,7 +42451,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37654,8 +40667,8 @@
+@@ -37654,8 +40672,8 @@
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -42177,7 +42462,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37670,28 +40683,29 @@
+@@ -37670,28 +40688,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -42213,7 +42498,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37702,30 +40716,30 @@
+@@ -37702,30 +40721,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -42256,7 +42541,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37853,13 +40867,13 @@
+@@ -37853,13 +40872,13 @@
@@ -42274,7 +42559,7 @@
have_theora=no
if test "x$with_theora" != xno; then
-@@ -37870,8 +40884,7 @@
+@@ -37870,8 +40889,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42284,7 +42569,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37881,17 +40894,17 @@
+@@ -37881,17 +40899,17 @@
if test "${ac_cv_header_theora_theora_h+set}" = set; then
@@ -42308,7 +42593,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37902,24 +40915,36 @@
+@@ -37902,24 +40920,36 @@
#include <theora/theora.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42353,17 +42638,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37928,15 +40953,16 @@
+@@ -37928,15 +40958,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -42375,7 +42661,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37945,8 +40971,13 @@
+@@ -37945,8 +40976,13 @@
/* end confdefs.h. */
#include <theora/theora.h>
_ACEOF
@@ -42391,7 +42677,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37970,9 +41001,10 @@
+@@ -37970,9 +41006,10 @@
ac_header_preproc=no
fi
@@ -42404,7 +42690,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37996,25 +41028,18 @@
+@@ -37996,25 +41033,18 @@
echo "$as_me: WARNING: theora/theora.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&2;}
@@ -42435,7 +42721,7 @@
fi
if test $ac_cv_header_theora_theora_h = yes; then
-@@ -38043,8 +41068,8 @@
+@@ -38043,8 +41073,8 @@
;;
esac
@@ -42446,7 +42732,7 @@
if test "${ac_cv_lib_theora_theora_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38057,40 +41082,52 @@
+@@ -38057,40 +41087,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42511,15 +42797,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38099,14 +41136,15 @@
+@@ -38099,14 +41141,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_theora_theora_info_init=no
+ ac_cv_lib_theora_theora_info_init=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42530,7 +42817,7 @@
if test $ac_cv_lib_theora_theora_info_init = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTHEORA 1
-@@ -38146,16 +41184,15 @@
+@@ -38146,16 +41189,15 @@
@@ -42551,7 +42838,7 @@
ac_ext=c
-@@ -38169,8 +41206,7 @@
+@@ -38169,8 +41211,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42561,7 +42848,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38180,17 +41216,17 @@
+@@ -38180,17 +41221,17 @@
if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
@@ -42585,7 +42872,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38201,24 +41237,36 @@
+@@ -38201,24 +41242,36 @@
#include <FLAC/metadata.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42630,17 +42917,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38227,15 +41275,16 @@
+@@ -38227,15 +41280,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -42652,7 +42940,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38244,8 +41293,13 @@
+@@ -38244,8 +41298,13 @@
/* end confdefs.h. */
#include <FLAC/metadata.h>
_ACEOF
@@ -42668,7 +42956,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38269,9 +41323,10 @@
+@@ -38269,9 +41328,10 @@
ac_header_preproc=no
fi
@@ -42681,7 +42969,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38295,25 +41350,18 @@
+@@ -38295,25 +41355,18 @@
echo "$as_me: WARNING: FLAC/metadata.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&2;}
@@ -42712,7 +43000,7 @@
fi
if test $ac_cv_header_FLAC_metadata_h = yes; then
-@@ -38327,8 +41375,8 @@
+@@ -38327,8 +41380,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -42723,7 +43011,7 @@
if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38341,40 +41389,52 @@
+@@ -38341,40 +41394,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42788,15 +43076,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38383,14 +41443,15 @@
+@@ -38383,14 +41448,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
+ ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42807,7 +43096,7 @@
if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
have_libFLAC=yes
fi
-@@ -38429,7 +41490,6 @@
+@@ -38429,7 +41495,6 @@
@@ -42815,7 +43104,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38441,8 +41501,7 @@
+@@ -38441,8 +41506,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42825,7 +43114,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38452,17 +41511,17 @@
+@@ -38452,17 +41516,17 @@
if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
@@ -42849,7 +43138,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38473,24 +41532,36 @@
+@@ -38473,24 +41537,36 @@
#include <OggFLAC/seekable_stream_decoder.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42894,17 +43183,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38499,15 +41570,16 @@
+@@ -38499,15 +41575,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -42916,7 +43206,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38516,8 +41588,13 @@
+@@ -38516,8 +41593,13 @@
/* end confdefs.h. */
#include <OggFLAC/seekable_stream_decoder.h>
_ACEOF
@@ -42932,7 +43222,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38541,9 +41618,10 @@
+@@ -38541,9 +41623,10 @@
ac_header_preproc=no
fi
@@ -42945,7 +43235,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38567,25 +41645,18 @@
+@@ -38567,25 +41650,18 @@
echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&2;}
@@ -42976,7 +43266,7 @@
fi
if test $ac_cv_header_OggFLAC_seekable_stream_decoder_h = yes; then
-@@ -38599,8 +41670,8 @@
+@@ -38599,8 +41675,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -42987,7 +43277,7 @@
if test "${ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38613,40 +41684,52 @@
+@@ -38613,40 +41689,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43052,15 +43342,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38655,14 +41738,15 @@
+@@ -38655,14 +41743,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
+ ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43071,7 +43362,7 @@
if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
have_libOggFLAC=yes
fi
-@@ -38705,8 +41789,7 @@
+@@ -38705,8 +41794,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43081,7 +43372,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38716,17 +41799,17 @@
+@@ -38716,17 +41804,17 @@
if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
@@ -43105,7 +43396,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38737,24 +41820,36 @@
+@@ -38737,24 +41825,36 @@
#include <libkmid/libkmid.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43150,17 +43441,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38763,15 +41858,16 @@
+@@ -38763,15 +41863,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -43172,7 +43464,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38780,8 +41876,13 @@
+@@ -38780,8 +41881,13 @@
/* end confdefs.h. */
#include <libkmid/libkmid.h>
_ACEOF
@@ -43188,7 +43480,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38805,9 +41906,10 @@
+@@ -38805,9 +41911,10 @@
ac_header_preproc=no
fi
@@ -43201,7 +43493,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38831,25 +41933,18 @@
+@@ -38831,25 +41938,18 @@
echo "$as_me: WARNING: libkmid/libkmid.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&2;}
@@ -43232,7 +43524,7 @@
fi
if test $ac_cv_header_libkmid_libkmid_h = yes; then
-@@ -38877,8 +41972,8 @@
+@@ -38877,8 +41977,8 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE krec"
fi
@@ -43243,7 +43535,7 @@
if test "${ac_cv_lib_cdaudio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38895,30 +41990,42 @@
+@@ -38895,30 +41995,42 @@
int
main ()
{
@@ -43295,15 +43587,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38927,20 +42034,21 @@
+@@ -38927,20 +42039,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_cdaudio_main=no
+ ac_cv_lib_cdaudio_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43322,7 +43615,7 @@
if test "${ac_cv_lib_fpe_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38957,30 +42065,42 @@
+@@ -38957,30 +42070,42 @@
int
main ()
{
@@ -43374,15 +43667,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38989,19 +42109,20 @@
+@@ -38989,19 +42114,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_fpe_main=no
+ ac_cv_lib_fpe_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43400,7 +43694,7 @@
if test "${ac_cv_lib_cdrom_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39018,30 +42139,42 @@
+@@ -39018,30 +42144,42 @@
int
main ()
{
@@ -43452,15 +43746,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39050,21 +42183,22 @@
+@@ -39050,21 +42188,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_cdrom_main=no
+ ac_cv_lib_cdrom_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43480,7 +43775,7 @@
if test "${ac_cv_lib_Alib_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39081,30 +42215,42 @@
+@@ -39081,30 +42220,42 @@
int
main ()
{
@@ -43532,15 +43827,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39113,20 +42259,21 @@
+@@ -39113,20 +42264,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Alib_main=no
+ ac_cv_lib_Alib_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43559,7 +43855,7 @@
if test "${ac_cv_lib_audio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39143,30 +42290,42 @@
+@@ -39143,30 +42295,42 @@
int
main ()
{
@@ -43611,15 +43907,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39175,20 +42334,21 @@
+@@ -39175,20 +42339,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_audio_main=no
+ ac_cv_lib_audio_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43638,7 +43935,7 @@
if test "${ac_cv_lib_mme_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39205,30 +42365,42 @@
+@@ -39205,30 +42370,42 @@
int
main ()
{
@@ -43690,15 +43987,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39237,14 +42409,15 @@
+@@ -39237,14 +42414,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_mme_main=no
+ ac_cv_lib_mme_main=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43709,7 +44007,7 @@
if test $ac_cv_lib_mme_main = yes; then
LIBMME="-lmme";EXTRAINCS="-I/usr/include/mme"
fi
-@@ -39253,10 +42426,9 @@
+@@ -39253,10 +42431,9 @@
@@ -43722,7 +44020,7 @@
if test $enableval = "no"; then use_kscd_defaults="no"
else use_kscd_defaults="yes"
fi
-@@ -39264,16 +42436,17 @@
+@@ -39264,16 +42441,17 @@
else
use_kscd_defaults="yes"
@@ -43744,7 +44042,7 @@
case "$host" in
*-*-linux*) kscd_compile=yes;;
*-*-*bsdi*) kscd_compile=yes;;
-@@ -39282,8 +42455,8 @@
+@@ -39282,8 +42460,8 @@
*-*-*openbsd*) kscd_compile=yes;;
*) kscd_compile=yes;;
esac
@@ -43755,7 +44053,7 @@
if test "$kscd_compile" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE kscd"
fi
-@@ -39297,14 +42470,13 @@
+@@ -39297,14 +42475,13 @@
fi
@@ -43774,7 +44072,7 @@
if test $withval = yes; then
libwm_with_cdda=yes
else
-@@ -39313,7 +42485,8 @@
+@@ -39313,7 +42490,8 @@
else
libwm_with_cdda=yes
@@ -43784,7 +44082,7 @@
if test "$libwm_with_cdda" = "yes"; then
case $host in
-@@ -39322,18 +42495,19 @@
+@@ -39322,18 +42500,19 @@
for ac_header in pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -43812,7 +44110,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39344,24 +42518,36 @@
+@@ -39344,24 +42523,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -43857,17 +44155,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39370,15 +42556,16 @@
+@@ -39370,15 +42561,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -43879,7 +44178,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39387,8 +42574,13 @@
+@@ -39387,8 +42579,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -43895,7 +44194,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39412,9 +42604,10 @@
+@@ -39412,9 +42609,10 @@
ac_header_preproc=no
fi
@@ -43908,7 +44207,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39438,25 +42631,19 @@
+@@ -39438,25 +42636,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -43941,7 +44240,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39504,24 +42691,36 @@
+@@ -39504,24 +42696,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43986,18 +44285,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39530,8 +42729,9 @@
+@@ -39530,27 +42734,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-libwm_with_cdda=no
+ libwm_with_cdda=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
*-*-sunos*)
-@@ -39539,18 +42739,19 @@
+
for ac_header in pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44025,7 +44325,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39561,24 +42762,36 @@
+@@ -39561,24 +42767,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44070,17 +44370,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39587,15 +42800,16 @@
+@@ -39587,15 +42805,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -44092,7 +44393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39604,8 +42818,13 @@
+@@ -39604,8 +42823,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44108,7 +44409,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39629,9 +42848,10 @@
+@@ -39629,9 +42853,10 @@
ac_header_preproc=no
fi
@@ -44121,7 +44422,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39655,25 +42875,19 @@
+@@ -39655,25 +42880,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -44154,7 +44455,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39710,24 +42924,36 @@
+@@ -39710,24 +42929,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44199,18 +44500,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39736,8 +42962,9 @@
+@@ -39736,9 +42967,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-libwm_with_cdda=no
+ libwm_with_cdda=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
*)
-@@ -39764,8 +42991,8 @@
+ libwm_with_cdda=no
+@@ -39764,8 +42996,8 @@
fi
@@ -44221,7 +44524,7 @@
-@@ -39790,18 +43017,19 @@
+@@ -39790,18 +43022,19 @@
for ac_header in pthread.h pthread/mit/pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44249,7 +44552,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39812,24 +43040,36 @@
+@@ -39812,24 +43045,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44294,17 +44597,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39838,15 +43078,16 @@
+@@ -39838,15 +43083,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -44316,7 +44620,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39855,8 +43096,13 @@
+@@ -39855,8 +43101,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44332,7 +44636,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39880,9 +43126,10 @@
+@@ -39880,9 +43131,10 @@
ac_header_preproc=no
fi
@@ -44345,7 +44649,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39906,25 +43153,19 @@
+@@ -39906,25 +43158,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -44378,7 +44682,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39941,18 +43182,19 @@
+@@ -39941,18 +43187,19 @@
for ac_header in sys/soundcard.h soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44406,7 +44710,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39963,24 +43205,36 @@
+@@ -39963,24 +43210,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44451,17 +44755,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39989,15 +43243,16 @@
+@@ -39989,15 +43248,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -44473,7 +44778,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40006,8 +43261,13 @@
+@@ -40006,8 +43266,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44489,7 +44794,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40031,9 +43291,10 @@
+@@ -40031,9 +43296,10 @@
ac_header_preproc=no
fi
@@ -44502,7 +44807,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -40057,25 +43318,19 @@
+@@ -40057,25 +43323,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -44535,7 +44840,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -40089,8 +43344,8 @@
+@@ -40089,8 +43349,8 @@
@@ -44546,7 +44851,7 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40116,24 +43371,36 @@
+@@ -40116,24 +43376,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44591,7 +44896,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40159,24 +43426,36 @@
+@@ -40159,24 +43431,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44636,15 +44941,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40185,14 +43464,15 @@
+@@ -40185,14 +43469,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44654,7 +44960,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -40202,11 +43482,11 @@
+@@ -40202,11 +43487,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44670,7 +44976,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -40217,24 +43497,36 @@
+@@ -40217,24 +43502,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44715,17 +45021,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40253,7 +43545,9 @@
+@@ -40253,8 +43550,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40262,27 +43556,41 @@
+ /* confdefs.h. */
+@@ -40262,27 +43561,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44774,7 +45082,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40295,13 +43603,16 @@
+@@ -40295,13 +43608,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -44784,8 +45092,9 @@
+
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -44794,7 +45103,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -40325,8 +43636,8 @@
+@@ -40325,8 +43641,8 @@
@@ -44805,7 +45114,7 @@
if test "${ac_cv_c_attribute_aligned+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40348,24 +43659,36 @@
+@@ -40348,24 +43664,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44850,14 +45159,15 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40374,12 +43697,14 @@
+@@ -40374,12 +43702,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
@@ -44867,7 +45177,7 @@
if test x"$ac_cv_c_attribute_aligned" != x"0"; then
cat >>confdefs.h <<_ACEOF
-@@ -40402,8 +43727,8 @@
+@@ -40402,8 +43732,8 @@
LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
LIBS="$LIBS $LIB_XEXT -lX11 $X_EXTRA_LIBS"
@@ -44878,7 +45188,7 @@
x11_shared_mem=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40427,24 +43752,36 @@
+@@ -40427,24 +43757,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44923,22 +45233,23 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40455,10 +43792,12 @@
+@@ -40455,10 +43797,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $x11_shared_mem" >&5
-echo "${ECHO_T}$x11_shared_mem" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $x11_shared_mem" >&5
+echo "${ECHO_T}$x11_shared_mem" >&6; }
if test x$x11_shared_mem = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40468,8 +43807,8 @@
+@@ -40468,8 +43812,8 @@
fi
@@ -44949,7 +45260,7 @@
x11_dga2=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40491,24 +43830,36 @@
+@@ -40491,24 +43835,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44994,22 +45305,23 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40519,10 +43870,12 @@
+@@ -40519,10 +43875,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $x11_dga2" >&5
-echo "${ECHO_T}$x11_dga2" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $x11_dga2" >&5
+echo "${ECHO_T}$x11_dga2" >&6; }
if test x$x11_dga2 = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40532,8 +43885,8 @@
+@@ -40532,8 +43890,8 @@
DGALIBS="-lXxf86dga"
fi
@@ -45020,7 +45332,7 @@
x11_xv=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40555,24 +43908,36 @@
+@@ -40555,24 +43913,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45065,22 +45377,23 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40583,10 +43948,12 @@
+@@ -40583,10 +43953,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $x11_xv" >&5
-echo "${ECHO_T}$x11_xv" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $x11_xv" >&5
+echo "${ECHO_T}$x11_xv" >&6; }
if test x$x11_xv = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40596,8 +43963,8 @@
+@@ -40596,8 +43968,8 @@
XVLIBS="-lXv"
fi
@@ -45091,7 +45404,7 @@
x11_xvidmode=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40619,24 +43986,36 @@
+@@ -40619,24 +43991,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45136,22 +45449,23 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40647,10 +44026,12 @@
+@@ -40647,10 +44031,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $x11_xvidmode" >&5
-echo "${ECHO_T}$x11_xvidmode" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $x11_xvidmode" >&5
+echo "${ECHO_T}$x11_xvidmode" >&6; }
if test x$x11_xvidmode = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40674,22 +44055,14 @@
+@@ -40674,22 +44060,14 @@
LDFLAGS="$mpg_save_LDFLAGS"
CPPFLAGS="$mpg_save_CPPFLAGS"
@@ -45178,7 +45492,7 @@
-@@ -40714,8 +44087,8 @@
+@@ -40714,8 +44092,8 @@
kde_mpeglib_compiles=yes
;;
*)
@@ -45189,7 +45503,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
;;
esac
-@@ -40730,8 +44103,8 @@
+@@ -40730,8 +44108,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -45200,7 +45514,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -40742,9 +44115,9 @@
+@@ -40742,9 +44120,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -45213,7 +45527,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -40756,40 +44129,52 @@
+@@ -40756,40 +44134,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45278,15 +45592,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40798,14 +44183,16 @@
+@@ -40798,14 +44188,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ eval "$as_ac_Lib=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45298,7 +45613,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -40818,8 +44205,8 @@
+@@ -40818,8 +44210,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -45309,7 +45624,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40832,40 +44219,52 @@
+@@ -40832,40 +44224,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45374,15 +45689,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40874,14 +44273,15 @@
+@@ -40874,14 +44278,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45393,7 +45709,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -40889,8 +44289,8 @@
+@@ -40889,8 +44294,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -45404,7 +45720,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -40909,39 +44309,52 @@
+@@ -40909,40 +44314,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45465,11 +45781,13 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
-@@ -40955,8 +44368,8 @@
+ fi
+@@ -40955,8 +44373,8 @@
case "$OS_TYPE" in
AIX)
@@ -45480,7 +45798,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_AIX 1
-@@ -40991,8 +44404,8 @@
+@@ -40991,8 +44409,8 @@
;;
NetBSD)
@@ -45491,7 +45809,7 @@
OS_TYPE="BSD"
cat >>confdefs.h <<\_ACEOF
-@@ -41011,8 +44424,8 @@
+@@ -41011,8 +44429,8 @@
;;
IRIX)
@@ -45502,7 +45820,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_IRIX 1
-@@ -41021,8 +44434,8 @@
+@@ -41021,8 +44439,8 @@
;;
HPUX)
@@ -45513,7 +45831,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_HPUX 1
-@@ -41031,8 +44444,8 @@
+@@ -41031,8 +44449,8 @@
;;
*)
@@ -45524,7 +45842,7 @@
;;
esac
-@@ -41183,9 +44596,9 @@
+@@ -41183,9 +44601,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -45537,7 +45855,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41207,24 +44620,36 @@
+@@ -41207,24 +44625,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45582,15 +45900,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41233,12 +44658,14 @@
+@@ -41233,12 +44663,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -45600,7 +45919,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -41250,13 +44677,12 @@
+@@ -41250,13 +44682,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -45616,68 +45935,14 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41264,126 +44690,99 @@
+@@ -41264,126 +44695,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 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_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -45743,23 +46008,77 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
+- ac_cv_search_opendir="none required"
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-- done
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in dir; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 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_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -45794,68 +46113,14 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41391,122 +44790,96 @@
+@@ -41391,122 +44795,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 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_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
++ builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
@@ -45921,23 +46186,77 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
+- ac_cv_search_opendir="none required"
+ ac_cv_search_opendir=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-fi
+-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-- done
+-if test "$ac_cv_search_opendir" = no; then
+- for ac_lib in x; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 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_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+
++rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- done
+done
+if test "${ac_cv_search_opendir+set}" = set; then
+ :
@@ -45968,7 +46287,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41530,24 +44903,36 @@
+@@ -41530,24 +44908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46013,18 +46332,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41556,8 +44941,9 @@
+@@ -41556,9 +44946,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
-@@ -41614,6 +45000,7 @@
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -41614,6 +45005,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -46032,7 +46353,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -41633,18 +45020,27 @@
+@@ -41633,18 +45025,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -46066,7 +46387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41657,12 +45053,14 @@
+@@ -41657,12 +45058,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -46084,7 +46405,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41671,8 +45069,8 @@
+@@ -41671,8 +45074,8 @@
fi
@@ -46095,7 +46416,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41696,24 +45094,36 @@
+@@ -41696,24 +45099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46140,15 +46461,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41722,12 +45132,13 @@
+@@ -41722,12 +45137,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -46157,7 +46479,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41744,18 +45155,19 @@
+@@ -41744,18 +45160,19 @@
for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -46185,7 +46507,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41766,24 +45178,36 @@
+@@ -41766,24 +45183,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -46230,17 +46552,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41792,15 +45216,16 @@
+@@ -41792,15 +45221,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -46252,7 +46575,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41809,8 +45234,13 @@
+@@ -41809,8 +45239,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -46268,7 +46591,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -41834,9 +45264,10 @@
+@@ -41834,9 +45269,10 @@
ac_header_preproc=no
fi
@@ -46281,7 +46604,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -41860,25 +45291,19 @@
+@@ -41860,25 +45296,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -46314,7 +46637,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41894,9 +45319,9 @@
+@@ -41894,9 +45324,9 @@
for ac_func in usleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -46327,7 +46650,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41922,53 +45347,59 @@
+@@ -41922,53 +45352,59 @@
#undef $ac_func
@@ -46406,15 +46729,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41977,13 +45408,15 @@
+@@ -41977,13 +45413,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -46425,7 +46749,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42011,11 +45444,10 @@
+@@ -42011,11 +45449,10 @@
@@ -46440,7 +46764,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42046,30 +45478,42 @@
+@@ -42046,30 +45483,42 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46493,7 +46817,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_XSHMGETEVENTBASE 1
-@@ -42081,11 +45525,12 @@
+@@ -42081,12 +45530,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46504,11 +46828,13 @@
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -42103,8 +45548,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -42103,8 +45553,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -46519,7 +46845,7 @@
if test "${ac_cv_lib_xine__x_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42117,40 +45562,52 @@
+@@ -42117,40 +45567,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46584,15 +46910,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42159,14 +45616,15 @@
+@@ -42159,14 +45621,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_xine__x_ao_new_port=no
+ ac_cv_lib_xine__x_ao_new_port=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -46603,7 +46930,7 @@
if test $ac_cv_lib_xine__x_ao_new_port = yes; then
:
else
-@@ -42181,8 +45639,8 @@
+@@ -42181,8 +45644,8 @@
LDFLAGS="$kde_save_LDFLAGS"
LIBS="$kde_save_LIBS"
@@ -46614,7 +46941,7 @@
if test "${ac_cv_func_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42209,53 +45667,59 @@
+@@ -42209,53 +45672,59 @@
#undef ao_new_port
@@ -46693,15 +47020,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42264,49 +45728,50 @@
+@@ -42264,49 +45733,50 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_ao_new_port=no
+ ac_cv_func_ao_new_port=no
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_ao_new_port" >&5
@@ -46763,7 +47091,7 @@
if test x$xine_config_exec_prefix != x ; then
xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix"
-@@ -42323,13 +45788,13 @@
+@@ -42323,13 +45793,13 @@
min_xine_version=1.0.0
if test "x$enable_xinetest" != "xyes" ; then
@@ -46781,7 +47109,7 @@
if test "${ac_cv_path_XINE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42344,30 +45809,31 @@
+@@ -42344,30 +45814,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -46821,7 +47149,7 @@
no_xine=""
if test "$XINE_CONFIG" = "no" ; then
no_xine=yes
-@@ -42388,7 +45854,6 @@
+@@ -42388,7 +45859,6 @@
CFLAGS="$CFLAGS $XINE_CFLAGS $all_includes"
LIBS="$XINE_LIBS $LIBS $all_libraries"
@@ -46829,7 +47157,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -42473,13 +45938,22 @@
+@@ -42473,13 +45943,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -46856,7 +47184,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42492,19 +45966,21 @@
+@@ -42492,19 +45971,21 @@
( exit $ac_status )
no_xine=yes
fi
@@ -46883,7 +47211,7 @@
if test "$XINE_CONFIG" = "no" ; then
echo "*** The xine-config script installed by XINE could not be found"
echo "*** If XINE was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -42536,24 +46012,36 @@
+@@ -42536,24 +46017,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46928,7 +47256,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42571,11 +46059,12 @@
+@@ -42571,12 +46064,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46938,11 +47266,13 @@
echo "*** or that you have moved XINE since it was installed. In the latter case, you"
echo "*** may want to edit the xine-config script: $XINE_CONFIG"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
-@@ -42602,9 +46091,9 @@
+ LIBS="$ac_save_LIBS"
+@@ -42602,9 +46096,9 @@
for ac_func in strsep strpbrk setenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -46955,7 +47285,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42630,53 +46119,59 @@
+@@ -42630,53 +46124,59 @@
#undef $ac_func
@@ -47034,15 +47364,16 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42685,13 +46180,15 @@
+@@ -42685,13 +46185,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
+-rm -f conftest.err conftest.$ac_objext \
+
- rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -47053,7 +47384,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42733,8 +46230,8 @@
+@@ -42733,8 +46235,8 @@
fi
for i in $ac_topsubdirs; do
@@ -47064,7 +47395,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -42745,8 +46242,8 @@
+@@ -42745,8 +46247,8 @@
else
install_it="no"
fi
@@ -47075,7 +47406,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -42968,331 +46465,331 @@
+@@ -42968,331 +46470,331 @@
mpeglib_artsplug_SUBDIR_included_FALSE=
fi
@@ -47570,7 +47901,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -43312,39 +46809,58 @@
+@@ -43312,39 +46814,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -47645,7 +47976,7 @@
fi
fi
rm -f confcache
-@@ -43353,38 +46869,31 @@
+@@ -43353,38 +46874,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -47697,7 +48028,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
-@@ -43717,11 +47226,35 @@
+@@ -43717,11 +47231,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -47735,7 +48066,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -43730,8 +47263,43 @@
+@@ -43730,8 +47268,43 @@
fi
@@ -47780,7 +48111,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -43745,18 +47313,19 @@
+@@ -43745,18 +47318,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -47803,7 +48134,7 @@
as_basename=basename
else
as_basename=false
-@@ -43764,159 +47333,120 @@
+@@ -43764,159 +47338,120 @@
# Name of the executable.
@@ -48034,7 +48365,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -43925,7 +47455,19 @@
+@@ -43925,7 +47460,19 @@
as_mkdir_p=false
fi
@@ -48055,7 +48386,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -43934,31 +47476,14 @@
+@@ -43934,31 +47481,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -48087,11 +48418,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.59e. Invocation command line was
++generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -43966,30 +47491,20 @@
+@@ -43966,30 +47496,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -48130,7 +48461,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -44016,19 +47531,21 @@
+@@ -44016,19 +47536,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -48142,7 +48473,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.59e,
++configured by $0, generated by GNU Autoconf 2.60,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -48158,7 +48489,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -44039,39 +47556,24 @@
+@@ -44039,39 +47561,24 @@
do
case $1 in
--*=*)
@@ -48204,7 +48535,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -44081,18 +47583,24 @@
+@@ -44081,18 +47588,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -48234,7 +48565,7 @@
esac
shift
-@@ -44108,201 +47616,213 @@
+@@ -44108,201 +47621,213 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -48622,7 +48953,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -44314,625 +47834,817 @@
+@@ -44314,625 +47839,817 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -50004,7 +50335,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -44940,248 +48652,129 @@
+@@ -44940,248 +48657,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -50063,6 +50394,7 @@
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -50353,7 +50685,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -45192,135 +48785,39 @@
+@@ -45192,135 +48791,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -50515,7 +50847,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -45330,18 +48827,29 @@
+@@ -45330,18 +48833,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -50553,7 +50885,7 @@
else
continue
fi
-@@ -45363,49 +48871,76 @@
+@@ -45363,49 +48877,76 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -50657,7 +50989,7 @@
if echo $TOPSUBDIRS | grep "kscd" > /dev/null 2> /dev/null; then
if test "$use_kscd_defaults" = "yes"; then
test -d kscd || mkdir kscd
-@@ -45416,11 +48951,10 @@
+@@ -45416,11 +48957,10 @@
fi
fi
;;
@@ -50675,7 +51007,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.5.3") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.5.4") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -66389,7 +66721,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -519,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -66398,7 +66730,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -557,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list