rev 4596 - trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Oct 4 23:50:11 UTC 2006
Author: chrsmrtn
Date: 2006-10-04 23:50:07 +0000 (Wed, 04 Oct 2006)
New Revision: 4596
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-10-04 23:44:51 UTC (rev 4595)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-10-04 23:50:07 UTC (rev 4596)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -119,7 +119,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -176,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -195,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -220,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -243,7 +243,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
# 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 \
@@ -252,7 +252,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
$2=yes
fi
fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
else
$2=yes
fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -292,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -369,7 +369,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.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,7 @@
# _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -467,7 +467,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -490,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
;;
beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -559,7 +559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
;;
esac
;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,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"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
dynamic_linker=no
;;
@@ -628,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +650,7 @@
esac
;;
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -662,7 +662,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -671,7 +671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -680,7 +680,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,26 @@
;;
# This must be Linux ELF.
@@ -736,7 +736,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,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -764,7 +764,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,13 @@
openbsd*)
version_type=sunos
@@ -779,7 +779,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
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,7 @@
os2*)
libname_spec='$name'
@@ -788,7 +788,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,7 @@
need_version=yes
;;
@@ -811,7 +811,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'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,29 @@
fi
;;
@@ -841,7 +841,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -863,7 +863,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
case $tagname in
CXX)
@@ -874,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -883,7 +883,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +892,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -901,7 +901,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
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,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,
@@ -910,7 +910,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'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +919,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -991,7 +991,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,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
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,27 @@
esac
;;
@@ -1057,7 +1057,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
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,22 @@
;;
openbsd*)
@@ -1093,7 +1093,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]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1176,7 +1176,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,7 @@
# AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1311,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
fi
;;
@@ -1362,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1427,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,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
@@ -1438,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,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.
@@ -1447,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1473,7 +1473,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1482,7 +1482,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`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1495,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,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.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1532,7 +1532,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,32 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
esac
;;
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +1591,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1725,7 +1725,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,14 @@
;;
esac
;;
@@ -1742,7 +1742,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,12 @@
# location of the library.
case $cc_basename in
@@ -1758,7 +1758,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,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.
@@ -1772,7 +1772,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1841,7 +1841,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,25 @@
;;
esac
;;
@@ -1889,7 +1889,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1922,7 +1922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1973,7 +1973,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
;;
mvs*)
case $cc_basename in
@@ -1982,7 +1982,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
;;
esac
;;
@@ -1991,7 +1991,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,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::"'
;;
@@ -2025,7 +2025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2043,7 +2043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2068,7 +2068,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2090,7 +2090,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2129,7 +2129,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,33 @@
;;
solaris*)
case $cc_basename in
@@ -2178,7 +2178,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2190,7 +2190,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2202,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2214,7 +2214,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
;;
esac
;;
@@ -2280,7 +2280,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,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.
@@ -2307,7 +2307,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,7 @@
fi
;;
@@ -2316,7 +2316,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,37 @@
$rm -f confest.$objext
@@ -2355,7 +2355,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2373,7 +2373,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2382,7 +2382,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2395,7 +2395,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2404,7 +2404,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2442,7 +2442,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
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2477,7 +2477,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2492,7 +2492,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 \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2528,7 +2528,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2538,7 +2538,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2547,7 +2547,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2565,7 +2565,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,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.
@@ -2577,7 +2577,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2587,7 +2587,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'"
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,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'"
;;
@@ -2620,7 +2620,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2651,7 +2651,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2660,7 +2660,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2692,7 +2692,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
@@ -2721,7 +2721,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,13 @@
;;
esac
;;
@@ -2736,7 +2736,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,26 @@
;;
esac
;;
@@ -2768,7 +2768,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,25 @@
;;
mvs*)
case $cc_basename in
@@ -2799,7 +2799,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
;;
psos*)
;;
@@ -2826,7 +2826,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2841,7 +2841,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2850,7 +2850,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
;;
esac
;;
@@ -2866,7 +2866,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2878,7 +2878,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2887,7 +2887,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2904,7 +2904,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2913,7 +2913,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2936,7 +2936,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2958,7 +2958,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2967,7 +2967,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,17 @@
fi
;;
@@ -2985,7 +2985,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2994,7 +2994,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,7 +3011,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
with_gnu_ld=no
fi
;;
@@ -3053,7 +3053,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3081,7 +3081,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3090,7 +3090,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3107,7 +3107,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3184,7 +3184,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3292,7 +3292,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3301,7 +3301,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`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3314,7 +3314,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3356,7 +3356,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3382,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3518,7 +3518,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$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
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3605,7 +3605,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3614,7 +3614,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3623,7 +3623,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3633,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3642,7 +3642,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3659,7 +3659,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$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'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3675,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3701,7 +3701,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,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.
@@ -3731,7 +3731,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
fi
;;
@@ -3798,7 +3798,7 @@
;;
uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3810,7 +3810,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,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
@@ -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.60.
++# Generated by GNU Autoconf 2.60a.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -7078,23 +7078,57 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,413 @@
+@@ -430,42 +720,438 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
#endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs include_akode_mpeg_TRUE include_akode_mpeg_FALSE include_akode_mpc_TRUE include_akode_mpc_FALSE include_akode_xiph_TRUE include_akode_xiph_FALSE include_akode_ffmpeg_TRUE include_akode_ffmpeg_FALSE LIB_ARTS ARTS_CFLAGS MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs LIB_ARTS ARTS_CFLAGS MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS include_akode_mpeg_TRUE include_akode_mpeg_FALSE include_akode_mpc_TRUE include_akode_mpc_FALSE include_akode_xiph_TRUE include_akode_xiph_FALSE include_akode_ffmpeg_TRUE include_akode_ffmpeg_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
@@ -7363,14 +7397,6 @@
+AKODE_CONFIG
+akode_includes
+akode_libs
-+include_akode_mpeg_TRUE
-+include_akode_mpeg_FALSE
-+include_akode_mpc_TRUE
-+include_akode_mpc_FALSE
-+include_akode_xiph_TRUE
-+include_akode_xiph_FALSE
-+include_akode_ffmpeg_TRUE
-+include_akode_ffmpeg_FALSE
+LIB_ARTS
+ARTS_CFLAGS
+MPEGLIB_ARTS_MAJOR_VERSION
@@ -7380,6 +7406,14 @@
+kde_artsplug_compiles
+ARTSC_INCLUDE
+ARTSC_LIBS
++include_akode_mpeg_TRUE
++include_akode_mpeg_FALSE
++include_akode_mpc_TRUE
++include_akode_mpc_FALSE
++include_akode_xiph_TRUE
++include_akode_xiph_FALSE
++include_akode_ffmpeg_TRUE
++include_akode_ffmpeg_FALSE
+arts_datadir
+arts_includes
+arts_libraries
@@ -7696,9 +7730,15 @@
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
- eval ac_val=$`echo $ac_var`
-- case $ac_val in
++ eval ac_val=\$$ac_var
+ case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -7708,15 +7748,9 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -8123,7 +8157,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -8142,7 +8176,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -9030,9 +9064,9 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2290,16 +3064,16 @@
+@@ -2289,16 +3063,16 @@
+ fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
- echo "$as_me:$LINENO: checking where to install" >&5
-echo $ECHO_N "checking where to install... $ECHO_C" >&6
@@ -9053,7 +9087,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2312,13 +3086,13 @@
+@@ -2311,13 +3085,13 @@
@@ -9071,7 +9105,7 @@
val=
-@@ -2335,11 +3109,11 @@
+@@ -2334,11 +3108,11 @@
@@ -9085,7 +9119,7 @@
am_make=${MAKE-make}
-@@ -2349,8 +3123,8 @@
+@@ -2348,8 +3122,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -9096,7 +9130,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2377,15 +3151,15 @@
+@@ -2376,15 +3150,15 @@
fi
@@ -9117,7 +9151,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2405,10 +3179,9 @@
+@@ -2404,10 +3178,9 @@
@@ -9130,15 +9164,15 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2428,18 +3201,18 @@
+@@ -2427,18 +3200,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
-fi;
+fi
++
- # Check whether --enable-dummyoption or --disable-dummyoption was given.
-+
+ # Check whether --enable-dummyoption was given.
if test "${enable_dummyoption+set}" = set; then
- enableval="$enable_dummyoption"
@@ -9156,7 +9190,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2448,12 +3221,12 @@
+@@ -2447,12 +3220,12 @@
else
kde_use_strict_options="no"
@@ -9173,7 +9207,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2462,20 +3235,21 @@
+@@ -2461,20 +3234,21 @@
else
kde_use_warnings="yes"
@@ -9200,7 +9234,7 @@
CFLAGS=" $CFLAGS"
-@@ -2487,8 +3261,8 @@
+@@ -2486,8 +3260,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -9211,7 +9245,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2501,32 +3275,34 @@
+@@ -2500,32 +3274,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9253,7 +9287,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2539,36 +3315,51 @@
+@@ -2538,36 +3314,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9315,7 +9349,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2581,74 +3372,34 @@
+@@ -2580,74 +3371,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9399,7 +9433,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2662,7 +3413,7 @@
+@@ -2661,7 +3412,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9408,7 +9442,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2673,6 +3424,7 @@
+@@ -2672,6 +3423,7 @@
fi
done
done
@@ -9416,7 +9450,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2690,22 +3442,23 @@
+@@ -2689,22 +3441,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -9447,7 +9481,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2718,36 +3471,38 @@
+@@ -2717,36 +3470,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9494,7 +9528,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2760,29 +3515,45 @@
+@@ -2759,29 +3514,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9546,7 +9580,7 @@
fi
fi
-@@ -2795,21 +3566,35 @@
+@@ -2794,21 +3565,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -9590,7 +9624,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2834,46 +3619,70 @@
+@@ -2833,47 +3618,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -9644,7 +9678,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -9681,16 +9715,21 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2886,19 +3695,23 @@
+
+@@ -2885,19 +3700,21 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
@@ -9714,7 +9753,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2917,22 +3730,27 @@
+@@ -2916,22 +3733,27 @@
fi
fi
fi
@@ -9754,7 +9793,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2943,9 +3761,8 @@
+@@ -2942,9 +3764,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -9765,7 +9804,7 @@
break;;
* ) break;;
esac
-@@ -2959,14 +3776,14 @@
+@@ -2958,14 +3779,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -9784,7 +9823,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2986,14 +3803,20 @@
+@@ -2985,14 +3806,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -9809,7 +9848,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3011,12 +3834,12 @@
+@@ -3010,12 +3837,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -9826,7 +9865,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3039,24 +3862,36 @@
+@@ -3038,24 +3865,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9871,7 +9910,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3065,24 +3900,28 @@
+@@ -3064,24 +3903,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9908,7 +9947,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3098,24 +3937,36 @@
+@@ -3097,24 +3940,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9953,7 +9992,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3124,285 +3975,278 @@
+@@ -3123,285 +3978,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10416,7 +10455,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3411,8 +4255,8 @@
+@@ -3410,8 +4258,8 @@
depcc="$CC" am_compiler_list=
@@ -10427,7 +10466,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3501,8 +4345,8 @@
+@@ -3500,8 +4348,8 @@
fi
fi
@@ -10438,7 +10477,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3524,8 +4368,8 @@
+@@ -3523,8 +4371,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
@@ -10449,7 +10488,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3559,8 +4403,13 @@
+@@ -3558,8 +4406,13 @@
#endif
Syntax error
_ACEOF
@@ -10465,7 +10504,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3585,9 +4434,10 @@
+@@ -3584,9 +4437,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10477,7 +10516,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3597,8 +4447,13 @@
+@@ -3596,8 +4450,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10493,7 +10532,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3625,6 +4480,7 @@
+@@ -3624,6 +4483,7 @@
ac_preproc_ok=:
break
fi
@@ -10501,7 +10540,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3642,8 +4498,8 @@
+@@ -3641,8 +4501,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -10512,7 +10551,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3666,8 +4522,13 @@
+@@ -3665,8 +4525,13 @@
#endif
Syntax error
_ACEOF
@@ -10528,7 +10567,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3692,9 +4553,10 @@
+@@ -3691,9 +4556,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10540,7 +10579,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3704,8 +4566,13 @@
+@@ -3703,8 +4569,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10556,7 +10595,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3732,6 +4599,7 @@
+@@ -3731,6 +4602,7 @@
ac_preproc_ok=:
break
fi
@@ -10564,7 +10603,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3782,18 +4650,22 @@
+@@ -3781,18 +4653,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -10592,7 +10631,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3806,36 +4678,38 @@
+@@ -3805,36 +4681,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10639,7 +10678,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3848,55 +4722,85 @@
+@@ -3847,55 +4725,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10743,7 +10782,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3919,24 +4823,36 @@
+@@ -3918,24 +4826,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -10788,7 +10827,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3945,24 +4861,28 @@
+@@ -3944,24 +4864,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10825,7 +10864,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3978,24 +4898,36 @@
+@@ -3977,24 +4901,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -10870,7 +10909,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4004,70 +4936,53 @@
+@@ -4003,70 +4939,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10965,7 +11004,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4076,61 +4991,91 @@
+@@ -4075,61 +4994,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11051,12 +11090,12 @@
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+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
@@ -11079,7 +11118,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4139,8 +5084,8 @@
+@@ -4138,8 +5087,8 @@
depcc="$CXX" am_compiler_list=
@@ -11090,7 +11129,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4229,8 +5174,8 @@
+@@ -4228,8 +5177,8 @@
fi
fi
@@ -11101,7 +11140,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4248,8 +5193,8 @@
+@@ -4247,8 +5196,8 @@
@@ -11112,7 +11151,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4274,24 +5219,36 @@
+@@ -4273,24 +5222,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11157,7 +11196,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4300,13 +5257,14 @@
+@@ -4299,13 +5260,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11176,7 +11215,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4348,17 +5306,16 @@
+@@ -4347,17 +5309,16 @@
fi
fi
@@ -11198,7 +11237,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 +5343,36 @@
+@@ -4385,24 +5346,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11243,7 +11282,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4412,8 +5381,10 @@
+@@ -4411,8 +5384,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11251,11 +11290,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4426,29 +5397,28 @@
+@@ -4425,29 +5400,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11293,7 +11332,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 +5445,36 @@
+@@ -4474,24 +5448,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11338,7 +11377,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4501,8 +5483,10 @@
+@@ -4500,8 +5486,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11346,11 +11385,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4515,13 +5499,13 @@
+@@ -4514,13 +5502,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11368,7 +11407,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4542,16 +5526,15 @@
+@@ -4541,16 +5529,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -11389,7 +11428,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 +5561,36 @@
+@@ -4577,24 +5564,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11434,7 +11473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4604,8 +5599,10 @@
+@@ -4603,8 +5602,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11442,11 +11481,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4618,16 +5615,16 @@
+@@ -4617,16 +5618,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11467,7 +11506,7 @@
:
fi
-@@ -4642,16 +5639,15 @@
+@@ -4641,16 +5642,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"
@@ -11488,7 +11527,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 +5674,36 @@
+@@ -4677,24 +5677,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11533,7 +11572,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4704,8 +5712,10 @@
+@@ -4703,8 +5715,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11541,11 +11580,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4718,27 +5728,26 @@
+@@ -4717,27 +5731,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11580,7 +11619,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4763,24 +5772,36 @@
+@@ -4762,24 +5775,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11625,7 +11664,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4789,8 +5810,10 @@
+@@ -4788,8 +5813,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11633,11 +11672,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4803,13 +5826,13 @@
+@@ -4802,13 +5829,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -11655,7 +11694,7 @@
:
fi
-@@ -4817,16 +5840,15 @@
+@@ -4816,16 +5843,15 @@
;;
esac
@@ -11676,7 +11715,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 +5875,36 @@
+@@ -4852,24 +5878,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11721,7 +11760,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4879,8 +5913,10 @@
+@@ -4878,8 +5916,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11729,11 +11768,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4893,28 +5929,27 @@
+@@ -4892,28 +5932,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11770,7 +11809,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 +5976,36 @@
+@@ -4940,24 +5979,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11815,7 +11854,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4967,8 +6014,10 @@
+@@ -4966,8 +6017,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11823,11 +11862,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4981,28 +6030,27 @@
+@@ -4980,28 +6033,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11864,7 +11903,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 +6077,36 @@
+@@ -5028,24 +6080,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11909,7 +11948,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5055,8 +6115,10 @@
+@@ -5054,8 +6118,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11917,11 +11956,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5069,13 +6131,13 @@
+@@ -5068,13 +6134,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11939,7 +11978,7 @@
:
fi
-@@ -5087,13 +6149,13 @@
+@@ -5086,13 +6152,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -11957,7 +11996,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5101,16 +6163,15 @@
+@@ -5100,16 +6166,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -11978,7 +12017,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 +6198,36 @@
+@@ -5136,24 +6201,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12023,7 +12062,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5163,8 +6236,10 @@
+@@ -5162,8 +6239,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12031,11 +12070,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5177,13 +6252,13 @@
+@@ -5176,13 +6255,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12053,7 +12092,7 @@
:
fi
-@@ -5195,16 +6270,15 @@
+@@ -5194,16 +6273,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -12074,7 +12113,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 +6305,36 @@
+@@ -5230,24 +6308,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12119,7 +12158,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5257,8 +6343,10 @@
+@@ -5256,8 +6346,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12127,11 +12166,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5271,28 +6359,27 @@
+@@ -5270,28 +6362,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12168,7 +12207,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 +6406,36 @@
+@@ -5318,24 +6409,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12213,7 +12252,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5345,8 +6444,10 @@
+@@ -5344,8 +6447,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12221,11 +12260,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5359,28 +6460,27 @@
+@@ -5358,28 +6463,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12262,7 +12301,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 +6507,36 @@
+@@ -5406,24 +6510,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12307,7 +12346,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5433,8 +6545,10 @@
+@@ -5432,8 +6548,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12315,11 +12354,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5447,28 +6561,27 @@
+@@ -5446,28 +6564,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12356,7 +12395,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 +6608,36 @@
+@@ -5494,24 +6611,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12401,7 +12440,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5521,8 +6646,10 @@
+@@ -5520,8 +6649,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12409,11 +12448,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5535,13 +6662,13 @@
+@@ -5534,13 +6665,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12431,7 +12470,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5549,37 +6676,37 @@
+@@ -5548,37 +6679,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -12483,7 +12522,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5611,24 +6738,36 @@
+@@ -5610,24 +6741,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12528,7 +12567,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5637,18 +6776,19 @@
+@@ -5636,18 +6779,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12538,7 +12577,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_cflags_save"
@@ -12552,7 +12591,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5668,16 +6808,15 @@
+@@ -5667,16 +6811,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -12573,7 +12612,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 +6843,36 @@
+@@ -5703,24 +6846,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12618,7 +12657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5730,8 +6881,10 @@
+@@ -5729,8 +6884,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12626,11 +12665,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5744,29 +6897,28 @@
+@@ -5743,29 +6900,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12668,7 +12707,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 +6945,36 @@
+@@ -5792,24 +6948,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12713,7 +12752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5819,8 +6983,10 @@
+@@ -5818,8 +6986,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12721,11 +12760,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5833,28 +6999,27 @@
+@@ -5832,28 +7002,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12762,7 +12801,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 +7046,36 @@
+@@ -5880,24 +7049,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12807,7 +12846,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5907,8 +7084,10 @@
+@@ -5906,8 +7087,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12815,11 +12854,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5921,28 +7100,27 @@
+@@ -5920,28 +7103,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12856,7 +12895,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 +7147,36 @@
+@@ -5968,24 +7150,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12901,7 +12940,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5995,8 +7185,10 @@
+@@ -5994,8 +7188,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12909,11 +12948,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6009,28 +7201,27 @@
+@@ -6008,28 +7204,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12950,7 +12989,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 +7248,36 @@
+@@ -6056,24 +7251,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12995,7 +13034,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6083,8 +7286,10 @@
+@@ -6082,8 +7289,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13003,11 +13042,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6097,28 +7302,27 @@
+@@ -6096,28 +7305,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13044,7 +13083,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 +7349,36 @@
+@@ -6144,24 +7352,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13089,7 +13128,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6171,8 +7387,10 @@
+@@ -6170,8 +7390,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13097,11 +13136,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6185,13 +7403,13 @@
+@@ -6184,13 +7406,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13119,7 +13158,7 @@
:
fi
-@@ -6298,13 +7516,13 @@
+@@ -6297,13 +7519,13 @@
fi
@@ -13136,7 +13175,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6334,8 +7552,13 @@
+@@ -6333,8 +7555,13 @@
#endif
Syntax error
_ACEOF
@@ -13152,7 +13191,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6360,9 +7583,10 @@
+@@ -6359,9 +7586,10 @@
# Broken: fails on valid input.
continue
fi
@@ -13164,7 +13203,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6372,8 +7596,13 @@
+@@ -6371,8 +7599,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -13180,7 +13219,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6400,6 +7629,7 @@
+@@ -6399,6 +7632,7 @@
ac_preproc_ok=:
break
fi
@@ -13188,7 +13227,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6417,8 +7647,8 @@
+@@ -6416,8 +7650,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -13199,7 +13238,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6441,8 +7671,13 @@
+@@ -6440,8 +7674,13 @@
#endif
Syntax error
_ACEOF
@@ -13215,7 +13254,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6467,9 +7702,10 @@
+@@ -6466,9 +7705,10 @@
# Broken: fails on valid input.
continue
fi
@@ -13227,7 +13266,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6479,8 +7715,13 @@
+@@ -6478,8 +7718,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -13243,7 +13282,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6507,6 +7748,7 @@
+@@ -6506,6 +7751,7 @@
ac_preproc_ok=:
break
fi
@@ -13251,7 +13290,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6533,16 +7775,15 @@
+@@ -6532,16 +7778,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -13272,7 +13311,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 +7810,36 @@
+@@ -6568,24 +7813,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13317,7 +13356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6595,8 +7848,10 @@
+@@ -6594,8 +7851,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13325,11 +13364,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6609,22 +7864,21 @@
+@@ -6608,22 +7867,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13358,12 +13397,13 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6640,36 +7894,36 @@
+@@ -6639,36 +7897,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
-fi;
+fi
++
@@ -13371,7 +13411,6 @@
- # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
-+
+ # Check whether --enable-new_ldflags was given.
if test "${enable_new_ldflags+set}" = set; then
- enableval="$enable_new_ldflags"
@@ -13405,7 +13444,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 +7950,36 @@
+@@ -6695,24 +7953,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13450,7 +13489,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6722,8 +7988,10 @@
+@@ -6721,8 +7991,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13458,11 +13497,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6736,29 +8004,28 @@
+@@ -6735,29 +8007,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13500,7 +13539,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 +8052,36 @@
+@@ -6784,24 +8055,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13545,7 +13584,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6811,8 +8090,10 @@
+@@ -6810,8 +8093,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13553,11 +13592,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6825,13 +8106,13 @@
+@@ -6824,13 +8109,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -13575,7 +13614,7 @@
:
fi
-@@ -6841,13 +8122,13 @@
+@@ -6840,13 +8125,13 @@
@@ -13593,7 +13632,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6860,13 +8141,13 @@
+@@ -6859,13 +8144,13 @@
@@ -13611,7 +13650,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6877,272 +8158,93 @@
+@@ -6876,270 +8161,91 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -13624,9 +13663,25 @@
-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
++
++
++
++
++ # 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
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -13635,12 +13690,6 @@
-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"
@@ -13651,13 +13700,6 @@
-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 ()
@@ -13694,7 +13736,28 @@
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--fi
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then
++ enableval=$enable_shared; p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=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_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_shared=yes
+ fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
@@ -13705,43 +13768,43 @@
-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
-- :
-
--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
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+ enableval=$enable_shared; p=${PACKAGE-default}
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then
++ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
+ *)
-+ enable_shared=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_shared=yes
++ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
- else
-+ enable_shared=yes
-+fi
++else
++ enable_static=no
+ 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
+- :
--
+-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'
@@ -13830,33 +13893,11 @@
- ;;
- 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"
@@ -13929,23 +13970,21 @@
-
-
-
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
- # Check whether --enable-libsuffix or --disable-libsuffix was given.
+ # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+ kdelibsuff="auto"
-fi;
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
+fi
+
if test "$kdelibsuff" = "auto"; then
-@@ -7163,8 +8265,8 @@
+@@ -7160,8 +8266,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -13956,7 +13995,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7180,14 +8282,13 @@
+@@ -7177,14 +8283,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -13975,22 +14014,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7206,10 +8307,11 @@
+@@ -7203,10 +8308,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7233,7 +8335,7 @@
+@@ -7230,7 +8336,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
@@ -13999,7 +14038,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7262,37 +8364,184 @@
+@@ -7259,37 +8365,184 @@
fi
SED=$lt_cv_path_SED
@@ -14075,10 +14114,7 @@
+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
@@ -14089,7 +14125,10 @@
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
@@ -14166,14 +14205,14 @@
+
+else
+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
++
++
++ fi
++fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
@@ -14201,7 +14240,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7321,11 +8570,11 @@
+@@ -7318,11 +8571,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14217,7 +14256,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7338,7 +8587,7 @@
+@@ -7335,7 +8588,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,
@@ -14226,7 +14265,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 +8607,21 @@
+@@ -7355,21 +8608,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14255,7 +14294,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7382,29 +8631,38 @@
+@@ -7379,29 +8632,38 @@
;;
esac
fi
@@ -14302,7 +14341,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7412,56 +8670,63 @@
+@@ -7409,56 +8671,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -14400,7 +14439,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7488,44 +8753,36 @@
+@@ -7485,44 +8754,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -14455,7 +14494,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7541,7 +8798,7 @@
+@@ -7538,7 +8799,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -14464,7 +14503,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 +8814,27 @@
+@@ -7554,43 +8815,27 @@
esac
;;
@@ -14521,7 +14560,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 +8853,22 @@
+@@ -7609,32 +8854,22 @@
;;
openbsd*)
@@ -14557,7 +14596,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 +8889,20 @@
+@@ -7655,17 +8890,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -14581,7 +14620,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 +8911,17 @@
+@@ -7674,14 +8912,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14602,16 +14641,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 +8948,7 @@
+@@ -7708,7 +8949,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7714 "configure"' > conftest.$ac_ext
-+ echo '#line 8951 "configure"' > conftest.$ac_ext
+- echo '#line 7711 "configure"' > conftest.$ac_ext
++ echo '#line 8952 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7754,14 +8991,13 @@
+@@ -7751,14 +8992,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -14628,7 +14667,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7773,7 +9009,6 @@
+@@ -7770,7 +9010,6 @@
esac
;;
*64-bit*)
@@ -14636,7 +14675,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7798,8 +9033,8 @@
+@@ -7795,8 +9034,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -14647,7 +14686,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7825,24 +9060,36 @@
+@@ -7822,24 +9061,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14692,7 +14731,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7851,9 +9098,10 @@
+@@ -7848,9 +9099,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14701,11 +14740,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7862,13 +9110,33 @@
+@@ -7859,13 +9111,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -14741,7 +14780,7 @@
esac
-@@ -7876,8 +9144,8 @@
+@@ -7873,8 +9145,8 @@
@@ -14752,7 +14791,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7901,24 +9169,36 @@
+@@ -7898,24 +9170,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14797,7 +14836,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7927,9 +9207,10 @@
+@@ -7924,9 +9208,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14810,7 +14849,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7985,6 +9266,7 @@
+@@ -7982,6 +9267,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -14818,7 +14857,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8004,18 +9286,27 @@
+@@ -8001,18 +9287,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -14852,7 +14891,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8028,12 +9319,14 @@
+@@ -8025,12 +9320,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -14870,7 +14909,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8056,9 +9349,9 @@
+@@ -8053,9 +9350,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14883,7 +14922,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8072,24 +9365,36 @@
+@@ -8069,24 +9366,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -14928,7 +14967,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8098,12 +9403,14 @@
+@@ -8095,12 +9404,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14947,7 +14986,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 +9425,19 @@
+@@ -8115,18 +9426,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14975,7 +15014,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8140,24 +9448,36 @@
+@@ -8137,24 +9449,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -15020,7 +15059,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8166,15 +9486,16 @@
+@@ -8163,15 +9487,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15043,7 +15082,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8183,8 +9504,13 @@
+@@ -8180,8 +9505,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -15059,7 +15098,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8208,9 +9534,10 @@
+@@ -8205,9 +9535,10 @@
ac_header_preproc=no
fi
@@ -15072,7 +15111,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8234,25 +9561,19 @@
+@@ -8231,25 +9562,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;}
@@ -15105,7 +15144,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8264,221 +9585,540 @@
+@@ -8261,220 +9586,539 @@
done
@@ -15218,7 +15257,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8359:" \
+-echo "$as_me:8356:" \
- "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
@@ -15406,6 +15445,10 @@
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
+-if test "$ac_test_FFLAGS" = set; then
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -15413,11 +15456,7 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
- 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
++fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
@@ -15824,11 +15863,10 @@
+{ 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
+ FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
-@@ -8505,13 +10145,13 @@
+@@ -8502,13 +10146,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -15845,7 +15883,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8540,20 +10180,70 @@
+@@ -8537,20 +10181,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -15922,7 +15960,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 +10254,19 @@
+@@ -8561,19 +10255,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -15948,7 +15986,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8590,9 +10280,6 @@
+@@ -8587,9 +10281,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -15958,7 +15996,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 +10301,30 @@
+@@ -8611,14 +10302,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'"
;;
@@ -15991,7 +16029,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8639,14 +10342,17 @@
+@@ -8636,14 +10343,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -16011,7 +16049,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8764,15 +10470,15 @@
+@@ -8761,15 +10471,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
@@ -16033,7 +16071,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8786,8 +10492,8 @@
+@@ -8783,8 +10493,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -16044,7 +16082,7 @@
objdir=$lt_cv_objdir
-@@ -8808,7 +10514,7 @@
+@@ -8805,7 +10515,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -16053,7 +16091,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8828,7 +10534,7 @@
+@@ -8825,7 +10535,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -16062,7 +16100,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8838,8 +10544,8 @@
+@@ -8835,8 +10545,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
@@ -16073,7 +16111,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8852,32 +10558,34 @@
+@@ -8849,32 +10559,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16115,7 +16153,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8890,27 +10598,41 @@
+@@ -8887,27 +10599,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16164,7 +16202,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8918,8 +10640,8 @@
+@@ -8915,8 +10641,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
@@ -16175,7 +16213,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8932,32 +10654,34 @@
+@@ -8929,32 +10655,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16217,7 +16255,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8970,27 +10694,41 @@
+@@ -8967,27 +10695,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16266,7 +16304,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8998,8 +10736,8 @@
+@@ -8995,8 +10737,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
@@ -16277,7 +16315,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9012,32 +10750,34 @@
+@@ -9009,32 +10751,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16319,7 +16357,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9050,27 +10790,41 @@
+@@ -9047,27 +10791,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16368,7 +16406,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9085,6 +10839,7 @@
+@@ -9082,6 +10840,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -16376,7 +16414,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9104,21 +10859,32 @@
+@@ -9101,21 +10860,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -16413,7 +16451,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9138,7 +10904,7 @@
+@@ -9135,7 +10905,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -16422,7 +16460,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 +10936,17 @@
+@@ -9167,17 +10937,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16446,7 +16484,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9200,7 +10966,7 @@
+@@ -9197,7 +10967,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -16455,7 +16493,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 +10998,11 @@
+@@ -9229,11 +10999,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16471,7 +16509,7 @@
fi
else
-@@ -9251,21 +11017,21 @@
+@@ -9248,21 +11018,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -16500,7 +16538,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9295,68 +11061,25 @@
+@@ -9292,68 +11062,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -16584,7 +16622,7 @@
## CAVEAT EMPTOR:
-@@ -9370,8 +11093,8 @@
+@@ -9367,8 +11094,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -16595,7 +16633,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9385,26 +11108,28 @@
+@@ -9382,26 +11109,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 \
@@ -16603,13 +16641,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9391: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11114: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9388: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11115: $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:11118: \$? = $ac_status" >&5
+- echo "$as_me:9392: \$? = $ac_status" >&5
++ echo "$as_me:11119: \$? = $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
@@ -16631,7 +16669,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 +11143,8 @@
+@@ -9415,8 +11144,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -16642,7 +16680,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9457,6 +11182,11 @@
+@@ -9454,6 +11183,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -16654,7 +16692,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9473,7 +11203,7 @@
+@@ -9470,7 +11204,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -16663,7 +16701,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9499,6 +11229,16 @@
+@@ -9496,6 +11230,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -16680,7 +16718,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9510,7 +11250,7 @@
+@@ -9507,7 +11251,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.
@@ -16689,7 +16727,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9533,13 +11273,20 @@
+@@ -9530,13 +11274,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16712,7 +16750,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9554,15 +11301,15 @@
+@@ -9551,15 +11302,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -16734,7 +16772,7 @@
;;
sunos4*)
-@@ -9571,7 +11318,7 @@
+@@ -9568,7 +11319,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16743,7 +16781,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9584,6 +11331,17 @@
+@@ -9581,6 +11332,17 @@
fi
;;
@@ -16761,7 +16799,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9595,16 +11353,16 @@
+@@ -9592,16 +11354,16 @@
esac
fi
@@ -16782,7 +16820,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9618,26 +11376,28 @@
+@@ -9615,26 +11377,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 \
@@ -16790,13 +16828,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9624: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11382: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9621: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11383: $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:11386: \$? = $ac_status" >&5
+- echo "$as_me:9625: \$? = $ac_status" >&5
++ echo "$as_me:11387: \$? = $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
@@ -16818,7 +16856,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9650,7 +11410,7 @@
+@@ -9647,7 +11411,7 @@
fi
fi
@@ -16827,7 +16865,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9660,8 +11420,50 @@
+@@ -9657,8 +11421,50 @@
;;
esac
@@ -16880,7 +16918,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9672,60 +11474,58 @@
+@@ -9669,60 +11475,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -16901,13 +16939,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9691: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11486: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9688: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11487: $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:11490: \$? = $ac_status" >&5
+- echo "$as_me:9692: \$? = $ac_status" >&5
++ echo "$as_me:11491: \$? = $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
@@ -16959,7 +16997,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 +11535,8 @@
+@@ -9732,8 +11536,8 @@
need_locks=no
fi
@@ -16970,7 +17008,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9774,6 +11574,16 @@
+@@ -9771,6 +11575,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -16987,7 +17025,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9784,6 +11594,10 @@
+@@ -9781,6 +11595,10 @@
with_gnu_ld=no
fi
;;
@@ -16998,7 +17036,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9794,6 +11608,27 @@
+@@ -9791,6 +11609,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -17026,7 +17064,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9831,7 +11666,7 @@
+@@ -9828,7 +11667,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -17035,7 +17073,7 @@
else
ld_shlibs=no
fi
-@@ -9841,13 +11676,13 @@
+@@ -9838,13 +11677,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'
@@ -17052,7 +17090,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 +11691,70 @@
+@@ -9853,23 +11692,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17128,7 +17166,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9886,13 +11768,40 @@
+@@ -9883,13 +11769,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -17171,7 +17209,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9902,24 +11811,19 @@
+@@ -9899,24 +11812,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -17203,7 +17241,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9931,7 +11835,7 @@
+@@ -9928,7 +11836,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -17212,7 +17250,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9953,9 +11857,21 @@
+@@ -9950,9 +11858,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
@@ -17236,7 +17274,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9972,7 +11888,7 @@
+@@ -9969,7 +11889,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -17245,7 +17283,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 +11907,12 @@
+@@ -9988,8 +11908,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -17258,7 +17296,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10000,22 +11920,23 @@
+@@ -9997,22 +11921,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -17289,7 +17327,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10031,24 +11952,36 @@
+@@ -10028,24 +11953,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17334,7 +17372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10062,19 +11995,20 @@
+@@ -10059,19 +11996,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17342,7 +17380,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17360,7 +17398,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10093,24 +12027,36 @@
+@@ -10090,24 +12028,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17405,7 +17443,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10124,8 +12070,10 @@
+@@ -10121,8 +12071,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17413,11 +17451,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10134,13 +12082,11 @@
+@@ -10131,13 +12083,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -17434,7 +17472,7 @@
fi
fi
;;
-@@ -10153,7 +12099,7 @@
+@@ -10150,7 +12100,7 @@
ld_shlibs=no
;;
@@ -17443,7 +17481,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10163,13 +12109,13 @@
+@@ -10160,13 +12110,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -17460,7 +17498,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 +12125,52 @@
+@@ -10176,52 +12126,52 @@
;;
darwin* | rhapsody*)
@@ -17553,7 +17591,7 @@
fi
;;
-@@ -10258,8 +12204,8 @@
+@@ -10255,8 +12205,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17564,7 +17602,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10267,7 +12213,7 @@
+@@ -10264,7 +12214,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -17573,7 +17611,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 +12227,62 @@
+@@ -10278,47 +12228,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -17642,25 +17680,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=no
- hardcode_shlibpath_var=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=no
- hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
+- ;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10335,7 +12296,7 @@
+@@ -10332,7 +12297,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -17669,7 +17707,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 +12306,7 @@
+@@ -10342,7 +12307,7 @@
link_all_deplibs=yes
;;
@@ -17678,7 +17716,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 +12329,8 @@
+@@ -10365,7 +12330,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
@@ -17688,7 +17726,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10378,7 +12340,7 @@
+@@ -10375,7 +12341,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -17697,7 +17735,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10389,14 +12351,14 @@
+@@ -10386,14 +12352,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -17714,7 +17752,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 +12370,13 @@
+@@ -10405,13 +12371,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17730,7 +17768,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10422,21 +12384,15 @@
+@@ -10419,21 +12385,15 @@
hardcode_libdir_separator=:
;;
@@ -17756,7 +17794,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 +12401,18 @@
+@@ -10442,8 +12402,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -17777,7 +17815,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10455,7 +12421,7 @@
+@@ -10452,7 +12422,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.
@@ -17786,7 +17824,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10503,36 +12469,45 @@
+@@ -10500,36 +12470,45 @@
fi
;;
@@ -17853,7 +17891,7 @@
;;
uts4*)
-@@ -10547,15 +12522,10 @@
+@@ -10544,15 +12523,10 @@
esac
fi
@@ -17871,7 +17909,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10573,8 +12543,8 @@
+@@ -10570,8 +12544,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.
@@ -17882,7 +17920,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10588,6 +12558,7 @@
+@@ -10585,6 +12559,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -17890,7 +17928,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10610,20 +12581,20 @@
+@@ -10607,20 +12582,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -17916,7 +17954,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10633,7 +12604,20 @@
+@@ -10630,7 +12605,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17938,7 +17976,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10698,7 +12682,7 @@
+@@ -10695,7 +12683,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -17947,7 +17985,7 @@
;;
beos*)
-@@ -10707,7 +12691,7 @@
+@@ -10704,7 +12692,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -17956,7 +17994,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 +12707,7 @@
+@@ -10720,7 +12708,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -17965,7 +18003,7 @@
need_version=no
need_lib_prefix=no
-@@ -10735,7 +12719,8 @@
+@@ -10732,7 +12720,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -17975,7 +18013,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10765,7 +12750,7 @@
+@@ -10762,7 +12751,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -17984,7 +18022,7 @@
;;
esac
;;
-@@ -10788,7 +12773,7 @@
+@@ -10785,7 +12774,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -17993,7 +18031,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 +12796,17 @@
+@@ -10808,20 +12797,17 @@
dynamic_linker=no
;;
@@ -18025,7 +18063,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10842,14 +12824,19 @@
+@@ -10839,14 +12825,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18047,7 +18085,7 @@
esac
;;
-@@ -10869,9 +12856,9 @@
+@@ -10866,9 +12857,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18059,7 +18097,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10886,7 +12873,7 @@
+@@ -10883,7 +12874,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18068,7 +18106,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10897,7 +12884,7 @@
+@@ -10894,7 +12885,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18077,7 +18115,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10909,6 +12896,18 @@
+@@ -10906,6 +12897,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18096,7 +18134,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10952,29 +12951,26 @@
+@@ -10949,29 +12952,26 @@
;;
# This must be Linux ELF.
@@ -18133,7 +18171,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 +12980,18 @@
+@@ -10981,6 +12981,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18152,7 +18190,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10993,7 +13001,7 @@
+@@ -10990,7 +13002,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18161,7 +18199,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11021,8 +13029,13 @@
+@@ -11018,8 +13030,13 @@
openbsd*)
version_type=sunos
@@ -18176,7 +18214,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 +13055,7 @@
+@@ -11039,7 +13056,7 @@
os2*)
libname_spec='$name'
@@ -18185,7 +18223,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11060,13 +13073,6 @@
+@@ -11057,13 +13074,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18199,7 +18237,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11092,7 +13098,7 @@
+@@ -11089,7 +13099,7 @@
need_version=yes
;;
@@ -18208,7 +18246,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 +13131,29 @@
+@@ -11122,6 +13132,29 @@
fi
;;
@@ -18238,7 +18276,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11136,16 +13165,21 @@
+@@ -11133,16 +13166,21 @@
dynamic_linker=no
;;
esac
@@ -18266,7 +18304,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11165,8 +13199,8 @@
+@@ -11162,8 +13200,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -18277,7 +18315,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11179,29 +13213,29 @@
+@@ -11176,29 +13214,29 @@
striplib=
old_striplib=
@@ -18317,7 +18355,7 @@
;;
esac
fi
-@@ -11233,8 +13267,8 @@
+@@ -11230,8 +13268,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -18328,7 +18366,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11247,40 +13281,52 @@
+@@ -11244,40 +13282,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18393,7 +18431,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11289,14 +13335,15 @@
+@@ -11286,14 +13336,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18402,7 +18440,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18413,7 +18451,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11310,8 +13357,8 @@
+@@ -11307,8 +13358,8 @@
;;
*)
@@ -18424,7 +18462,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11338,53 +13385,59 @@
+@@ -11335,53 +13386,59 @@
#undef shl_load
@@ -18503,7 +18541,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11393,18 +13446,19 @@
+@@ -11390,18 +13447,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18512,7 +18550,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -18529,7 +18567,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11417,40 +13471,52 @@
+@@ -11414,40 +13472,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18594,7 +18632,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11459,19 +13525,20 @@
+@@ -11456,19 +13526,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18603,7 +18641,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18621,7 +18659,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11498,53 +13565,59 @@
+@@ -11495,53 +13566,59 @@
#undef dlopen
@@ -18700,7 +18738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11553,18 +13626,19 @@
+@@ -11550,18 +13627,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18709,7 +18747,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -18726,7 +18764,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11577,40 +13651,52 @@
+@@ -11574,40 +13652,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18791,7 +18829,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11619,19 +13705,20 @@
+@@ -11616,19 +13706,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18800,7 +18838,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18818,7 +18856,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11644,40 +13731,52 @@
+@@ -11641,40 +13732,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18883,7 +18921,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11686,19 +13785,20 @@
+@@ -11683,19 +13786,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18892,7 +18930,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18910,7 +18948,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11711,40 +13811,52 @@
+@@ -11708,40 +13812,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18975,7 +19013,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11753,14 +13865,15 @@
+@@ -11750,14 +13866,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18984,7 +19022,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -18995,7 +19033,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11795,13 +13908,13 @@
+@@ -11792,13 +13909,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -19012,16 +19050,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11811,7 +13924,7 @@
+@@ -11808,7 +13925,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 13927 "configure"
+-#line 11811 "configure"
++#line 13928 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11868,6 +13981,8 @@
+@@ -11865,6 +13982,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -19030,7 +19068,7 @@
exit (status);
}
-@@ -11877,12 +13992,12 @@
+@@ -11874,12 +13993,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -19045,7 +19083,7 @@
esac
else :
# compilation failed
-@@ -11893,13 +14008,13 @@
+@@ -11890,13 +14009,13 @@
fi
@@ -19064,16 +19102,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11909,7 +14024,7 @@
+@@ -11906,7 +14025,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 14027 "configure"
+-#line 11909 "configure"
++#line 14028 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11966,6 +14081,8 @@
+@@ -11963,6 +14082,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -19082,7 +19120,7 @@
exit (status);
}
-@@ -11975,12 +14092,12 @@
+@@ -11972,12 +14093,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -19097,7 +19135,7 @@
esac
else :
# compilation failed
-@@ -11991,8 +14108,8 @@
+@@ -11988,8 +14109,8 @@
fi
@@ -19108,7 +19146,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12013,19 +14130,19 @@
+@@ -12010,19 +14131,19 @@
fi
@@ -19136,7 +19174,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12034,58 +14151,21 @@
+@@ -12031,58 +14152,21 @@
fi
;;
@@ -19202,7 +19240,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12100,7 +14180,8 @@
+@@ -12097,7 +14181,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.
@@ -19212,7 +19250,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 +14295,11 @@
+@@ -12211,11 +14296,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -19226,7 +19264,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12248,6 +14329,12 @@
+@@ -12245,6 +14330,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -19239,7 +19277,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12259,6 +14346,9 @@
+@@ -12256,6 +14347,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -19249,7 +19287,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12278,7 +14368,7 @@
+@@ -12275,7 +14369,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -19258,7 +19296,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12309,7 +14399,7 @@
+@@ -12306,7 +14400,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -19267,7 +19305,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12324,7 +14414,7 @@
+@@ -12321,7 +14415,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -19276,7 +19314,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12551,7 +14641,10 @@
+@@ -12548,7 +14642,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.
@@ -19288,7 +19326,7 @@
fi
-@@ -12564,11 +14657,11 @@
+@@ -12561,11 +14658,11 @@
CC="$lt_save_CC"
@@ -19304,7 +19342,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12586,6 +14679,9 @@
+@@ -12583,6 +14680,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -19314,7 +19352,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12616,8 +14712,10 @@
+@@ -12613,8 +14713,10 @@
case $tagname in
CXX)
@@ -19327,7 +19365,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 +14734,7 @@
+@@ -12633,6 +14735,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -19335,7 +19373,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12653,7 +14752,7 @@
+@@ -12650,7 +14753,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -19344,7 +19382,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12663,17 +14762,34 @@
+@@ -12660,17 +14763,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -19380,7 +19418,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12684,18 +14800,27 @@
+@@ -12681,18 +14801,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -19411,7 +19449,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12709,18 +14834,18 @@
+@@ -12706,18 +14835,18 @@
# Set up default GNU C++ configuration
@@ -19436,7 +19474,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12749,11 +14874,11 @@
+@@ -12746,11 +14875,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -19452,7 +19490,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12766,7 +14891,7 @@
+@@ -12763,7 +14892,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,
@@ -19461,7 +19499,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 +14911,21 @@
+@@ -12783,21 +14912,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -19490,7 +19528,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12810,8 +14935,8 @@
+@@ -12807,8 +14936,8 @@
;;
esac
fi
@@ -19501,7 +19539,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12819,8 +14944,8 @@
+@@ -12816,8 +14945,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
@@ -19512,7 +19550,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12846,7 +14971,7 @@
+@@ -12843,7 +14972,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.
@@ -19521,7 +19559,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12861,8 +14986,8 @@
+@@ -12858,8 +14987,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -19532,7 +19570,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12877,8 +15002,23 @@
+@@ -12874,8 +15003,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -19558,7 +19596,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12895,7 +15035,7 @@
+@@ -12892,7 +15036,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -19567,7 +19605,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 +15054,12 @@
+@@ -12911,8 +15055,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -19580,7 +19618,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12924,15 +15068,16 @@
+@@ -12921,15 +15069,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -19601,7 +19639,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 +15099,36 @@
+@@ -12951,24 +15100,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -19646,7 +19684,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12985,20 +15142,21 @@
+@@ -12982,20 +15143,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19654,7 +19692,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -19672,7 +19710,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13017,24 +15175,36 @@
+@@ -13014,24 +15176,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -19717,7 +19755,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13048,8 +15218,10 @@
+@@ -13045,8 +15219,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19725,11 +19763,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13058,16 +15230,26 @@
+@@ -13055,16 +15231,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -19761,7 +19799,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13081,12 +15263,12 @@
+@@ -13078,12 +15264,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'
@@ -19776,7 +19814,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 +15277,81 @@
+@@ -13092,70 +15278,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -19910,7 +19948,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13169,14 +15362,14 @@
+@@ -13166,14 +15363,14 @@
;;
esac
;;
@@ -19927,7 +19965,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13193,12 +15386,12 @@
+@@ -13190,12 +15387,12 @@
# location of the library.
case $cc_basename in
@@ -19943,7 +19981,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 +15400,11 @@
+@@ -13204,11 +15401,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.
@@ -19957,7 +19995,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13221,33 +15414,22 @@
+@@ -13218,33 +15415,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -19998,7 +20036,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13258,17 +15440,20 @@
+@@ -13255,17 +15441,20 @@
esac
case $cc_basename in
@@ -20025,7 +20063,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13284,12 +15469,15 @@
+@@ -13281,12 +15470,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -20045,7 +20083,7 @@
;;
esac
fi
-@@ -13300,11 +15488,25 @@
+@@ -13297,11 +15489,25 @@
;;
esac
;;
@@ -20073,7 +20111,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13315,9 +15517,9 @@
+@@ -13312,9 +15518,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -20085,7 +20123,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13326,16 +15528,16 @@
+@@ -13323,16 +15529,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -20106,7 +20144,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 +15555,44 @@
+@@ -13350,20 +15556,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -20157,7 +20195,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13394,7 +15620,7 @@
+@@ -13391,7 +15621,7 @@
;;
mvs*)
case $cc_basename in
@@ -20166,7 +20204,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13404,7 +15630,7 @@
+@@ -13401,7 +15631,7 @@
;;
esac
;;
@@ -20175,7 +20213,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 +15641,31 @@
+@@ -13412,15 +15642,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::"'
;;
@@ -20209,7 +20247,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13433,14 +15675,14 @@
+@@ -13430,14 +15676,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -20227,7 +20265,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,7 +15700,7 @@
+@@ -13455,7 +15701,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -20236,7 +20274,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13477,13 +15719,13 @@
+@@ -13474,13 +15720,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -20252,7 +20290,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13492,17 +15734,17 @@
+@@ -13489,17 +15735,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -20274,7 +20312,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13521,7 +15763,7 @@
+@@ -13518,7 +15764,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -20283,7 +20321,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13542,27 +15784,14 @@
+@@ -13539,27 +15785,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -20313,7 +20351,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13575,36 +15804,33 @@
+@@ -13572,36 +15805,33 @@
;;
solaris*)
case $cc_basename in
@@ -20362,7 +20400,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13612,9 +15838,9 @@
+@@ -13609,9 +15839,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -20374,7 +20412,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13624,9 +15850,9 @@
+@@ -13621,9 +15851,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
@@ -20386,7 +20424,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13635,9 +15861,9 @@
+@@ -13632,9 +15862,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -20398,7 +20436,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13650,12 +15876,63 @@
+@@ -13647,12 +15877,63 @@
;;
esac
;;
@@ -20464,7 +20502,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13675,8 +15952,8 @@
+@@ -13672,8 +15953,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -20475,7 +20513,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13712,7 +15989,7 @@
+@@ -13709,7 +15990,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.
@@ -20484,7 +20522,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13752,7 +16029,7 @@
+@@ -13749,7 +16030,7 @@
fi
;;
@@ -20493,7 +20531,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13788,6 +16065,29 @@
+@@ -13785,6 +16066,29 @@
$rm -f confest.$objext
@@ -20523,7 +20561,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13796,8 +16096,8 @@
+@@ -13793,8 +16097,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -20534,7 +20572,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13835,6 +16135,10 @@
+@@ -13832,6 +16136,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -20545,7 +20583,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13843,7 +16147,7 @@
+@@ -13840,7 +16148,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20554,7 +20592,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13868,18 +16172,28 @@
+@@ -13865,18 +16173,28 @@
;;
chorus*)
case $cc_basename in
@@ -20586,7 +20624,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13887,22 +16201,22 @@
+@@ -13884,22 +16202,22 @@
;;
esac
;;
@@ -20615,7 +20653,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13915,9 +16229,13 @@
+@@ -13912,9 +16230,13 @@
;;
esac
;;
@@ -20630,7 +20668,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13926,20 +16244,26 @@
+@@ -13923,20 +16245,26 @@
;;
esac
;;
@@ -20661,7 +20699,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 +16280,25 @@
+@@ -13953,25 +16281,25 @@
;;
mvs*)
case $cc_basename in
@@ -20692,7 +20730,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13988,24 +16312,15 @@
+@@ -13985,24 +16313,15 @@
;;
psos*)
;;
@@ -20719,7 +20757,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14015,12 +16330,12 @@
+@@ -14012,12 +16331,12 @@
;;
sunos4*)
case $cc_basename in
@@ -20734,7 +20772,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14030,7 +16345,7 @@
+@@ -14027,7 +16346,7 @@
;;
tandem*)
case $cc_basename in
@@ -20743,7 +20781,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14038,7 +16353,14 @@
+@@ -14035,7 +16354,14 @@
;;
esac
;;
@@ -20759,7 +20797,7 @@
;;
vxworks*)
;;
-@@ -14048,16 +16370,16 @@
+@@ -14045,16 +16371,16 @@
esac
fi
@@ -20780,7 +20818,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14071,26 +16393,28 @@
+@@ -14068,26 +16394,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 \
@@ -20788,13 +20826,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16399: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14074: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16400: $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:16403: \$? = $ac_status" >&5
+- echo "$as_me:14078: \$? = $ac_status" >&5
++ echo "$as_me:16404: \$? = $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
@@ -20816,7 +20854,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14103,7 +16427,7 @@
+@@ -14100,7 +16428,7 @@
fi
fi
@@ -20825,7 +20863,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14113,8 +16437,50 @@
+@@ -14110,8 +16438,50 @@
;;
esac
@@ -20878,7 +20916,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14125,60 +16491,58 @@
+@@ -14122,60 +16492,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20899,13 +20937,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14144: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16503: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14141: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16504: $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:16507: \$? = $ac_status" >&5
+- echo "$as_me:14145: \$? = $ac_status" >&5
++ echo "$as_me:16508: \$? = $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
@@ -20957,7 +20995,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 +16552,8 @@
+@@ -14185,8 +16553,8 @@
need_locks=no
fi
@@ -20968,7 +21006,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14206,22 +16570,20 @@
+@@ -14203,22 +16571,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -20997,7 +21035,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14239,8 +16601,8 @@
+@@ -14236,8 +16602,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.
@@ -21008,7 +21046,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14254,6 +16616,7 @@
+@@ -14251,6 +16617,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -21016,7 +21054,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14276,20 +16639,20 @@
+@@ -14273,20 +16640,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21042,7 +21080,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14299,7 +16662,20 @@
+@@ -14296,7 +16663,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21064,7 +21102,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14364,7 +16740,7 @@
+@@ -14361,7 +16741,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21073,7 +21111,7 @@
;;
beos*)
-@@ -14373,7 +16749,7 @@
+@@ -14370,7 +16750,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21082,7 +21120,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 +16765,7 @@
+@@ -14386,7 +16766,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21091,7 +21129,7 @@
need_version=no
need_lib_prefix=no
-@@ -14401,7 +16777,8 @@
+@@ -14398,7 +16778,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21101,7 +21139,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14431,7 +16808,7 @@
+@@ -14428,7 +16809,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21110,7 +21148,7 @@
;;
esac
;;
-@@ -14454,7 +16831,7 @@
+@@ -14451,7 +16832,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21119,7 +21157,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 +16854,17 @@
+@@ -14474,20 +16855,17 @@
dynamic_linker=no
;;
@@ -21151,7 +21189,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14508,14 +16882,19 @@
+@@ -14505,14 +16883,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21173,7 +21211,7 @@
esac
;;
-@@ -14535,9 +16914,9 @@
+@@ -14532,9 +16915,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21185,7 +21223,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14552,7 +16931,7 @@
+@@ -14549,7 +16932,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21194,7 +21232,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14563,7 +16942,7 @@
+@@ -14560,7 +16943,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21203,7 +21241,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14575,6 +16954,18 @@
+@@ -14572,6 +16955,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21222,7 +21260,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14618,29 +17009,26 @@
+@@ -14615,29 +17010,26 @@
;;
# This must be Linux ELF.
@@ -21259,7 +21297,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 +17038,18 @@
+@@ -14647,6 +17039,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21278,7 +21316,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14659,7 +17059,7 @@
+@@ -14656,7 +17060,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21287,7 +21325,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14687,8 +17087,13 @@
+@@ -14684,8 +17088,13 @@
openbsd*)
version_type=sunos
@@ -21302,7 +21340,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 +17113,7 @@
+@@ -14705,7 +17114,7 @@
os2*)
libname_spec='$name'
@@ -21311,7 +21349,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14726,13 +17131,6 @@
+@@ -14723,13 +17132,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21325,7 +21363,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14758,7 +17156,7 @@
+@@ -14755,7 +17157,7 @@
need_version=yes
;;
@@ -21334,7 +21372,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'
-@@ -14791,27 +17189,55 @@
+@@ -14788,9 +17190,32 @@
fi
;;
@@ -21346,13 +21384,8 @@
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-- ;;
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -21372,13 +21405,12 @@
+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
-+ ;;
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+@@ -14799,16 +17224,21 @@
+ dynamic_linker=no
+ ;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
@@ -21404,7 +21436,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14831,8 +17257,8 @@
+@@ -14828,8 +17258,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -21415,7 +21447,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14843,1001 +17269,176 @@
+@@ -14840,1001 +17270,176 @@
enable_fast_install=needless
fi
@@ -22192,7 +22224,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15480 "configure"
+-#line 15477 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -22290,7 +22322,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15578 "configure"
+-#line 15575 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -22558,7 +22590,7 @@
# How to create reloadable object files.
reload_flag=$lt_reload_flag
-@@ -15853,7 +17454,7 @@
+@@ -15850,7 +17455,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22567,7 +22599,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15868,7 +17469,7 @@
+@@ -15865,7 +17470,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -22576,7 +22608,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16070,7 +17671,10 @@
+@@ -16067,7 +17672,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.
@@ -22588,7 +22620,7 @@
fi
-@@ -16142,29 +17746,55 @@
+@@ -16139,29 +17747,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -22628,19 +22660,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
@@ -22652,7 +22684,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16172,21 +17802,21 @@
+@@ -16169,21 +17803,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -22684,7 +22716,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16195,8 +17825,8 @@
+@@ -16192,8 +17826,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -22695,7 +22727,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16234,6 +17864,11 @@
+@@ -16231,6 +17865,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -22707,7 +22739,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16250,7 +17885,7 @@
+@@ -16247,7 +17886,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22716,7 +22748,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16276,6 +17911,16 @@
+@@ -16273,6 +17912,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22733,7 +22765,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16287,7 +17932,7 @@
+@@ -16284,7 +17933,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.
@@ -22742,7 +22774,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16310,13 +17955,20 @@
+@@ -16307,13 +17956,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22765,7 +22797,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16331,15 +17983,15 @@
+@@ -16328,15 +17984,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -22787,7 +22819,7 @@
;;
sunos4*)
-@@ -16348,7 +18000,7 @@
+@@ -16345,7 +18001,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -22796,7 +22828,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16361,6 +18013,17 @@
+@@ -16358,6 +18014,17 @@
fi
;;
@@ -22814,7 +22846,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16372,16 +18035,16 @@
+@@ -16369,16 +18036,16 @@
esac
fi
@@ -22835,7 +22867,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16395,26 +18058,28 @@
+@@ -16392,26 +18059,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 \
@@ -22843,13 +22875,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18064: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16398: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18065: $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:18068: \$? = $ac_status" >&5
+- echo "$as_me:16402: \$? = $ac_status" >&5
++ echo "$as_me:18069: \$? = $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
@@ -22871,7 +22903,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16427,7 +18092,7 @@
+@@ -16424,7 +18093,7 @@
fi
fi
@@ -22880,7 +22912,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16437,72 +18102,112 @@
+@@ -16434,24 +18103,59 @@
;;
esac
@@ -22899,6 +22931,9 @@
- 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
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -22931,7 +22966,13 @@
+ lt_prog_compiler_static_F77=
+fi
+
-+
+
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
+{ 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
@@ -22940,20 +22981,13 @@
+ 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
++ cd conftest
++ mkdir out
++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
+@@ -16459,47 +18163,52 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -22961,13 +22995,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18168: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18169: $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:18172: \$? = $ac_status" >&5
+- echo "$as_me:16469: \$? = $ac_status" >&5
++ echo "$as_me:18173: \$? = $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
@@ -23019,7 +23053,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 +18217,8 @@
+@@ -16509,8 +18218,8 @@
need_locks=no
fi
@@ -23030,7 +23064,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16551,6 +18256,16 @@
+@@ -16548,6 +18257,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -23047,7 +23081,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16561,6 +18276,10 @@
+@@ -16558,6 +18277,10 @@
with_gnu_ld=no
fi
;;
@@ -23058,7 +23092,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16571,6 +18290,27 @@
+@@ -16568,6 +18291,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -23086,7 +23120,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16608,7 +18348,7 @@
+@@ -16605,7 +18349,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -23095,7 +23129,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16618,13 +18358,13 @@
+@@ -16615,13 +18359,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'
@@ -23112,7 +23146,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 +18373,70 @@
+@@ -16630,23 +18374,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -23189,7 +23223,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16663,13 +18450,40 @@
+@@ -16660,13 +18451,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23232,7 +23266,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16679,24 +18493,19 @@
+@@ -16676,24 +18494,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23264,7 +23298,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16708,7 +18517,7 @@
+@@ -16705,7 +18518,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -23273,7 +23307,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16730,9 +18539,21 @@
+@@ -16727,9 +18540,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
@@ -23297,7 +23331,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16749,7 +18570,7 @@
+@@ -16746,7 +18571,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -23306,7 +23340,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 +18589,12 @@
+@@ -16765,8 +18590,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -23319,7 +23353,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16777,45 +18602,58 @@
+@@ -16774,45 +18603,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23393,7 +23427,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16829,19 +18667,20 @@
+@@ -16826,19 +18668,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23401,7 +23435,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23419,7 +23453,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16850,24 +18689,36 @@
+@@ -16847,24 +18690,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23464,7 +23498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16881,8 +18732,10 @@
+@@ -16878,8 +18733,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23472,11 +23506,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16891,13 +18744,11 @@
+@@ -16888,13 +18745,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -23493,7 +23527,7 @@
fi
fi
;;
-@@ -16910,7 +18761,7 @@
+@@ -16907,7 +18762,7 @@
ld_shlibs_F77=no
;;
@@ -23502,7 +23536,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16920,68 +18771,68 @@
+@@ -16917,68 +18772,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -23615,7 +23649,7 @@
fi
;;
-@@ -17015,8 +18866,8 @@
+@@ -17012,8 +18867,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23626,7 +23660,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17024,7 +18875,7 @@
+@@ -17021,7 +18876,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23635,7 +23669,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 +18889,62 @@
+@@ -17035,47 +18890,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -23722,7 +23756,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17092,7 +18958,7 @@
+@@ -17089,7 +18959,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23731,7 +23765,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 +18968,7 @@
+@@ -17099,7 +18969,7 @@
link_all_deplibs_F77=yes
;;
@@ -23740,7 +23774,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 +18991,8 @@
+@@ -17122,7 +18992,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
@@ -23750,7 +23784,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17135,7 +19002,7 @@
+@@ -17132,7 +19003,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -23759,7 +23793,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17146,14 +19013,14 @@
+@@ -17143,14 +19014,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -23776,7 +23810,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 +19032,13 @@
+@@ -17162,13 +19033,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -23792,7 +23826,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17179,21 +19046,15 @@
+@@ -17176,21 +19047,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -23818,7 +23852,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 +19063,18 @@
+@@ -17199,8 +19064,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23839,7 +23873,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17212,7 +19083,7 @@
+@@ -17209,7 +19084,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.
@@ -23848,7 +23882,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17260,36 +19131,45 @@
+@@ -17257,36 +19132,45 @@
fi
;;
@@ -23915,7 +23949,7 @@
;;
uts4*)
-@@ -17304,15 +19184,10 @@
+@@ -17301,15 +19185,10 @@
esac
fi
@@ -23933,7 +23967,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17330,8 +19205,8 @@
+@@ -17327,8 +19206,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.
@@ -23944,7 +23978,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17345,6 +19220,7 @@
+@@ -17342,6 +19221,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -23952,7 +23986,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17367,20 +19243,20 @@
+@@ -17364,20 +19244,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23978,7 +24012,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17390,7 +19266,20 @@
+@@ -17387,7 +19267,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -24000,7 +24034,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17455,7 +19344,7 @@
+@@ -17452,7 +19345,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -24009,7 +24043,7 @@
;;
beos*)
-@@ -17464,7 +19353,7 @@
+@@ -17461,7 +19354,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -24018,7 +24052,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 +19369,7 @@
+@@ -17477,7 +19370,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -24027,7 +24061,7 @@
need_version=no
need_lib_prefix=no
-@@ -17492,7 +19381,8 @@
+@@ -17489,7 +19382,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -24037,7 +24071,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17522,7 +19412,7 @@
+@@ -17519,7 +19413,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -24046,7 +24080,7 @@
;;
esac
;;
-@@ -17545,7 +19435,7 @@
+@@ -17542,7 +19436,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -24055,7 +24089,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 +19458,17 @@
+@@ -17565,20 +19459,17 @@
dynamic_linker=no
;;
@@ -24087,7 +24121,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17599,14 +19486,19 @@
+@@ -17596,14 +19487,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -24109,7 +24143,7 @@
esac
;;
-@@ -17626,9 +19518,9 @@
+@@ -17623,9 +19519,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -24121,7 +24155,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17643,7 +19535,7 @@
+@@ -17640,7 +19536,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -24130,7 +24164,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17654,7 +19546,7 @@
+@@ -17651,7 +19547,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -24139,7 +24173,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17666,6 +19558,18 @@
+@@ -17663,6 +19559,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -24158,7 +24192,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17709,29 +19613,26 @@
+@@ -17706,29 +19614,26 @@
;;
# This must be Linux ELF.
@@ -24195,7 +24229,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 +19642,18 @@
+@@ -17738,6 +19643,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -24214,7 +24248,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17750,7 +19663,7 @@
+@@ -17747,7 +19664,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -24223,7 +24257,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17778,8 +19691,13 @@
+@@ -17775,8 +19692,13 @@
openbsd*)
version_type=sunos
@@ -24238,7 +24272,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 +19717,7 @@
+@@ -17796,7 +19718,7 @@
os2*)
libname_spec='$name'
@@ -24247,7 +24281,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17817,13 +19735,6 @@
+@@ -17814,13 +19736,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -24261,7 +24295,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17849,7 +19760,7 @@
+@@ -17846,7 +19761,7 @@
need_version=yes
;;
@@ -24270,7 +24304,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 +19793,29 @@
+@@ -17879,6 +19794,29 @@
fi
;;
@@ -24300,7 +24334,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17893,16 +19827,21 @@
+@@ -17890,16 +19828,21 @@
dynamic_linker=no
;;
esac
@@ -24328,7 +24362,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17922,8 +19861,8 @@
+@@ -17919,8 +19862,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -24339,7 +24373,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17934,36 +19873,6 @@
+@@ -17931,36 +19874,6 @@
enable_fast_install=needless
fi
@@ -24376,7 +24410,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17978,7 +19887,8 @@
+@@ -17975,7 +19888,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.
@@ -24386,7 +24420,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 +19988,12 @@
+@@ -18075,6 +19989,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24399,7 +24433,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18089,6 +20005,9 @@
+@@ -18086,6 +20006,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24409,7 +24443,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18108,7 +20027,7 @@
+@@ -18105,7 +20028,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24418,7 +24452,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18139,7 +20058,7 @@
+@@ -18136,7 +20059,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24427,7 +24461,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18154,7 +20073,7 @@
+@@ -18151,7 +20074,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -24436,7 +24470,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18356,7 +20275,10 @@
+@@ -18353,7 +20276,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.
@@ -24448,7 +24482,7 @@
fi
-@@ -18377,7 +20299,6 @@
+@@ -18374,7 +20300,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -24456,7 +24490,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18389,26 +20310,55 @@
+@@ -18386,26 +20311,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -24513,7 +24547,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 +20370,8 @@
+@@ -18417,8 +20371,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -24524,7 +24558,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18435,26 +20385,28 @@
+@@ -18432,26 +20386,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 \
@@ -24532,13 +24566,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18441: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20391: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18438: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20392: $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:20395: \$? = $ac_status" >&5
+- echo "$as_me:18442: \$? = $ac_status" >&5
++ echo "$as_me:20396: \$? = $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
@@ -24560,7 +24594,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 +20420,8 @@
+@@ -18465,8 +20421,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -24571,7 +24605,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18507,6 +20459,11 @@
+@@ -18504,6 +20460,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -24583,7 +24617,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18523,7 +20480,7 @@
+@@ -18520,7 +20481,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -24592,7 +24626,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18549,6 +20506,16 @@
+@@ -18546,6 +20507,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -24609,7 +24643,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18560,7 +20527,7 @@
+@@ -18557,7 +20528,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.
@@ -24618,7 +24652,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18583,13 +20550,20 @@
+@@ -18580,13 +20551,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -24641,7 +24675,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18604,15 +20578,15 @@
+@@ -18601,15 +20579,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -24663,7 +24697,7 @@
;;
sunos4*)
-@@ -18621,7 +20595,7 @@
+@@ -18618,7 +20596,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -24672,7 +24706,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18634,6 +20608,17 @@
+@@ -18631,6 +20609,17 @@
fi
;;
@@ -24690,7 +24724,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18645,16 +20630,16 @@
+@@ -18642,16 +20631,16 @@
esac
fi
@@ -24711,7 +24745,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18668,26 +20653,28 @@
+@@ -18665,26 +20654,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 \
@@ -24719,13 +24753,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20659: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18671: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20660: $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:20663: \$? = $ac_status" >&5
+- echo "$as_me:18675: \$? = $ac_status" >&5
++ echo "$as_me:20664: \$? = $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
@@ -24747,7 +24781,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18700,7 +20687,7 @@
+@@ -18697,7 +20688,7 @@
fi
fi
@@ -24756,7 +24790,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18710,8 +20697,50 @@
+@@ -18707,8 +20698,50 @@
;;
esac
@@ -24809,7 +24843,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18722,60 +20751,58 @@
+@@ -18719,60 +20752,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -24830,13 +24864,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18741: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20763: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18738: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20764: $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:20767: \$? = $ac_status" >&5
+- echo "$as_me:18742: \$? = $ac_status" >&5
++ echo "$as_me:20768: \$? = $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
@@ -24888,7 +24922,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 +20812,8 @@
+@@ -18782,8 +20813,8 @@
need_locks=no
fi
@@ -24899,7 +24933,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18824,6 +20851,16 @@
+@@ -18821,6 +20852,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -24916,7 +24950,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18834,6 +20871,10 @@
+@@ -18831,6 +20872,10 @@
with_gnu_ld=no
fi
;;
@@ -24927,7 +24961,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18844,6 +20885,27 @@
+@@ -18841,6 +20886,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -24955,7 +24989,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18881,7 +20943,7 @@
+@@ -18878,7 +20944,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -24964,7 +24998,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18891,13 +20953,13 @@
+@@ -18888,13 +20954,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'
@@ -24981,7 +25015,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 +20968,70 @@
+@@ -18903,23 +20969,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -24990,9 +25024,10 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ interix3*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
@@ -25037,10 +25072,9 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -25058,7 +25092,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18936,13 +21045,40 @@
+@@ -18933,13 +21046,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -25101,7 +25135,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18952,24 +21088,19 @@
+@@ -18949,24 +21089,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -25133,7 +25167,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18981,7 +21112,7 @@
+@@ -18978,7 +21113,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -25142,7 +25176,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19003,9 +21134,21 @@
+@@ -19000,9 +21135,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
@@ -25166,7 +25200,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19022,7 +21165,7 @@
+@@ -19019,7 +21166,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -25175,7 +25209,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 +21184,12 @@
+@@ -19038,8 +21185,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -25188,7 +25222,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19050,22 +21197,23 @@
+@@ -19047,22 +21198,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -25219,7 +25253,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19081,24 +21229,36 @@
+@@ -19078,24 +21230,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25264,7 +25298,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19112,19 +21272,20 @@
+@@ -19109,19 +21273,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25272,7 +25306,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -25290,7 +25324,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19143,24 +21304,36 @@
+@@ -19140,24 +21305,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25335,7 +25369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19174,8 +21347,10 @@
+@@ -19171,8 +21348,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25343,11 +25377,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19184,13 +21359,11 @@
+@@ -19181,13 +21360,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -25364,7 +25398,7 @@
fi
fi
;;
-@@ -19203,7 +21376,7 @@
+@@ -19200,7 +21377,7 @@
ld_shlibs_GCJ=no
;;
@@ -25373,7 +25407,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19213,68 +21386,68 @@
+@@ -19210,68 +21387,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -25486,7 +25520,7 @@
fi
;;
-@@ -19308,8 +21481,8 @@
+@@ -19305,8 +21482,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -25497,7 +25531,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19317,7 +21490,7 @@
+@@ -19314,7 +21491,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -25506,7 +25540,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 +21504,62 @@
+@@ -19328,47 +21505,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -25593,7 +25627,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19385,7 +21573,7 @@
+@@ -19382,7 +21574,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -25602,7 +25636,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 +21583,7 @@
+@@ -19392,7 +21584,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -25611,7 +25645,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 +21606,8 @@
+@@ -19415,7 +21607,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
@@ -25621,7 +25655,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19428,7 +21617,7 @@
+@@ -19425,7 +21618,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -25630,7 +25664,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19439,14 +21628,14 @@
+@@ -19436,14 +21629,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -25647,7 +25681,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 +21647,13 @@
+@@ -19455,13 +21648,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -25663,7 +25697,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19472,21 +21661,15 @@
+@@ -19469,21 +21662,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -25689,7 +25723,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 +21678,18 @@
+@@ -19492,8 +21679,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -25710,7 +25744,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19505,7 +21698,7 @@
+@@ -19502,7 +21699,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.
@@ -25719,7 +25753,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19553,36 +21746,45 @@
+@@ -19550,36 +21747,45 @@
fi
;;
@@ -25786,7 +25820,7 @@
;;
uts4*)
-@@ -19597,15 +21799,10 @@
+@@ -19594,15 +21800,10 @@
esac
fi
@@ -25804,7 +25838,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19623,8 +21820,8 @@
+@@ -19620,8 +21821,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.
@@ -25815,7 +25849,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19638,6 +21835,7 @@
+@@ -19635,6 +21836,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -25823,7 +25857,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19660,20 +21858,20 @@
+@@ -19657,20 +21859,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -25849,7 +25883,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19683,7 +21881,20 @@
+@@ -19680,7 +21882,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -25871,7 +25905,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19748,7 +21959,7 @@
+@@ -19745,7 +21960,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -25880,7 +25914,7 @@
;;
beos*)
-@@ -19757,7 +21968,7 @@
+@@ -19754,7 +21969,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -25889,7 +25923,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 +21984,7 @@
+@@ -19770,7 +21985,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -25898,7 +25932,7 @@
need_version=no
need_lib_prefix=no
-@@ -19785,7 +21996,8 @@
+@@ -19782,7 +21997,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -25908,7 +25942,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19815,7 +22027,7 @@
+@@ -19812,7 +22028,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -25917,7 +25951,7 @@
;;
esac
;;
-@@ -19838,7 +22050,7 @@
+@@ -19835,7 +22051,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -25926,7 +25960,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 +22073,17 @@
+@@ -19858,20 +22074,17 @@
dynamic_linker=no
;;
@@ -25958,7 +25992,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19892,1174 +22101,391 @@
+@@ -19889,14 +22102,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -25973,88 +26007,66 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
-- 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
++ freebsd*) # from 4.6 on
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -19916,9 +22134,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
- case "$host_cpu" in
-- ia64*)
++ case $host_cpu in
+ ia64*)
- shrext='.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
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-- else
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-- fi
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- hppa*64*)
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -19933,7 +22151,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
- shrext='.sl'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_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'
-- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- *)
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19944,7 +22162,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
- shrext='.sl'
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=SHLIB_PATH
-- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
-- esac
-- # HP-UX runs *really* slowly unless shared libraries are mode 555.
-- postinstall_cmds='chmod 555 $lib'
-- ;;
--
--irix5* | irix6* | nonstopux*)
-- case $host_os in
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- version_type=linux
-- else
-- version_type=irix
-- fi ;;
-- esac
-- need_lib_prefix=no
-- need_version=no
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-- case $host_os in
-- irix5* | nonstopux*)
-- libsuff= shlibsuff=
-- ;;
-- *)
-- case $LD in # libtool.m4 will add one of these switches to LD
-- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-- libsuff= shlibsuff= libmagic=32-bit;;
-- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19956,6 +22174,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -19979,1084 +22209,284 @@
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
@@ -26159,8 +26171,7 @@
- ;;
- esac
- else
-+ freebsd*) # from 4.6 on
- shlibpath_overrides_runpath=yes
+- shlibpath_overrides_runpath=yes
- fi
- ;;
-
@@ -26343,11 +26354,8 @@
- 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=
@@ -26894,100 +26902,6 @@
-
-
-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
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_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'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-
-+interix3*)
-+ 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'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-
--fi
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
@@ -27039,8 +26953,6 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
-- ;;
-- esac
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -27053,8 +26965,7 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
+-fi
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -27063,27 +26974,16 @@
+ 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
-- enable_dlopen=no
++ else
+ 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}'
@@ -27091,19 +26991,7 @@
+ shlibpath_overrides_runpath=yes
+ ;;
-- 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"
+-fi
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
@@ -27114,9 +27002,7 @@
+ shlibpath_overrides_runpath=yes
+ ;;
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+- ;;
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
@@ -27125,7 +27011,10 @@
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
-+ esac
+ esac
+-
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+ 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
@@ -27138,11 +27027,41 @@
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
-+ else
+ else
+- enable_dlopen=no
+ 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 20861 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
-#include <stdio.h>
+os2*)
+ libname_spec='$name'
@@ -27324,7 +27243,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20962 "configure"
+-#line 20959 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -27478,7 +27397,7 @@
fi
-@@ -21076,7 +22502,8 @@
+@@ -21073,7 +22503,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.
@@ -27488,7 +27407,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 +22603,12 @@
+@@ -21173,6 +22604,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27501,7 +27420,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21187,6 +22620,9 @@
+@@ -21184,6 +22621,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27511,7 +27430,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21206,7 +22642,7 @@
+@@ -21203,7 +22643,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27520,7 +27439,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21237,7 +22673,7 @@
+@@ -21234,7 +22674,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27529,7 +27448,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21252,7 +22688,7 @@
+@@ -21249,7 +22689,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -27538,7 +27457,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21454,7 +22890,10 @@
+@@ -21451,7 +22891,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.
@@ -27550,7 +27469,7 @@
fi
-@@ -21474,7 +22913,6 @@
+@@ -21471,7 +22914,6 @@
RC)
@@ -27558,7 +27477,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21493,15 +22931,42 @@
+@@ -21490,15 +22932,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -27601,7 +27520,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21517,7 +22982,8 @@
+@@ -21514,7 +22983,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.
@@ -27611,7 +27530,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 +23083,12 @@
+@@ -21614,6 +23084,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -27624,7 +27543,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21628,6 +23100,9 @@
+@@ -21625,6 +23101,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -27634,7 +27553,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21647,7 +23122,7 @@
+@@ -21644,7 +23123,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -27643,7 +27562,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21678,7 +23153,7 @@
+@@ -21675,7 +23154,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -27652,7 +27571,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21693,7 +23168,7 @@
+@@ -21690,7 +23169,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -27661,7 +27580,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21895,7 +23370,10 @@
+@@ -21892,7 +23371,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.
@@ -27673,7 +27592,7 @@
fi
-@@ -21942,7 +23420,7 @@
+@@ -21939,7 +23421,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -27682,7 +27601,7 @@
# Prevent multiple expansion
-@@ -21997,8 +23475,8 @@
+@@ -21994,8 +23476,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -27693,7 +27612,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22024,17 +23502,17 @@
+@@ -22021,17 +23503,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -27717,7 +27636,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22049,32 +23527,33 @@
+@@ -22046,32 +23528,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27759,7 +27678,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22083,8 +23562,8 @@
+@@ -22080,8 +23563,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -27770,7 +27689,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22110,11 +23589,11 @@
+@@ -22107,11 +23590,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -27786,7 +27705,7 @@
fi
-@@ -22122,8 +23601,8 @@
+@@ -22119,8 +23602,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -27797,7 +27716,7 @@
XGETTEXT=":"
fi
fi
-@@ -22133,8 +23612,7 @@
+@@ -22130,8 +23613,7 @@
@@ -27807,7 +27726,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 +23624,8 @@
+@@ -22143,8 +23625,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -27818,7 +27737,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22175,24 +23653,36 @@
+@@ -22172,24 +23654,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27863,7 +27782,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22201,15 +23691,16 @@
+@@ -22198,15 +23692,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27884,7 +27803,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22238,15 +23729,14 @@
+@@ -22235,15 +23730,14 @@
@@ -27903,7 +27822,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 +23748,6 @@
+@@ -22255,9 +23749,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27913,7 +27832,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22286,24 +23773,36 @@
+@@ -22283,24 +23774,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27958,7 +27877,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22312,9 +23811,10 @@
+@@ -22309,9 +23812,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27971,7 +27890,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22327,11 +23827,11 @@
+@@ -22324,11 +23828,11 @@
fi
@@ -27987,7 +27906,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22352,8 +23852,7 @@
+@@ -22349,8 +23853,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -27997,7 +27916,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 +23890,36 @@
+@@ -22388,24 +23891,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28042,7 +27961,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22418,10 +23929,11 @@
+@@ -22415,10 +23930,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28052,11 +27971,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22434,8 +23946,8 @@
+@@ -22431,8 +23947,8 @@
fi
@@ -28067,7 +27986,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22459,15 +23971,14 @@
+@@ -22456,15 +23972,14 @@
@@ -28086,7 +28005,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 +23990,6 @@
+@@ -22476,9 +23991,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28096,7 +28015,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22506,24 +24014,36 @@
+@@ -22503,24 +24015,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28141,7 +28060,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22532,9 +24052,10 @@
+@@ -22529,9 +24053,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28154,7 +28073,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22547,11 +24068,11 @@
+@@ -22544,11 +24069,11 @@
fi
@@ -28170,7 +28089,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22572,8 +24093,7 @@
+@@ -22569,8 +24094,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -28180,7 +28099,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 +24130,36 @@
+@@ -22607,24 +24131,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28225,7 +28144,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22637,10 +24169,11 @@
+@@ -22634,10 +24170,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28235,11 +28154,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22653,8 +24186,8 @@
+@@ -22650,8 +24187,8 @@
fi
@@ -28250,7 +28169,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22677,8 +24210,8 @@
+@@ -22674,8 +24211,8 @@
@@ -28261,7 +28180,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22695,30 +24228,42 @@
+@@ -22692,30 +24229,42 @@
int
main ()
{
@@ -28313,7 +28232,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22727,20 +24272,21 @@
+@@ -22724,20 +24273,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28322,7 +28241,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28341,7 +28260,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22757,30 +24303,42 @@
+@@ -22754,30 +24304,42 @@
int
main ()
{
@@ -28393,7 +28312,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22789,21 +24347,22 @@
+@@ -22786,21 +24348,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28402,7 +28321,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28422,7 +28341,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22816,40 +24375,52 @@
+@@ -22813,40 +24376,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28487,7 +28406,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22858,19 +24429,20 @@
+@@ -22855,19 +24430,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28496,7 +28415,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28514,7 +28433,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22883,40 +24455,52 @@
+@@ -22880,40 +24456,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28579,7 +28498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22925,14 +24509,15 @@
+@@ -22922,14 +24510,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28588,7 +28507,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28599,7 +28518,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22958,13 +24543,13 @@
+@@ -22955,13 +24544,13 @@
fi
@@ -28616,7 +28535,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 +24578,36 @@
+@@ -22990,24 +24579,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28661,7 +28580,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23022,8 +24619,10 @@
+@@ -23019,8 +24620,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28673,7 +28592,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23033,17 +24632,17 @@
+@@ -23030,17 +24633,17 @@
fi
@@ -28696,7 +28615,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 +24671,36 @@
+@@ -23069,24 +24672,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28741,7 +28660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23101,8 +24712,10 @@
+@@ -23098,8 +24713,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28753,7 +28672,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23113,8 +24726,8 @@
+@@ -23110,8 +24727,8 @@
fi
@@ -28764,7 +28683,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23127,8 +24740,8 @@
+@@ -23124,8 +24741,8 @@
_ACEOF
@@ -28775,7 +28694,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23141,40 +24754,52 @@
+@@ -23138,40 +24755,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28840,7 +28759,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23183,21 +24808,22 @@
+@@ -23180,21 +24809,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28849,7 +28768,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28869,7 +28788,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23210,40 +24836,52 @@
+@@ -23207,40 +24837,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28934,7 +28853,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23252,21 +24890,22 @@
+@@ -23249,21 +24891,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28943,7 +28862,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28963,7 +28882,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23293,53 +24932,59 @@
+@@ -23290,53 +24933,59 @@
#undef inet_ntoa
@@ -29042,7 +28961,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23348,17 +24993,18 @@
+@@ -23345,17 +24994,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29051,7 +28970,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -29067,7 +28986,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23371,40 +25017,52 @@
+@@ -23368,40 +25018,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29132,7 +29051,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23413,21 +25071,22 @@
+@@ -23410,21 +25072,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29141,7 +29060,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29161,7 +29080,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23454,53 +25113,59 @@
+@@ -23451,53 +25114,59 @@
#undef connect
@@ -29240,7 +29159,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23509,17 +25174,18 @@
+@@ -23506,17 +25175,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29249,7 +29168,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -29265,7 +29184,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23532,40 +25198,52 @@
+@@ -23529,40 +25199,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29330,7 +29249,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23574,22 +25252,23 @@
+@@ -23571,22 +25253,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29339,7 +29258,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29360,7 +29279,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23616,53 +25295,59 @@
+@@ -23613,53 +25296,59 @@
#undef remove
@@ -29439,7 +29358,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23671,17 +25356,18 @@
+@@ -23668,17 +25357,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29448,7 +29367,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -29464,7 +29383,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23694,40 +25380,52 @@
+@@ -23691,40 +25381,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29529,7 +29448,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23736,14 +25434,15 @@
+@@ -23733,14 +25435,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29538,7 +29457,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29549,7 +29468,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23751,8 +25450,8 @@
+@@ -23748,8 +25451,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -29560,7 +29479,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23779,53 +25478,59 @@
+@@ -23776,53 +25479,59 @@
#undef shmat
@@ -29639,7 +29558,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23834,18 +25539,19 @@
+@@ -23831,18 +25540,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29648,7 +29567,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -29665,7 +29584,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23858,40 +25564,52 @@
+@@ -23855,40 +25565,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29730,7 +29649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23900,14 +25618,15 @@
+@@ -23897,14 +25619,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29739,7 +29658,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29750,7 +29669,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23921,18 +25640,19 @@
+@@ -23918,18 +25641,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29778,7 +29697,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23943,24 +25663,36 @@
+@@ -23940,24 +25664,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29823,7 +29742,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23969,15 +25701,16 @@
+@@ -23966,15 +25702,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29846,7 +29765,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23986,8 +25719,13 @@
+@@ -23983,8 +25720,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29862,7 +29781,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24011,9 +25749,10 @@
+@@ -24008,9 +25750,10 @@
ac_header_preproc=no
fi
@@ -29875,7 +29794,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24037,25 +25776,19 @@
+@@ -24034,25 +25777,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;}
@@ -29908,7 +29827,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24073,18 +25806,19 @@
+@@ -24070,18 +25807,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29936,7 +29855,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24095,24 +25829,36 @@
+@@ -24092,24 +25830,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29981,7 +29900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24121,15 +25867,16 @@
+@@ -24118,15 +25868,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30004,7 +29923,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24138,8 +25885,13 @@
+@@ -24135,8 +25886,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -30020,7 +29939,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24163,9 +25915,10 @@
+@@ -24160,9 +25916,10 @@
ac_header_preproc=no
fi
@@ -30033,7 +29952,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24189,25 +25942,19 @@
+@@ -24186,25 +25943,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;}
@@ -30066,7 +29985,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24221,8 +25968,8 @@
+@@ -24218,8 +25969,8 @@
# darwin requires a poll emulation library
@@ -30077,7 +29996,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24235,40 +25982,52 @@
+@@ -24232,40 +25983,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30142,7 +30061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24277,14 +26036,15 @@
+@@ -24274,14 +26037,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30151,7 +30070,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30162,7 +30081,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24295,18 +26055,19 @@
+@@ -24292,18 +26056,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30190,7 +30109,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24317,24 +26078,36 @@
+@@ -24314,24 +26079,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -30235,7 +30154,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24343,15 +26116,16 @@
+@@ -24340,15 +26117,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30258,7 +30177,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24360,8 +26134,13 @@
+@@ -24357,8 +26135,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -30274,7 +30193,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24385,9 +26164,10 @@
+@@ -24382,9 +26165,10 @@
ac_header_preproc=no
fi
@@ -30287,7 +30206,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24411,25 +26191,19 @@
+@@ -24408,25 +26192,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;}
@@ -30320,7 +30239,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24444,17 +26218,17 @@
+@@ -24441,17 +26219,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -30344,7 +30263,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24465,24 +26239,36 @@
+@@ -24462,24 +26240,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -30389,7 +30308,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24491,15 +26277,16 @@
+@@ -24488,15 +26278,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30412,7 +30331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24508,8 +26295,13 @@
+@@ -24505,8 +26296,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -30428,7 +30347,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24533,9 +26325,10 @@
+@@ -24530,9 +26326,10 @@
ac_header_preproc=no
fi
@@ -30441,7 +30360,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24559,25 +26352,18 @@
+@@ -24556,25 +26353,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;}
@@ -30472,7 +30391,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24594,8 +26380,8 @@
+@@ -24591,8 +26381,8 @@
@@ -30483,7 +30402,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24621,31 +26407,43 @@
+@@ -24618,31 +26408,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30537,7 +30456,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24656,25 +26454,25 @@
+@@ -24653,25 +26455,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30549,7 +30468,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -30570,7 +30489,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 +26484,6 @@
+@@ -24683,9 +26485,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -30580,7 +30499,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24714,24 +26509,36 @@
+@@ -24711,24 +26510,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30625,7 +30544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24740,9 +26547,10 @@
+@@ -24737,9 +26548,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30638,7 +30557,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24755,11 +26563,11 @@
+@@ -24752,11 +26564,11 @@
fi
@@ -30654,7 +30573,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24780,8 +26588,7 @@
+@@ -24777,8 +26589,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -30664,7 +30583,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 +26626,36 @@
+@@ -24816,24 +26627,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30709,7 +30628,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24846,10 +26665,11 @@
+@@ -24843,10 +26666,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30719,11 +30638,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24862,8 +26682,8 @@
+@@ -24859,8 +26683,8 @@
fi
@@ -30734,7 +30653,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24890,8 +26710,8 @@
+@@ -24887,8 +26711,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -30745,7 +30664,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24904,40 +26724,52 @@
+@@ -24901,40 +26725,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30810,7 +30729,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24946,27 +26778,28 @@
+@@ -24943,27 +26779,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30819,7 +30738,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30849,7 +30768,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24979,40 +26812,52 @@
+@@ -24976,40 +26813,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30914,7 +30833,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25021,22 +26866,23 @@
+@@ -25018,22 +26867,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30923,7 +30842,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30944,7 +30863,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25047,36 +26893,49 @@
+@@ -25044,36 +26894,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31004,7 +30923,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25085,20 +26944,21 @@
+@@ -25082,23 +26945,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31022,22 +30941,29 @@
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_int" = yes; then
+- if test "$ac_cv_type_int" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +26971,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25108,10 +26971,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -31046,7 +30972,7 @@
test_array [0] = 0
;
-@@ -25122,24 +26983,36 @@
+@@ -25119,24 +26984,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31091,11 +31017,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25152,10 +27025,11 @@
+@@ -25149,10 +27026,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -31104,7 +31031,7 @@
test_array [0] = 0
;
-@@ -25163,24 +27037,36 @@
+@@ -25160,24 +27039,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31149,7 +31076,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25189,30 +27075,32 @@
+@@ -25186,30 +27077,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31182,7 +31109,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -31191,7 +31119,7 @@
test_array [0] = 0
;
-@@ -25220,24 +27108,36 @@
+@@ -25217,24 +27111,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31236,11 +31164,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25250,10 +27150,11 @@
+@@ -25247,10 +27153,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -31249,7 +31178,7 @@
test_array [0] = 0
;
-@@ -25261,24 +27162,36 @@
+@@ -25258,24 +27166,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31294,7 +31223,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25287,24 +27200,27 @@
+@@ -25284,24 +27204,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31332,11 +31261,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25315,10 +27231,11 @@
+@@ -25312,10 +27235,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -31345,7 +31275,7 @@
test_array [0] = 0
;
-@@ -25326,24 +27243,36 @@
+@@ -25323,24 +27248,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31390,7 +31320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25352,26 +27281,20 @@
+@@ -25349,26 +27286,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31404,13 +31334,17 @@
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31423,19 +31357,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25379,8 +27302,9 @@
+@@ -25376,8 +27311,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25389,35 +27313,44 @@
+@@ -25386,35 +27323,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31493,12 +31428,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25428,28 +27361,27 @@
+@@ -25425,28 +27371,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
@@ -31507,18 +31443,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_int=0
+-else
+- ac_cv_sizeof_int=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
@@ -31530,7 +31472,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25460,36 +27392,49 @@
+@@ -25457,36 +27406,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31590,7 +31532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25498,20 +27443,21 @@
+@@ -25495,23 +27457,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31608,22 +31550,29 @@
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_short" = yes; then
+- if test "$ac_cv_type_short" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +27470,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25521,10 +27483,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -31632,7 +31581,7 @@
test_array [0] = 0
;
-@@ -25535,24 +27482,36 @@
+@@ -25532,24 +27496,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31677,11 +31626,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25565,10 +27524,11 @@
+@@ -25562,10 +27538,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -31690,7 +31640,7 @@
test_array [0] = 0
;
-@@ -25576,24 +27536,36 @@
+@@ -25573,24 +27551,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31735,7 +31685,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25602,30 +27574,32 @@
+@@ -25599,30 +27589,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31768,7 +31718,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -31777,7 +31728,7 @@
test_array [0] = 0
;
-@@ -25633,24 +27607,36 @@
+@@ -25630,24 +27623,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31822,11 +31773,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25663,10 +27649,11 @@
+@@ -25660,10 +27665,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -31835,7 +31787,7 @@
test_array [0] = 0
;
-@@ -25674,24 +27661,36 @@
+@@ -25671,24 +27678,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31880,7 +31832,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25700,24 +27699,27 @@
+@@ -25697,24 +27716,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31918,11 +31870,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25728,10 +27730,11 @@
+@@ -25725,10 +27747,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -31931,7 +31884,7 @@
test_array [0] = 0
;
-@@ -25739,24 +27742,36 @@
+@@ -25736,24 +27760,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31976,7 +31929,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25765,26 +27780,20 @@
+@@ -25762,26 +27798,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31990,13 +31943,17 @@
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -32009,19 +31966,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25792,8 +27801,9 @@
+@@ -25789,8 +27823,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25802,35 +27812,44 @@
+@@ -25799,35 +27835,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32079,12 +32037,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25841,28 +27860,27 @@
+@@ -25838,28 +27883,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
@@ -32093,18 +32052,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_short=0
+-else
+- ac_cv_sizeof_short=0
+-fi
fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
@@ -32116,7 +32081,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25873,36 +27891,49 @@
+@@ -25870,36 +27918,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32176,7 +32141,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25911,20 +27942,21 @@
+@@ -25908,23 +27969,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32194,22 +32159,29 @@
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
+- if test "$ac_cv_type_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +27969,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25934,10 +27995,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -32218,7 +32190,7 @@
test_array [0] = 0
;
-@@ -25948,24 +27981,36 @@
+@@ -25945,24 +28008,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32263,11 +32235,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25978,10 +28023,11 @@
+@@ -25975,10 +28050,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -32276,7 +32249,7 @@
test_array [0] = 0
;
-@@ -25989,24 +28035,36 @@
+@@ -25986,24 +28063,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32321,7 +32294,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26015,30 +28073,32 @@
+@@ -26012,30 +28101,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32354,7 +32327,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -32363,7 +32337,7 @@
test_array [0] = 0
;
-@@ -26046,24 +28106,36 @@
+@@ -26043,24 +28135,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32408,11 +32382,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26076,10 +28148,11 @@
+@@ -26073,10 +28177,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -32421,7 +32396,7 @@
test_array [0] = 0
;
-@@ -26087,24 +28160,36 @@
+@@ -26084,24 +28190,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32466,7 +32441,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26113,24 +28198,27 @@
+@@ -26110,24 +28228,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32504,11 +32479,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26141,10 +28229,11 @@
+@@ -26138,10 +28259,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -32517,7 +32493,7 @@
test_array [0] = 0
;
-@@ -26152,24 +28241,36 @@
+@@ -26149,24 +28272,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32562,7 +32538,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26178,26 +28279,20 @@
+@@ -26175,26 +28310,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32576,13 +32552,17 @@
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -32595,19 +32575,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26205,8 +28300,9 @@
+@@ -26202,8 +28335,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26215,35 +28311,44 @@
+@@ -26212,35 +28347,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32665,12 +32646,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26254,28 +28359,27 @@
+@@ -26251,28 +28395,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -32679,18 +32661,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_long=0
+-else
+- ac_cv_sizeof_long=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
@@ -32702,7 +32690,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26286,36 +28390,49 @@
+@@ -26283,36 +28430,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32762,7 +32750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26324,20 +28441,21 @@
+@@ -26321,23 +28481,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32780,22 +32768,29 @@
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char_p" = yes; then
+- if test "$ac_cv_type_char_p" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +28468,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26347,10 +28507,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -32804,7 +32799,7 @@
test_array [0] = 0
;
-@@ -26361,24 +28480,36 @@
+@@ -26358,24 +28520,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32849,11 +32844,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26391,10 +28522,11 @@
+@@ -26388,10 +28562,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -32862,7 +32858,7 @@
test_array [0] = 0
;
-@@ -26402,24 +28534,36 @@
+@@ -26399,24 +28575,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32907,7 +32903,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26428,30 +28572,32 @@
+@@ -26425,30 +28613,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32940,7 +32936,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -32949,7 +32946,7 @@
test_array [0] = 0
;
-@@ -26459,24 +28605,36 @@
+@@ -26456,24 +28647,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32994,11 +32991,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26489,10 +28647,11 @@
+@@ -26486,10 +28689,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -33007,7 +33005,7 @@
test_array [0] = 0
;
-@@ -26500,24 +28659,36 @@
+@@ -26497,24 +28702,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33052,7 +33050,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26526,24 +28697,27 @@
+@@ -26523,24 +28740,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33090,11 +33088,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26554,10 +28728,11 @@
+@@ -26551,10 +28771,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -33103,7 +33102,7 @@
test_array [0] = 0
;
-@@ -26565,24 +28740,36 @@
+@@ -26562,24 +28784,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33148,7 +33147,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26591,26 +28778,20 @@
+@@ -26588,26 +28822,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33162,13 +33161,17 @@
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++'') if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -33181,19 +33184,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26618,8 +28799,9 @@
+@@ -26615,8 +28847,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (char *)); }
-unsigned long ulongval () { return (long) (sizeof (char *)); }
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26628,35 +28810,44 @@
+@@ -26625,35 +28859,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33251,12 +33255,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26667,30 +28858,29 @@
+@@ -26664,30 +28907,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
@@ -33265,18 +33270,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_char_p=0
+-else
+- ac_cv_sizeof_char_p=0
+-fi
fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
_ACEOF
@@ -33290,7 +33301,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26703,40 +28893,52 @@
+@@ -26700,40 +28946,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33355,7 +33366,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26745,14 +28947,15 @@
+@@ -26742,14 +29000,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33364,7 +33375,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33375,7 +33386,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26761,8 +28964,8 @@
+@@ -26758,8 +29017,8 @@
fi
@@ -33386,7 +33397,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26775,40 +28978,52 @@
+@@ -26772,40 +29031,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33451,7 +33462,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26817,14 +29032,15 @@
+@@ -26814,14 +29085,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33460,7 +33471,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -33471,7 +33482,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26838,8 +29054,8 @@
+@@ -26835,8 +29107,8 @@
@@ -33482,7 +33493,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26850,36 +29066,49 @@
+@@ -26847,36 +29119,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33542,7 +33553,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26888,20 +29117,21 @@
+@@ -26885,23 +29170,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33560,22 +33571,29 @@
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_size_t" = yes; then
+- if test "$ac_cv_type_size_t" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +29144,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26911,10 +29196,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -33584,7 +33602,7 @@
test_array [0] = 0
;
-@@ -26925,24 +29156,36 @@
+@@ -26922,24 +29209,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33629,11 +33647,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26955,10 +29198,11 @@
+@@ -26952,10 +29251,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -33642,7 +33661,7 @@
test_array [0] = 0
;
-@@ -26966,24 +29210,36 @@
+@@ -26963,24 +29264,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33687,7 +33706,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26992,30 +29248,32 @@
+@@ -26989,30 +29302,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33720,7 +33739,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -33729,7 +33749,7 @@
test_array [0] = 0
;
-@@ -27023,24 +29281,36 @@
+@@ -27020,24 +29336,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33774,11 +33794,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27053,10 +29323,11 @@
+@@ -27050,10 +29378,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -33787,7 +33808,7 @@
test_array [0] = 0
;
-@@ -27064,24 +29335,36 @@
+@@ -27061,24 +29391,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33832,7 +33853,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27090,24 +29373,27 @@
+@@ -27087,24 +29429,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33870,11 +33891,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27118,10 +29404,11 @@
+@@ -27115,10 +29460,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -33883,7 +33905,7 @@
test_array [0] = 0
;
-@@ -27129,24 +29416,36 @@
+@@ -27126,24 +29473,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33928,7 +33950,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27155,26 +29454,20 @@
+@@ -27152,26 +29511,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33942,13 +33964,17 @@
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -33961,19 +33987,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27182,8 +29475,9 @@
+@@ -27179,8 +29536,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27192,35 +29486,44 @@
+@@ -27189,35 +29548,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -34031,12 +34058,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27231,29 +29534,28 @@
+@@ -27228,29 +29596,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
@@ -34045,18 +34073,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_size_t=0
+-else
+- ac_cv_sizeof_size_t=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
_ACEOF
@@ -34069,7 +34103,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27264,36 +29566,49 @@
+@@ -27261,36 +29632,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -34129,7 +34163,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27302,20 +29617,21 @@
+@@ -27299,23 +29683,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34147,22 +34181,29 @@
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_unsigned_long" = yes; then
+- if test "$ac_cv_type_unsigned_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # 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 +29644,11 @@
+- # 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.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27325,10 +29709,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -34171,7 +34212,7 @@
test_array [0] = 0
;
-@@ -27339,24 +29656,36 @@
+@@ -27336,24 +29722,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34216,11 +34257,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27369,10 +29698,11 @@
+@@ -27366,10 +29764,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -34229,7 +34271,7 @@
test_array [0] = 0
;
-@@ -27380,24 +29710,36 @@
+@@ -27377,24 +29777,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34274,7 +34316,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27406,30 +29748,32 @@
+@@ -27403,30 +29815,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34307,7 +34349,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -34316,7 +34359,7 @@
test_array [0] = 0
;
-@@ -27437,24 +29781,36 @@
+@@ -27434,24 +29849,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34361,11 +34404,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27467,10 +29823,11 @@
+@@ -27464,10 +29891,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -34374,7 +34418,7 @@
test_array [0] = 0
;
-@@ -27478,24 +29835,36 @@
+@@ -27475,24 +29904,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34419,7 +34463,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27504,24 +29873,27 @@
+@@ -27501,24 +29942,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34457,11 +34501,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27532,10 +29904,11 @@
+@@ -27529,10 +29973,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -34470,7 +34515,7 @@
test_array [0] = 0
;
-@@ -27543,24 +29916,36 @@
+@@ -27540,24 +29986,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34515,7 +34560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27569,26 +29954,20 @@
+@@ -27566,25 +30024,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34527,40 +34572,46 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
- ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+'') { { 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 compute sizeof (unsigned long), 77
-+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
+-esac
+-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
++?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
--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; }; }
--else
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi ;;
++esac
+ else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
-@@ -27596,8 +29975,9 @@
+@@ -27593,8 +30049,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27606,35 +29986,44 @@
+@@ -27603,35 +30061,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -34618,12 +34669,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27645,30 +30034,29 @@
+@@ -27642,30 +30109,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++if test "$ac_cv_type_unsigned_long" = yes; then
++ { { 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
+echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -34632,18 +34684,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_unsigned_long=0
+-else
+- ac_cv_sizeof_unsigned_long=0
+-fi
fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
_ACEOF
@@ -34657,7 +34715,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27689,36 +30077,48 @@
+@@ -27686,36 +30156,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34718,17 +34776,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 +30130,18 @@
+@@ -27727,18 +30209,18 @@
{ (exit 1); exit 1; }; }
fi
-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
@@ -34742,7 +34800,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 +30171,36 @@
+@@ -27768,24 +30250,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34787,7 +34845,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27797,9 +30209,10 @@
+@@ -27794,9 +30288,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34796,11 +34854,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27812,26 +30225,26 @@
+@@ -27809,26 +30304,26 @@
fi
@@ -34837,7 +34895,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27850,18 +30263,19 @@
+@@ -27847,18 +30342,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34865,7 +34923,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27872,24 +30286,36 @@
+@@ -27869,24 +30365,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -34910,7 +34968,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27898,15 +30324,16 @@
+@@ -27895,15 +30403,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34933,7 +34991,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27915,8 +30342,13 @@
+@@ -27912,8 +30421,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -34949,7 +35007,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27940,9 +30372,10 @@
+@@ -27937,9 +30451,10 @@
ac_header_preproc=no
fi
@@ -34962,7 +35020,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27966,25 +30399,19 @@
+@@ -27963,25 +30478,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;}
@@ -34995,7 +35053,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27996,8 +30423,8 @@
+@@ -27993,8 +30502,8 @@
done
@@ -35006,7 +35064,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28024,53 +30451,59 @@
+@@ -28021,53 +30530,59 @@
#undef _NSGetEnviron
@@ -35085,7 +35143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28079,13 +30512,14 @@
+@@ -28076,13 +30591,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35094,7 +35152,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -35104,7 +35162,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28106,9 +30540,9 @@
+@@ -28103,9 +30619,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35117,7 +35175,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28134,53 +30568,59 @@
+@@ -28131,53 +30647,59 @@
#undef $ac_func
@@ -35196,7 +35254,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28189,13 +30629,15 @@
+@@ -28186,13 +30708,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35205,7 +35263,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -35216,7 +35274,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 +30654,32 @@
+@@ -28209,32 +30733,32 @@
@@ -35231,9 +35289,9 @@
-fi;
+fi
++
-# Check whether --enable-qtopia or --disable-qtopia was given.
-+
+# Check whether --enable-qtopia was given.
if test "${enable_qtopia+set}" = set; then
- enableval="$enable_qtopia"
@@ -35244,9 +35302,9 @@
-fi;
+fi
-+
-# Check whether --enable-mac or --disable-mac was given.
++
+# Check whether --enable-mac was given.
if test "${enable_mac+set}" = set; then
- enableval="$enable_mac"
@@ -35261,7 +35319,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28253,8 +30695,8 @@
+@@ -28250,8 +30774,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -35272,7 +35330,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28291,8 +30733,13 @@
+@@ -28288,8 +30812,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -35288,7 +35346,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28359,6 +30806,7 @@
+@@ -28356,6 +30885,7 @@
fi
done
fi
@@ -35296,7 +35354,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28388,24 +30836,36 @@
+@@ -28385,24 +30915,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35341,7 +35399,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28416,7 +30876,7 @@
+@@ -28413,7 +30955,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35350,17 +35408,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,7 +30924,8 @@
+@@ -28461,7 +31003,8 @@
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28474,21 +30935,26 @@
+@@ -28471,21 +31014,26 @@
*-*-solaris*)
;;
*)
@@ -35395,7 +35453,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28496,7 +30962,7 @@
+@@ -28493,7 +31041,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
@@ -35404,7 +35462,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28505,7 +30971,7 @@
+@@ -28502,7 +31050,7 @@
esac
fi
cd ..
@@ -35413,7 +35471,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28549,12 +31015,12 @@
+@@ -28546,12 +31094,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -35430,7 +35488,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28582,8 +31048,8 @@
+@@ -28579,8 +31127,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.
@@ -35441,7 +35499,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28596,40 +31062,52 @@
+@@ -28593,40 +31141,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35506,7 +35564,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28638,14 +31116,15 @@
+@@ -28635,14 +31195,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35515,7 +35573,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35526,7 +35584,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28654,8 +31133,8 @@
+@@ -28651,8 +31212,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -35537,7 +35595,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28689,24 +31168,36 @@
+@@ -28686,24 +31247,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35582,7 +35640,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28715,10 +31206,11 @@
+@@ -28712,10 +31285,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35592,11 +35650,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28727,8 +31219,8 @@
+@@ -28724,8 +31298,8 @@
fi
@@ -35607,7 +35665,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 +31366,8 @@
+@@ -28871,8 +31445,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -35618,7 +35676,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28886,9 +31378,9 @@
+@@ -28883,9 +31457,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -35631,7 +35689,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28900,40 +31392,52 @@
+@@ -28897,40 +31471,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35696,7 +35754,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28942,14 +31446,16 @@
+@@ -28939,14 +31525,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35705,7 +35763,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35717,7 +35775,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28962,8 +31468,8 @@
+@@ -28959,8 +31547,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -35728,7 +35786,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28976,40 +31482,52 @@
+@@ -28973,40 +31561,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35793,7 +35851,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29018,14 +31536,15 @@
+@@ -29015,14 +31615,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35802,7 +35860,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -35813,7 +35871,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29033,8 +31552,8 @@
+@@ -29030,8 +31631,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -35824,7 +35882,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29053,40 +31572,53 @@
+@@ -29050,40 +31651,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35887,11 +35945,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29101,16 +31633,15 @@
+@@ -29098,16 +31712,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -35912,7 +35970,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 +31668,36 @@
+@@ -29134,24 +31747,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35957,7 +36015,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29163,8 +31706,10 @@
+@@ -29160,8 +31785,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35965,11 +36023,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29177,13 +31722,13 @@
+@@ -29174,13 +31801,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35987,7 +36045,7 @@
:
fi
-@@ -29195,16 +31740,15 @@
+@@ -29192,16 +31819,15 @@
case $host_os in
solaris*)
@@ -36008,7 +36066,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 +31775,36 @@
+@@ -29228,24 +31854,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36053,7 +36111,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29257,8 +31813,10 @@
+@@ -29254,8 +31892,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36061,11 +36119,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29271,13 +31829,13 @@
+@@ -29268,13 +31908,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36083,7 +36141,7 @@
:
fi
-@@ -29304,17 +31862,17 @@
+@@ -29301,17 +31941,17 @@
@@ -36107,7 +36165,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29332,21 +31890,21 @@
+@@ -29329,21 +31969,21 @@
fi
@@ -36137,7 +36195,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29365,14 +31923,14 @@
+@@ -29362,14 +32002,14 @@
@@ -36156,7 +36214,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29406,24 +31964,36 @@
+@@ -29403,24 +32043,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36201,7 +36259,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29432,9 +32002,10 @@
+@@ -29429,9 +32081,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36210,11 +36268,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29447,8 +32018,8 @@
+@@ -29444,8 +32097,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -36225,7 +36283,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29468,8 +32039,8 @@
+@@ -29465,8 +32118,8 @@
@@ -36236,7 +36294,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29505,24 +32076,36 @@
+@@ -29502,24 +32155,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36281,7 +36339,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29531,10 +32114,11 @@
+@@ -29528,10 +32193,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36291,11 +36349,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29548,19 +32132,19 @@
+@@ -29545,19 +32211,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -36321,7 +36379,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29593,24 +32177,36 @@
+@@ -29590,24 +32256,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36366,7 +36424,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29619,9 +32215,10 @@
+@@ -29616,9 +32294,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36375,11 +36433,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29631,14 +32228,14 @@
+@@ -29628,14 +32307,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -36400,7 +36458,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29671,24 +32268,36 @@
+@@ -29668,24 +32347,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36445,7 +36503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29697,9 +32306,10 @@
+@@ -29694,9 +32385,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36454,11 +36512,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29709,11 +32319,11 @@
+@@ -29706,11 +32398,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -36474,16 +36532,16 @@
LIBJPEG=
-@@ -29733,7 +32343,7 @@
+@@ -29730,7 +32422,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29736: $i/$j" >&5
-+ echo "configure: 32346: $i/$j" >&5
+- echo "configure: 29733: $i/$j" >&5
++ echo "configure: 32425: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29780,14 +32390,14 @@
+@@ -29777,14 +32469,14 @@
@@ -36501,7 +36559,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29830,8 +32440,8 @@
+@@ -29827,8 +32519,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36512,7 +36570,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29840,8 +32450,8 @@
+@@ -29837,8 +32529,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36523,7 +36581,7 @@
PERL=$kde_cv_path
fi
-@@ -29855,10 +32465,9 @@
+@@ -29852,10 +32544,9 @@
@@ -36536,7 +36594,7 @@
else
if test $kde_qtver = 3; then
-@@ -29868,7 +32477,8 @@
+@@ -29865,7 +32556,8 @@
fi
@@ -36546,7 +36604,7 @@
USING_QT_MT=""
-@@ -29888,13 +32498,13 @@
+@@ -29885,13 +32577,13 @@
else
kde_check_threading_default=yes
fi
@@ -36564,7 +36622,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29966,8 +32576,8 @@
+@@ -29963,8 +32655,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -36575,7 +36633,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 +32586,34 @@
+@@ -29973,34 +32665,34 @@
qt_libraries=""
qt_includes=""
@@ -36622,16 +36680,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30031,7 +32641,7 @@
+@@ -30028,7 +32720,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30034: $i/$j" >&5
-+ echo "configure: 32644: $i/$j" >&5
+- echo "configure: 30031: $i/$j" >&5
++ echo "configure: 32723: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30068,8 +32678,7 @@
+@@ -30065,8 +32757,7 @@
ac_qt_libraries="$qt_libdir"
@@ -36641,7 +36699,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 +32815,13 @@
+@@ -30203,13 +32894,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -36659,7 +36717,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30221,15 +32830,14 @@
+@@ -30218,15 +32909,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -36678,7 +36736,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 +32958,12 @@
+@@ -30347,12 +33037,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -36695,7 +36753,7 @@
fi
-@@ -30393,14 +33001,14 @@
+@@ -30390,14 +33080,14 @@
fi
@@ -36713,7 +36771,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30443,8 +33051,8 @@
+@@ -30440,8 +33130,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36724,7 +36782,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30465,22 +33073,22 @@
+@@ -30462,22 +33152,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36752,7 +36810,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30523,12 +33131,12 @@
+@@ -30520,12 +33210,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36769,7 +36827,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30558,10 +33166,10 @@
+@@ -30555,10 +33245,10 @@
if test $kde_qtver = 3; then
@@ -36783,7 +36841,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30584,22 +33192,22 @@
+@@ -30581,22 +33271,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36813,7 +36871,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30622,13 +33230,13 @@
+@@ -30619,13 +33309,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36831,7 +36889,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30659,15 +33267,14 @@
+@@ -30656,15 +33346,14 @@
if test -n "$LIBJPEG"; then
@@ -36850,7 +36908,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 +33307,36 @@
+@@ -30697,24 +33386,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36895,7 +36953,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30726,9 +33345,10 @@
+@@ -30723,9 +33424,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36904,11 +36962,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30744,12 +33364,12 @@
+@@ -30741,12 +33443,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -36925,7 +36983,7 @@
LIBJPEG_QT=
fi
-@@ -30780,15 +33400,15 @@
+@@ -30777,15 +33479,15 @@
@@ -36947,7 +37005,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30812,11 +33432,11 @@
+@@ -30809,11 +33511,11 @@
@@ -36963,34 +37021,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30868,7 +33488,7 @@
+@@ -30865,7 +33567,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30871: $i/$j" >&5
-+ echo "configure: 33491: $i/$j" >&5
+- echo "configure: 30868: $i/$j" >&5
++ echo "configure: 33570: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30898,7 +33518,7 @@
+@@ -30895,7 +33597,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30901: $i/$j" >&5
-+ echo "configure: 33521: $i/$j" >&5
+- echo "configure: 30898: $i/$j" >&5
++ echo "configure: 33600: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30916,7 +33536,7 @@
+@@ -30913,7 +33615,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30919: $i/$j" >&5
-+ echo "configure: 33539: $i/$j" >&5
+- echo "configure: 30916: $i/$j" >&5
++ echo "configure: 33618: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30975,12 +33595,12 @@
+@@ -30972,12 +33674,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -37007,7 +37065,7 @@
fi
kde_libraries="${libdir}"
-@@ -30989,8 +33609,8 @@
+@@ -30986,8 +33688,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -37018,7 +37076,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31028,8 +33648,8 @@
+@@ -31025,8 +33727,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -37029,7 +37087,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31072,8 +33692,8 @@
+@@ -31069,8 +33771,8 @@
fi
@@ -37040,7 +37098,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31105,10 +33725,9 @@
+@@ -31102,10 +33804,9 @@
@@ -37053,46 +37111,46 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31122,13 +33741,14 @@
+@@ -31119,13 +33820,14 @@
fi
-fi;
+fi
-+
-echo "$as_me:$LINENO: checking for KDE paths" >&5
-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31239,15 +33859,14 @@
+@@ -31236,15 +33938,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
+-
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
-
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
--
- ac_ext=cc
+ ac_ext=cpp
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 +33918,8 @@
+@@ -31296,8 +33997,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -37103,7 +37161,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 +33958,8 @@
+@@ -31336,8 +34037,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -37114,7 +37172,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 +33967,8 @@
+@@ -31345,8 +34046,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -37125,28 +37183,28 @@
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 +34161,14 @@
+@@ -31539,15 +34240,14 @@
else
if test $kde_qtver = 1; then
- echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
--
+ { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
+
- echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-
+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+-
- ac_ext=cc
+ ac_ext=cpp
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 +34220,8 @@
+@@ -31599,8 +34299,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -37157,7 +37215,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 +34260,8 @@
+@@ -31639,8 +34339,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -37168,7 +37226,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 +34269,8 @@
+@@ -31648,8 +34348,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -37179,7 +37237,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 +34362,22 @@
+@@ -31741,22 +34441,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -37208,7 +37266,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31792,14 +34410,14 @@
+@@ -31789,14 +34489,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -37226,7 +37284,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31842,8 +34460,8 @@
+@@ -31839,8 +34539,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37237,7 +37295,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31854,21 +34472,21 @@
+@@ -31851,21 +34551,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37264,7 +37322,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31911,8 +34529,8 @@
+@@ -31908,8 +34608,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37275,7 +37333,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31923,22 +34541,22 @@
+@@ -31920,22 +34620,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37303,7 +37361,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31981,8 +34599,8 @@
+@@ -31978,8 +34678,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37314,7 +37372,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31995,21 +34613,21 @@
+@@ -31992,21 +34692,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37341,7 +37399,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32052,8 +34670,8 @@
+@@ -32049,8 +34749,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37352,7 +37410,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 +34684,22 @@
+@@ -32063,22 +34763,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37380,7 +37438,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32124,12 +34742,12 @@
+@@ -32121,12 +34821,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37397,7 +37455,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32158,14 +34776,14 @@
+@@ -32155,14 +34855,14 @@
if test -n "$kde32ornewer"; then
@@ -37415,7 +37473,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32208,8 +34826,8 @@
+@@ -32205,8 +34905,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37426,7 +37484,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32220,21 +34838,21 @@
+@@ -32217,21 +34917,21 @@
{ (exit 1); exit 1; }; }
else
@@ -37453,7 +37511,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32277,8 +34895,8 @@
+@@ -32274,8 +34974,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37464,7 +37522,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32289,8 +34907,8 @@
+@@ -32286,8 +34986,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37475,7 +37533,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32298,14 +34916,14 @@
+@@ -32295,14 +34995,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -37493,7 +37551,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32348,8 +34966,8 @@
+@@ -32345,8 +35045,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37504,7 +37562,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32360,8 +34978,8 @@
+@@ -32357,8 +35057,8 @@
{ (exit 1); exit 1; }; }
else
@@ -37515,7 +37573,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32369,14 +34987,14 @@
+@@ -32366,14 +35066,14 @@
fi
@@ -37533,7 +37591,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32419,12 +35037,12 @@
+@@ -32416,12 +35116,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37550,16 +37608,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32439,7 +35057,7 @@
+@@ -32436,7 +35136,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32442: $i/$j" >&5
-+ echo "configure: 35060: $i/$j" >&5
+- echo "configure: 32439: $i/$j" >&5
++ echo "configure: 35139: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32605,9 +35223,9 @@
+@@ -32602,9 +35302,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`
@@ -37572,7 +37630,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32629,24 +35247,36 @@
+@@ -32626,24 +35326,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37617,7 +37675,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32655,12 +35285,14 @@
+@@ -32652,12 +35364,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37636,7 +37694,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 +35304,12 @@
+@@ -32669,13 +35383,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -37652,7 +37710,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32686,126 +35317,99 @@
+@@ -32683,126 +35396,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37788,7 +37846,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -37830,7 +37888,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32813,122 +35417,96 @@
+@@ -32810,122 +35496,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37966,7 +38024,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -38004,7 +38062,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32952,24 +35530,36 @@
+@@ -32949,24 +35609,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38049,7 +38107,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32978,9 +35568,10 @@
+@@ -32975,9 +35647,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38062,7 +38120,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -33036,6 +35627,7 @@
+@@ -33033,6 +35706,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -38070,7 +38128,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33055,18 +35647,27 @@
+@@ -33052,18 +35726,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -38104,7 +38162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33079,12 +35680,14 @@
+@@ -33076,12 +35759,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -38122,7 +38180,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33115,18 +35718,19 @@
+@@ -33112,18 +35797,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`
@@ -38150,7 +38208,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33137,24 +35741,36 @@
+@@ -33134,24 +35820,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38195,7 +38253,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33163,15 +35779,16 @@
+@@ -33160,15 +35858,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38218,7 +38276,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33180,8 +35797,13 @@
+@@ -33177,8 +35876,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38234,7 +38292,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33205,9 +35827,10 @@
+@@ -33202,9 +35906,10 @@
ac_header_preproc=no
fi
@@ -38247,7 +38305,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33231,25 +35854,19 @@
+@@ -33228,25 +35933,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;}
@@ -38280,7 +38338,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33266,18 +35883,19 @@
+@@ -33263,18 +35962,19 @@
for ac_header in linux/cdrom.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38308,7 +38366,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33288,24 +35906,36 @@
+@@ -33285,24 +35985,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38353,7 +38411,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33314,15 +35944,16 @@
+@@ -33311,15 +36023,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38376,7 +38434,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33331,8 +35962,13 @@
+@@ -33328,8 +36041,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38392,7 +38450,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33356,9 +35992,10 @@
+@@ -33353,9 +36071,10 @@
ac_header_preproc=no
fi
@@ -38405,7 +38463,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33382,25 +36019,19 @@
+@@ -33379,25 +36098,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;}
@@ -38438,7 +38496,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33418,9 +36049,9 @@
+@@ -33415,9 +36128,9 @@
for ac_func in usleep snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38451,7 +38509,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33446,53 +36077,59 @@
+@@ -33443,53 +36156,59 @@
#undef $ac_func
@@ -38530,7 +38588,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33501,13 +36138,15 @@
+@@ -33498,13 +36217,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38539,7 +38597,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -38550,7 +38608,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 +36156,8 @@
+@@ -33514,8 +36235,8 @@
done
@@ -38561,7 +38619,7 @@
ARCH_TYPE=`uname -m`
if test `uname -s` = "FreeBSD"
-@@ -33531,13 +36170,13 @@
+@@ -33528,13 +36249,13 @@
;;
esac
fi;
@@ -38579,7 +38637,7 @@
as_ver=`echo|as -v 2>&1|grep ".*version.*"`
if test -z "$as_ver"
then
-@@ -33563,16 +36202,16 @@
+@@ -33560,16 +36281,16 @@
fi
fi
fi
@@ -38600,7 +38658,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33596,24 +36235,36 @@
+@@ -33593,24 +36314,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38645,7 +38703,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33622,12 +36273,13 @@
+@@ -33619,12 +36352,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38663,7 +38721,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -33638,8 +36290,8 @@
+@@ -33635,8 +36369,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -38674,7 +38732,7 @@
if test "${ac_cv_x86_sse+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33666,24 +36318,36 @@
+@@ -33663,24 +36397,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38719,7 +38777,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33692,14 +36356,15 @@
+@@ -33689,14 +36435,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38739,7 +38797,7 @@
if test "x$ac_cv_x86_sse" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -33724,8 +36389,8 @@
+@@ -33720,8 +36467,8 @@
@@ -38750,7 +38808,7 @@
if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33737,56 +36402,61 @@
+@@ -33733,56 +36480,61 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
@@ -38834,7 +38892,7 @@
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
-@@ -33795,13 +36465,13 @@
+@@ -33791,13 +36543,13 @@
@@ -38852,7 +38910,7 @@
have_oggvorbis=no
if test "x$with_vorbis" != xno; then
-@@ -33818,8 +36488,8 @@
+@@ -33814,8 +36566,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -38863,7 +38921,7 @@
if test "${ac_cv_lib_ogg_ogg_page_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33832,40 +36502,52 @@
+@@ -33828,40 +36580,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38928,7 +38986,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33874,14 +36556,15 @@
+@@ -33870,14 +36634,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38937,7 +38995,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38948,7 +39006,7 @@
if test $ac_cv_lib_ogg_ogg_page_version = yes; then
:
else
-@@ -33896,8 +36579,7 @@
+@@ -33892,8 +36657,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38958,7 +39016,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 +36589,17 @@
+@@ -33903,17 +36667,17 @@
if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
@@ -38982,7 +39040,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33928,24 +36610,36 @@
+@@ -33924,24 +36688,36 @@
#include <vorbis/vorbisfile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -39027,7 +39085,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33954,15 +36648,16 @@
+@@ -33950,15 +36726,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39050,7 +39108,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33971,8 +36666,13 @@
+@@ -33967,8 +36744,13 @@
/* end confdefs.h. */
#include <vorbis/vorbisfile.h>
_ACEOF
@@ -39066,7 +39124,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33996,9 +36696,10 @@
+@@ -33992,9 +36774,10 @@
ac_header_preproc=no
fi
@@ -39079,7 +39137,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34022,25 +36723,18 @@
+@@ -34018,25 +36801,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;}
@@ -39110,7 +39168,7 @@
fi
if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
-@@ -34068,8 +36762,8 @@
+@@ -34064,8 +36840,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39121,7 +39179,7 @@
if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34082,40 +36776,52 @@
+@@ -34078,40 +36854,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39186,7 +39244,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34124,14 +36830,15 @@
+@@ -34120,14 +36908,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39195,7 +39253,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39206,7 +39264,7 @@
if test $ac_cv_lib_vorbis_vorbis_info_init = yes; then
:
else
-@@ -34151,8 +36858,8 @@
+@@ -34147,8 +36936,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39217,7 +39275,7 @@
if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34165,40 +36872,52 @@
+@@ -34161,40 +36950,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39282,7 +39340,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34207,14 +36926,15 @@
+@@ -34203,14 +37004,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39291,7 +39349,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39302,7 +39360,7 @@
if test $ac_cv_lib_vorbisfile_ov_open = yes; then
:
else
-@@ -34234,8 +36954,8 @@
+@@ -34230,8 +37032,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39313,7 +39371,7 @@
if test "${ac_cv_lib_vorbisenc_vorbis_encode_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34248,40 +36968,52 @@
+@@ -34244,40 +37046,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39378,7 +39436,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34290,14 +37022,15 @@
+@@ -34286,14 +37100,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39387,7 +39445,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39398,7 +39456,7 @@
if test $ac_cv_lib_vorbisenc_vorbis_encode_init = yes; then
:
else
-@@ -34317,8 +37050,8 @@
+@@ -34313,8 +37128,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -39409,7 +39467,7 @@
if test "${ac_cv_lib_vorbis_vorbis_bitrate_addblock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34331,40 +37064,52 @@
+@@ -34327,40 +37142,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39474,7 +39532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34373,14 +37118,15 @@
+@@ -34369,14 +37196,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39483,7 +39541,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39494,7 +39552,7 @@
if test $ac_cv_lib_vorbis_vorbis_bitrate_addblock = yes; then
have_vorbis_value=2
else
-@@ -34449,13 +37195,13 @@
+@@ -34445,13 +37273,13 @@
fi
@@ -39512,7 +39570,7 @@
if test "x$with_ossaudio" != xno; then
-@@ -34466,18 +37212,19 @@
+@@ -34462,18 +37290,19 @@
for ac_header in soundcard.h sys/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39540,7 +39598,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34488,24 +37235,36 @@
+@@ -34484,24 +37313,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39585,7 +39643,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34514,15 +37273,16 @@
+@@ -34510,15 +37351,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39608,7 +39666,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34531,8 +37291,13 @@
+@@ -34527,8 +37369,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39624,7 +39682,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34556,9 +37321,10 @@
+@@ -34552,9 +37399,10 @@
ac_header_preproc=no
fi
@@ -39637,7 +39695,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34582,25 +37348,19 @@
+@@ -34578,25 +37426,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;}
@@ -39670,7 +39728,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34613,8 +37373,8 @@
+@@ -34609,8 +37451,8 @@
done
@@ -39681,7 +39739,7 @@
if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34627,40 +37387,52 @@
+@@ -34623,40 +37465,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -39746,7 +39804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34669,14 +37441,15 @@
+@@ -34665,14 +37519,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39755,7 +39813,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -39766,7 +39824,7 @@
if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
:
else
-@@ -34700,13 +37473,13 @@
+@@ -34696,13 +37551,13 @@
fi
@@ -39784,7 +39842,7 @@
have_alsa=no
if test "x$with_alsa" != xno; then
-@@ -34718,18 +37491,19 @@
+@@ -34714,18 +37569,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -39812,7 +39870,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34740,24 +37514,36 @@
+@@ -34736,24 +37592,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -39857,7 +39915,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34766,15 +37552,16 @@
+@@ -34762,15 +37630,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39880,7 +39938,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34783,8 +37570,13 @@
+@@ -34779,8 +37648,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -39896,7 +39954,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34808,9 +37600,10 @@
+@@ -34804,9 +37678,10 @@
ac_header_preproc=no
fi
@@ -39909,7 +39967,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34834,25 +37627,19 @@
+@@ -34830,25 +37705,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;}
@@ -39942,7 +40000,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34865,8 +37652,8 @@
+@@ -34861,8 +37730,8 @@
done
@@ -39953,7 +40011,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 +37666,52 @@
+@@ -34875,40 +37744,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40018,7 +40076,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34921,14 +37720,15 @@
+@@ -34917,14 +37798,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40027,7 +40085,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40038,7 +40096,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
:
else
-@@ -34937,7 +37737,6 @@
+@@ -34933,7 +37815,6 @@
@@ -40046,7 +40104,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -34975,24 +37774,36 @@
+@@ -34971,24 +37852,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40091,7 +40149,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35001,8 +37812,10 @@
+@@ -34997,8 +37890,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40103,7 +40161,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35034,24 +37847,36 @@
+@@ -35030,24 +37925,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40148,7 +40206,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35060,8 +37885,10 @@
+@@ -35056,8 +37963,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40160,7 +40218,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35093,24 +37920,36 @@
+@@ -35089,24 +37998,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40205,7 +40263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35119,8 +37958,10 @@
+@@ -35115,8 +38036,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40217,7 +40275,7 @@
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -35169,13 +38010,13 @@
+@@ -35165,13 +38088,13 @@
fi
@@ -40235,7 +40293,7 @@
have_cdparanoia=no
if test "x$with_cdparanoia" != xno; then
-@@ -35184,14 +38025,14 @@
+@@ -35180,14 +38103,14 @@
if test -z "$CDPARANOIA"; then
@@ -40253,7 +40311,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35234,12 +38075,12 @@
+@@ -35230,12 +38153,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -40270,7 +40328,7 @@
CDPARANOIA=$kde_cv_path
fi
-@@ -35254,8 +38095,7 @@
+@@ -35250,8 +38173,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40280,7 +40338,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 +38105,17 @@
+@@ -35261,17 +38183,17 @@
if test "${ac_cv_header_cdda_interface_h+set}" = set; then
@@ -40304,7 +40362,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35286,24 +38126,36 @@
+@@ -35282,24 +38204,36 @@
#include <cdda_interface.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40349,7 +40407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35312,15 +38164,16 @@
+@@ -35308,15 +38242,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40372,7 +40430,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35329,8 +38182,13 @@
+@@ -35325,8 +38260,13 @@
/* end confdefs.h. */
#include <cdda_interface.h>
_ACEOF
@@ -40388,7 +40446,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35354,9 +38212,10 @@
+@@ -35350,9 +38290,10 @@
ac_header_preproc=no
fi
@@ -40401,7 +40459,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35380,25 +38239,18 @@
+@@ -35376,25 +38317,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;}
@@ -40432,7 +40490,7 @@
fi
if test $ac_cv_header_cdda_interface_h = yes; then
-@@ -35418,12 +38270,11 @@
+@@ -35414,12 +38348,11 @@
# Older versions of FreeBSD's cdparanoia lack cdrom_drive.cdda_device_name
@@ -40447,7 +40505,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -35451,42 +38302,55 @@
+@@ -35447,42 +38380,55 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40516,7 +40574,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -35504,8 +38368,8 @@
+@@ -35500,8 +38446,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40527,7 +40585,7 @@
if test "${ac_cv_lib_cdda_paranoia_paranoia_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35518,40 +38382,52 @@
+@@ -35514,40 +38460,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40592,7 +40650,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35560,14 +38436,15 @@
+@@ -35556,14 +38514,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40601,7 +40659,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40612,16 +40670,16 @@
if test $ac_cv_lib_cdda_paranoia_paranoia_init = yes; then
:
else
-@@ -35586,7 +38463,7 @@
+@@ -35582,7 +38541,7 @@
do
for j in libcdda_paranoia.$ext;
do
-- echo "configure: 35589: $i/$j" >&5
-+ echo "configure: 38466: $i/$j" >&5
+- echo "configure: 35585: $i/$j" >&5
++ echo "configure: 38544: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_libdir=$i
-@@ -35668,13 +38545,13 @@
+@@ -35664,13 +38623,13 @@
fi
@@ -40639,7 +40697,7 @@
have_lame=no
if test "x$with_lame" != xno; then
-@@ -35685,8 +38562,7 @@
+@@ -35681,8 +38640,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40649,7 +40707,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 +38572,17 @@
+@@ -35692,17 +38650,17 @@
if test "${ac_cv_header_lame_lame_h+set}" = set; then
@@ -40673,7 +40731,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35717,24 +38593,36 @@
+@@ -35713,24 +38671,36 @@
#include <lame/lame.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40718,7 +40776,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35743,15 +38631,16 @@
+@@ -35739,15 +38709,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40741,7 +40799,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35760,8 +38649,13 @@
+@@ -35756,8 +38727,13 @@
/* end confdefs.h. */
#include <lame/lame.h>
_ACEOF
@@ -40757,7 +40815,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35785,9 +38679,10 @@
+@@ -35781,9 +38757,10 @@
ac_header_preproc=no
fi
@@ -40770,7 +40828,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35811,25 +38706,18 @@
+@@ -35807,25 +38784,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;}
@@ -40801,7 +40859,7 @@
fi
if test $ac_cv_header_lame_lame_h = yes; then
-@@ -35857,8 +38745,8 @@
+@@ -35853,8 +38823,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40812,7 +40870,7 @@
if test "${ac_cv_lib_mp3lame_lame_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35871,40 +38759,52 @@
+@@ -35867,40 +38837,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40877,7 +40935,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35913,14 +38813,15 @@
+@@ -35909,14 +38891,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40886,7 +40944,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -40897,7 +40955,7 @@
if test $ac_cv_lib_mp3lame_lame_init = yes; then
:
else
-@@ -35959,13 +38860,13 @@
+@@ -35955,13 +38938,13 @@
@@ -40915,7 +40973,7 @@
have_taglib=no
have_taglib_mpc=no
-@@ -35973,8 +38874,8 @@
+@@ -35969,8 +38952,8 @@
# Extract the first word of "taglib-config", so it can be a program name with args.
set dummy taglib-config; ac_word=$2
@@ -40926,7 +40984,7 @@
if test "${ac_cv_path_TAGLIB_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35990,29 +38891,30 @@
+@@ -35986,29 +38969,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -40963,7 +41021,7 @@
if test "x$TAGLIB_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36032,8 +38934,7 @@
+@@ -36028,8 +39012,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40973,7 +41031,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 +38944,17 @@
+@@ -36039,17 +39022,17 @@
if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
@@ -40997,7 +41055,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36064,24 +38965,36 @@
+@@ -36060,24 +39043,36 @@
#include <taglib/mpcfile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41042,7 +41100,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36090,15 +39003,16 @@
+@@ -36086,15 +39081,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41065,7 +41123,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36107,8 +39021,13 @@
+@@ -36103,8 +39099,13 @@
/* end confdefs.h. */
#include <taglib/mpcfile.h>
_ACEOF
@@ -41081,7 +41139,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36132,9 +39051,10 @@
+@@ -36128,9 +39129,10 @@
ac_header_preproc=no
fi
@@ -41094,7 +41152,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36158,25 +39078,18 @@
+@@ -36154,25 +39156,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;}
@@ -41125,7 +41183,7 @@
fi
if test $ac_cv_header_taglib_mpcfile_h = yes; then
-@@ -36207,21 +39120,21 @@
+@@ -36203,21 +39198,21 @@
fi
@@ -41153,7 +41211,7 @@
if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36237,29 +39150,30 @@
+@@ -36233,29 +39228,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41190,7 +41248,137 @@
if test "x$AKODE_CONFIG" != xno; then
cat >>confdefs.h <<\_ACEOF
-@@ -36287,8 +39201,8 @@
+@@ -36285,8 +39281,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36301,29 +39297,30 @@
+ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
+ ;;
+ esac
+ fi
+ ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
+-
+ if test -n "$ARTSCCONFIG"; then
+- echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
+-echo "${ECHO_T}$ARTSCCONFIG" >&6
++ { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
++echo "${ECHO_T}$ARTSCCONFIG" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
++
+ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+ LIB_ARTS="-lartskde"
+ ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
+@@ -36362,8 +39359,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
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_kde_artsplug_compiles+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36378,29 +39375,30 @@
+ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_kde_artsplug_compiles="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
++IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_kde_artsplug_compiles" && ac_cv_path_kde_artsplug_compiles="no"
+ ;;
+ esac
+ fi
+ kde_artsplug_compiles=$ac_cv_path_kde_artsplug_compiles
+-
+ if test -n "$kde_artsplug_compiles"; then
+- echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
+-echo "${ECHO_T}$kde_artsplug_compiles" >&6
++ { echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
++echo "${ECHO_T}$kde_artsplug_compiles" >&6; }
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
+
++
+ if test x$kde_artsplug_compiles != xno; then
+ ARTSCCONFIG=$kde_artsplug_compiles;
+ kde_artsplug_compiles=yes
+@@ -36409,25 +39407,25 @@
+
+ if test x$kde_artsplug_compiles = xyes; then
+ ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
+- echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
+-echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6
++ { echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
++echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6; }
+
+ ARTSC_LIBS=`${ARTSCCONFIG} --libs`
+- echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
+-echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6
++ { echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
++echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6; }
+
+
+ fi
+
+ if test x$kde_mpeglib_compiles = xno; then
+- echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
+-echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6
++ { echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
++echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6; }
+ kde_artsplug_compiles=no;
+ fi
+
+ if test x$kde_artsplug_compiles = xno; then
+- echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
+-echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6
++ { echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
++echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6; }
+ DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib_artsplug"
+ fi
+
+@@ -36445,8 +39443,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41201,7 +41389,7 @@
if test "${ac_cv_lib_akode_mpeg_decoder_mpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36301,40 +39215,52 @@
+@@ -36459,40 +39457,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41266,7 +41454,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36343,14 +39269,15 @@
+@@ -36501,14 +39511,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41275,7 +41463,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41286,7 +41474,7 @@
if test $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder = yes; then
have_akode_mpeg=yes
else
-@@ -36369,8 +39296,8 @@
+@@ -36527,8 +39538,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41297,7 +41485,7 @@
if test "${ac_cv_lib_akode_mpc_decoder_mpc_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36383,40 +39310,52 @@
+@@ -36541,40 +39552,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41362,7 +41550,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36425,14 +39364,15 @@
+@@ -36583,14 +39606,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41371,7 +41559,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41382,7 +41570,7 @@
if test $ac_cv_lib_akode_mpc_decoder_mpc_decoder = yes; then
have_akode_mpc=yes
else
-@@ -36451,8 +39391,8 @@
+@@ -36609,8 +39633,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41393,7 +41581,7 @@
if test "${ac_cv_lib_akode_xiph_decoder_xiph_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36465,40 +39405,52 @@
+@@ -36623,40 +39647,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41458,7 +41646,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36507,14 +39459,15 @@
+@@ -36665,14 +39701,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41467,7 +41655,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41478,7 +41666,7 @@
if test $ac_cv_lib_akode_xiph_decoder_xiph_decoder = yes; then
have_akode_xiph=yes
else
-@@ -36533,8 +39486,8 @@
+@@ -36691,8 +39728,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41489,7 +41677,7 @@
if test "${ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36547,40 +39500,52 @@
+@@ -36705,40 +39742,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41554,7 +41742,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36589,14 +39554,15 @@
+@@ -36747,14 +39796,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41563,7 +41751,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41574,137 +41762,7 @@
if test $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder = yes; then
have_akode_ffmpeg=yes
else
-@@ -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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -36676,29 +39642,30 @@
- 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
- ;;
- esac
- fi
- ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
--
- if test -n "$ARTSCCONFIG"; then
-- echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
--echo "${ECHO_T}$ARTSCCONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
-+echo "${ECHO_T}$ARTSCCONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
- LIB_ARTS="-lartskde"
- ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_kde_artsplug_compiles+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -36753,29 +39720,30 @@
- 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_kde_artsplug_compiles="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_kde_artsplug_compiles" && ac_cv_path_kde_artsplug_compiles="no"
- ;;
- esac
- fi
- kde_artsplug_compiles=$ac_cv_path_kde_artsplug_compiles
--
- if test -n "$kde_artsplug_compiles"; then
-- echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
--echo "${ECHO_T}$kde_artsplug_compiles" >&6
-+ { echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
-+echo "${ECHO_T}$kde_artsplug_compiles" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- if test x$kde_artsplug_compiles != xno; then
- ARTSCCONFIG=$kde_artsplug_compiles;
- kde_artsplug_compiles=yes
-@@ -36784,25 +39752,25 @@
-
- if test x$kde_artsplug_compiles = xyes; then
- ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
-- echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
--echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6
-+ { echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
-+echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6; }
-
- ARTSC_LIBS=`${ARTSCCONFIG} --libs`
-- echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
--echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6
-+ { echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
-+echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6; }
-
-
- fi
-
- if test x$kde_mpeglib_compiles = xno; then
-- echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
--echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6
-+ { echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
-+echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6; }
- kde_artsplug_compiles=no;
- fi
-
- if test x$kde_artsplug_compiles = xno; then
-- echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
--echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6
-+ { echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
-+echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6; }
- DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib_artsplug"
- fi
-
-@@ -36831,13 +39799,13 @@
+@@ -36828,13 +39878,13 @@
else
kde_check_threading_default=yes
fi
@@ -41722,7 +41780,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36848,17 +39816,17 @@
+@@ -36845,17 +39895,17 @@
@@ -41746,7 +41804,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36873,28 +39841,29 @@
+@@ -36870,28 +39920,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41782,7 +41840,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 +39888,8 @@
+@@ -36916,8 +39967,8 @@
ARTS_BUILD_KDE=""
ARTS_BUILD_KDE_GUI=""
else
@@ -41793,7 +41851,7 @@
arts_datadir="$kde_datadir"
arts_includes="$kde_includes/arts"
-@@ -36951,13 +39920,13 @@
+@@ -36948,13 +39999,13 @@
@@ -41811,7 +41869,7 @@
arts_audiolib_found=no
if test "x$with_audiofile" != xno; then
-@@ -36968,7 +39937,6 @@
+@@ -36965,7 +40016,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
arts_audiolib_found=no
@@ -41819,7 +41877,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -36977,17 +39945,17 @@
+@@ -36974,17 +40024,17 @@
kde_has_audio_lib=no
if test "${ac_cv_header_audiofile_h+set}" = set; then
@@ -41843,7 +41901,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36998,24 +39966,36 @@
+@@ -36995,24 +40045,36 @@
#include <audiofile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41888,7 +41946,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37024,15 +40004,16 @@
+@@ -37021,15 +40083,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41911,7 +41969,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37041,8 +40022,13 @@
+@@ -37038,8 +40101,13 @@
/* end confdefs.h. */
#include <audiofile.h>
_ACEOF
@@ -41927,7 +41985,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37066,9 +40052,10 @@
+@@ -37063,9 +40131,10 @@
ac_header_preproc=no
fi
@@ -41940,7 +41998,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37092,25 +40079,18 @@
+@@ -37089,25 +40158,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;}
@@ -41971,7 +42029,7 @@
fi
if test $ac_cv_header_audiofile_h = yes; then
-@@ -37130,8 +40110,8 @@
+@@ -37127,8 +40189,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41982,7 +42040,7 @@
if test "${ac_cv_lib_audiofile_afOpenFile+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37144,40 +40124,52 @@
+@@ -37141,40 +40203,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42047,7 +42105,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37186,14 +40178,15 @@
+@@ -37183,14 +40257,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42056,7 +42114,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42067,7 +42125,7 @@
if test $ac_cv_lib_audiofile_afOpenFile = yes; then
LIBAUDIOFILE="$LDFLAGS -laudiofile"
-@@ -37235,13 +40228,13 @@
+@@ -37232,13 +40307,13 @@
@@ -42085,7 +42143,7 @@
have_musicbrainz=no
-@@ -37250,8 +40243,7 @@
+@@ -37247,8 +40322,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42095,7 +42153,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 +40253,17 @@
+@@ -37258,17 +40332,17 @@
if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
@@ -42119,7 +42177,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37282,24 +40274,36 @@
+@@ -37279,24 +40353,36 @@
#include <tunepimp/tp_c.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42164,7 +42222,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37308,15 +40312,16 @@
+@@ -37305,15 +40391,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42187,7 +42245,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37325,8 +40330,13 @@
+@@ -37322,8 +40409,13 @@
/* end confdefs.h. */
#include <tunepimp/tp_c.h>
_ACEOF
@@ -42203,7 +42261,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37350,9 +40360,10 @@
+@@ -37347,9 +40439,10 @@
ac_header_preproc=no
fi
@@ -42216,7 +42274,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37376,25 +40387,18 @@
+@@ -37373,25 +40466,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;}
@@ -42247,18 +42305,18 @@
fi
if test $ac_cv_header_tunepimp_tp_c_h = yes; then
-@@ -37419,8 +40423,8 @@
- fi
-
- if test "x$have_musicbrainz" = xyes; then
-- echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
+@@ -37426,8 +40512,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
-echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
++ { echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
+echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6; }
if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37433,40 +40437,52 @@
+@@ -37440,40 +40526,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42323,7 +42381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37475,14 +40491,15 @@
+@@ -37482,14 +40580,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42332,7 +42390,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42341,12 +42399,108 @@
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&5
+echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6; }
if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then
+ v=4
+ fi
+@@ -37507,8 +40606,8 @@
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ ;;
+ esac
+- echo "$as_me:$LINENO: checking for tp_SetTRMCollisionThreshold in -ltunepimp" >&5
+-echo $ECHO_N "checking for tp_SetTRMCollisionThreshold in -ltunepimp... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for tp_SetTRMCollisionThreshold in -ltunepimp" >&5
++echo $ECHO_N "checking for tp_SetTRMCollisionThreshold in -ltunepimp... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37521,40 +40620,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
- cat >>confdefs.h <<\_ACEOF
-@@ -37517,13 +40534,13 @@
+-/* Override any gcc2 internal prototype to avoid an error. */
++/* 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. */
+ #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 tp_SetTRMCollisionThreshold ();
+ int
+ main ()
+ {
+-tp_SetTRMCollisionThreshold ();
++return tp_SetTRMCollisionThreshold ();
+ ;
+ 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
++if { (ac_try="$ac_link"
++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_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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (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); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (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
+@@ -37563,14 +40674,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold=no
++ ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold" >&5
+-echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold" >&5
++echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold" >&6; }
+ if test $ac_cv_lib_tunepimp_tp_SetTRMCollisionThreshold = yes; then
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUSICBRAINZ 4
+@@ -37617,13 +40729,13 @@
+
-# Check whether --with-gstreamer or --without-gstreamer was given.
+# Check whether --with-gstreamer was given.
if test "${with_gstreamer+set}" = set; then
@@ -42361,7 +42515,7 @@
have_gst=no
-@@ -37544,8 +40561,8 @@
+@@ -37644,8 +40756,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
@@ -42372,7 +42526,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37560,28 +40577,29 @@
+@@ -37660,28 +40772,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -42408,7 +42562,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37592,30 +40610,30 @@
+@@ -37692,30 +40805,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -42451,7 +42605,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37654,8 +40672,8 @@
+@@ -37754,8 +40867,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
@@ -42462,7 +42616,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37670,28 +40688,29 @@
+@@ -37770,28 +40883,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -42498,7 +42652,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -37702,30 +40721,30 @@
+@@ -37802,30 +40916,30 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -42541,7 +42695,7 @@
else
GST_CFLAGS=""
GST_LIBS=""
-@@ -37853,13 +40872,13 @@
+@@ -37953,13 +41067,13 @@
@@ -42559,7 +42713,7 @@
have_theora=no
if test "x$with_theora" != xno; then
-@@ -37870,8 +40889,7 @@
+@@ -37970,8 +41084,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42569,7 +42723,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 +40899,17 @@
+@@ -37981,17 +41094,17 @@
if test "${ac_cv_header_theora_theora_h+set}" = set; then
@@ -42593,7 +42747,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37902,24 +40920,36 @@
+@@ -38002,24 +41115,36 @@
#include <theora/theora.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42638,7 +42792,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37928,15 +40958,16 @@
+@@ -38028,15 +41153,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42661,7 +42815,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37945,8 +40976,13 @@
+@@ -38045,8 +41171,13 @@
/* end confdefs.h. */
#include <theora/theora.h>
_ACEOF
@@ -42677,7 +42831,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37970,9 +41006,10 @@
+@@ -38070,9 +41201,10 @@
ac_header_preproc=no
fi
@@ -42690,7 +42844,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37996,25 +41033,18 @@
+@@ -38096,25 +41228,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;}
@@ -42721,7 +42875,7 @@
fi
if test $ac_cv_header_theora_theora_h = yes; then
-@@ -38043,8 +41073,8 @@
+@@ -38143,8 +41268,8 @@
;;
esac
@@ -42732,7 +42886,7 @@
if test "${ac_cv_lib_theora_theora_info_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38057,40 +41087,52 @@
+@@ -38157,40 +41282,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42797,7 +42951,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38099,14 +41141,15 @@
+@@ -38199,14 +41336,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42806,7 +42960,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42817,7 +42971,7 @@
if test $ac_cv_lib_theora_theora_info_init = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTHEORA 1
-@@ -38146,16 +41189,15 @@
+@@ -38246,16 +41384,15 @@
@@ -42838,7 +42992,7 @@
ac_ext=c
-@@ -38169,8 +41211,7 @@
+@@ -38269,8 +41406,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -42848,7 +43002,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 +41221,17 @@
+@@ -38280,17 +41416,17 @@
if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
@@ -42872,7 +43026,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38201,24 +41242,36 @@
+@@ -38301,24 +41437,36 @@
#include <FLAC/metadata.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42917,7 +43071,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38227,15 +41280,16 @@
+@@ -38327,15 +41475,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42940,7 +43094,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38244,8 +41298,13 @@
+@@ -38344,8 +41493,13 @@
/* end confdefs.h. */
#include <FLAC/metadata.h>
_ACEOF
@@ -42956,7 +43110,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38269,9 +41328,10 @@
+@@ -38369,9 +41523,10 @@
ac_header_preproc=no
fi
@@ -42969,7 +43123,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38295,25 +41355,18 @@
+@@ -38395,25 +41550,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;}
@@ -43000,7 +43154,7 @@
fi
if test $ac_cv_header_FLAC_metadata_h = yes; then
-@@ -38327,8 +41380,8 @@
+@@ -38427,8 +41575,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -43011,7 +43165,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 +41394,52 @@
+@@ -38441,40 +41589,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43076,7 +43230,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38383,14 +41448,15 @@
+@@ -38483,14 +41643,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43085,7 +43239,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43096,7 +43250,7 @@
if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
have_libFLAC=yes
fi
-@@ -38429,7 +41495,6 @@
+@@ -38529,7 +41690,6 @@
@@ -43104,7 +43258,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38441,8 +41506,7 @@
+@@ -38541,8 +41701,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43114,7 +43268,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 +41516,17 @@
+@@ -38552,17 +41711,17 @@
if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
@@ -43138,7 +43292,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38473,24 +41537,36 @@
+@@ -38573,24 +41732,36 @@
#include <OggFLAC/seekable_stream_decoder.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43183,7 +43337,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38499,15 +41575,16 @@
+@@ -38599,15 +41770,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43206,7 +43360,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38516,8 +41593,13 @@
+@@ -38616,8 +41788,13 @@
/* end confdefs.h. */
#include <OggFLAC/seekable_stream_decoder.h>
_ACEOF
@@ -43222,7 +43376,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38541,9 +41623,10 @@
+@@ -38641,9 +41818,10 @@
ac_header_preproc=no
fi
@@ -43235,7 +43389,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38567,25 +41650,18 @@
+@@ -38667,25 +41845,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;}
@@ -43266,7 +43420,7 @@
fi
if test $ac_cv_header_OggFLAC_seekable_stream_decoder_h = yes; then
-@@ -38599,8 +41675,8 @@
+@@ -38699,8 +41870,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -43277,7 +43431,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 +41689,52 @@
+@@ -38713,40 +41884,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43342,7 +43496,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38655,14 +41743,15 @@
+@@ -38755,14 +41938,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43351,7 +43505,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43362,7 +43516,7 @@
if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
have_libOggFLAC=yes
fi
-@@ -38705,8 +41794,7 @@
+@@ -38805,8 +41989,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43372,7 +43526,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 +41804,17 @@
+@@ -38816,17 +41999,17 @@
if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
@@ -43396,7 +43550,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38737,24 +41825,36 @@
+@@ -38837,24 +42020,36 @@
#include <libkmid/libkmid.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43441,7 +43595,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38763,15 +41863,16 @@
+@@ -38863,15 +42058,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43464,7 +43618,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38780,8 +41881,13 @@
+@@ -38880,8 +42076,13 @@
/* end confdefs.h. */
#include <libkmid/libkmid.h>
_ACEOF
@@ -43480,7 +43634,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38805,9 +41911,10 @@
+@@ -38905,9 +42106,10 @@
ac_header_preproc=no
fi
@@ -43493,7 +43647,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -38831,25 +41938,18 @@
+@@ -38931,25 +42133,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;}
@@ -43524,7 +43678,7 @@
fi
if test $ac_cv_header_libkmid_libkmid_h = yes; then
-@@ -38877,8 +41977,8 @@
+@@ -38977,8 +42172,8 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE krec"
fi
@@ -43535,7 +43689,7 @@
if test "${ac_cv_lib_cdaudio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38895,30 +41995,42 @@
+@@ -38995,30 +42190,42 @@
int
main ()
{
@@ -43587,7 +43741,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38927,20 +42039,21 @@
+@@ -39027,20 +42234,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43596,7 +43750,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43615,7 +43769,7 @@
if test "${ac_cv_lib_fpe_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38957,30 +42070,42 @@
+@@ -39057,30 +42265,42 @@
int
main ()
{
@@ -43667,7 +43821,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38989,19 +42114,20 @@
+@@ -39089,19 +42309,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43676,7 +43830,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43694,7 +43848,7 @@
if test "${ac_cv_lib_cdrom_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39018,30 +42144,42 @@
+@@ -39118,30 +42339,42 @@
int
main ()
{
@@ -43746,7 +43900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39050,21 +42188,22 @@
+@@ -39150,21 +42383,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43755,7 +43909,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43775,7 +43929,7 @@
if test "${ac_cv_lib_Alib_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39081,30 +42220,42 @@
+@@ -39181,30 +42415,42 @@
int
main ()
{
@@ -43827,7 +43981,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39113,20 +42264,21 @@
+@@ -39213,20 +42459,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43836,7 +43990,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43855,7 +44009,7 @@
if test "${ac_cv_lib_audio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39143,30 +42295,42 @@
+@@ -39243,30 +42490,42 @@
int
main ()
{
@@ -43907,7 +44061,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39175,20 +42339,21 @@
+@@ -39275,20 +42534,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43916,7 +44070,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -43935,7 +44089,7 @@
if test "${ac_cv_lib_mme_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39205,30 +42370,42 @@
+@@ -39305,30 +42565,42 @@
int
main ()
{
@@ -43987,7 +44141,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39237,14 +42414,15 @@
+@@ -39337,14 +42609,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43996,7 +44150,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -44007,7 +44161,7 @@
if test $ac_cv_lib_mme_main = yes; then
LIBMME="-lmme";EXTRAINCS="-I/usr/include/mme"
fi
-@@ -39253,10 +42431,9 @@
+@@ -39353,10 +42626,9 @@
@@ -44020,7 +44174,7 @@
if test $enableval = "no"; then use_kscd_defaults="no"
else use_kscd_defaults="yes"
fi
-@@ -39264,16 +42441,17 @@
+@@ -39364,16 +42636,17 @@
else
use_kscd_defaults="yes"
@@ -44042,7 +44196,7 @@
case "$host" in
*-*-linux*) kscd_compile=yes;;
*-*-*bsdi*) kscd_compile=yes;;
-@@ -39282,8 +42460,8 @@
+@@ -39382,8 +42655,8 @@
*-*-*openbsd*) kscd_compile=yes;;
*) kscd_compile=yes;;
esac
@@ -44053,7 +44207,7 @@
if test "$kscd_compile" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE kscd"
fi
-@@ -39297,14 +42475,13 @@
+@@ -39397,14 +42670,13 @@
fi
@@ -44072,7 +44226,7 @@
if test $withval = yes; then
libwm_with_cdda=yes
else
-@@ -39313,7 +42490,8 @@
+@@ -39413,7 +42685,8 @@
else
libwm_with_cdda=yes
@@ -44082,7 +44236,7 @@
if test "$libwm_with_cdda" = "yes"; then
case $host in
-@@ -39322,18 +42500,19 @@
+@@ -39422,18 +42695,19 @@
for ac_header in pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44110,7 +44264,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39344,24 +42523,36 @@
+@@ -39444,24 +42718,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44155,7 +44309,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39370,15 +42561,16 @@
+@@ -39470,15 +42756,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44178,7 +44332,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39387,8 +42579,13 @@
+@@ -39487,8 +42774,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44194,7 +44348,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39412,9 +42609,10 @@
+@@ -39512,9 +42804,10 @@
ac_header_preproc=no
fi
@@ -44207,7 +44361,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39438,25 +42636,19 @@
+@@ -39538,25 +42831,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;}
@@ -44240,7 +44394,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39504,24 +42696,36 @@
+@@ -39604,24 +42891,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44285,7 +44439,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39530,27 +42734,29 @@
+@@ -39630,27 +42929,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44325,7 +44479,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39561,24 +42767,36 @@
+@@ -39661,24 +42962,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44370,7 +44524,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39587,15 +42805,16 @@
+@@ -39687,15 +43000,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44393,7 +44547,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39604,8 +42823,13 @@
+@@ -39704,8 +43018,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44409,7 +44563,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39629,9 +42853,10 @@
+@@ -39729,9 +43048,10 @@
ac_header_preproc=no
fi
@@ -44422,7 +44576,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39655,25 +42880,19 @@
+@@ -39755,25 +43075,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;}
@@ -44455,7 +44609,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39710,24 +42929,36 @@
+@@ -39810,24 +43124,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44500,7 +44654,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39736,9 +42967,10 @@
+@@ -39836,9 +43162,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44513,7 +44667,7 @@
;;
*)
libwm_with_cdda=no
-@@ -39764,8 +42996,8 @@
+@@ -39864,8 +43191,8 @@
fi
@@ -44524,7 +44678,7 @@
-@@ -39790,18 +43022,19 @@
+@@ -39890,18 +43217,19 @@
for ac_header in pthread.h pthread/mit/pthread.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44552,7 +44706,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39812,24 +43045,36 @@
+@@ -39912,24 +43240,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44597,7 +44751,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39838,15 +43083,16 @@
+@@ -39938,15 +43278,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44620,7 +44774,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39855,8 +43101,13 @@
+@@ -39955,8 +43296,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44636,7 +44790,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39880,9 +43131,10 @@
+@@ -39980,9 +43326,10 @@
ac_header_preproc=no
fi
@@ -44649,7 +44803,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39906,25 +43158,19 @@
+@@ -40006,25 +43353,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;}
@@ -44682,7 +44836,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39941,18 +43187,19 @@
+@@ -40041,18 +43382,19 @@
for ac_header in sys/soundcard.h soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44710,7 +44864,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39963,24 +43210,36 @@
+@@ -40063,24 +43405,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44755,7 +44909,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39989,15 +43248,16 @@
+@@ -40089,15 +43443,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44778,7 +44932,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40006,8 +43266,13 @@
+@@ -40106,8 +43461,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44794,7 +44948,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40031,9 +43296,10 @@
+@@ -40131,9 +43491,10 @@
ac_header_preproc=no
fi
@@ -44807,7 +44961,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -40057,25 +43323,19 @@
+@@ -40157,25 +43518,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;}
@@ -44840,7 +44994,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -40089,8 +43349,8 @@
+@@ -40189,8 +43544,8 @@
@@ -44851,7 +45005,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40116,24 +43376,36 @@
+@@ -40207,7 +43562,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -40216,24 +43572,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44896,7 +45060,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40159,24 +43431,36 @@
+@@ -40259,24 +43627,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44941,7 +45105,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40185,14 +43469,15 @@
+@@ -40285,14 +43665,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44960,7 +45124,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 +43487,11 @@
+@@ -40302,11 +43683,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44976,7 +45140,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -40217,24 +43502,36 @@
+@@ -40317,24 +43698,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45021,7 +45185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40253,8 +43550,10 @@
+@@ -40353,8 +43746,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45033,7 +45197,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40262,27 +43561,41 @@
+@@ -40362,27 +43757,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45082,7 +45246,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40295,13 +43608,16 @@
+@@ -40395,13 +43804,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -45103,7 +45267,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -40325,8 +43641,8 @@
+@@ -40425,8 +43837,8 @@
@@ -45114,7 +45278,7 @@
if test "${ac_cv_c_attribute_aligned+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40348,24 +43664,36 @@
+@@ -40448,24 +43860,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45159,7 +45323,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40374,12 +43702,14 @@
+@@ -40474,12 +43898,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45177,7 +45341,7 @@
if test x"$ac_cv_c_attribute_aligned" != x"0"; then
cat >>confdefs.h <<_ACEOF
-@@ -40402,8 +43732,8 @@
+@@ -40502,8 +43928,8 @@
LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
LIBS="$LIBS $LIB_XEXT -lX11 $X_EXTRA_LIBS"
@@ -45188,7 +45352,7 @@
x11_shared_mem=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40427,24 +43757,36 @@
+@@ -40527,24 +43953,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45233,7 +45397,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40455,10 +43797,12 @@
+@@ -40555,10 +43993,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45249,7 +45413,7 @@
if test x$x11_shared_mem = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40468,8 +43812,8 @@
+@@ -40568,8 +44008,8 @@
fi
@@ -45260,7 +45424,7 @@
x11_dga2=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40491,24 +43835,36 @@
+@@ -40591,24 +44031,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45305,7 +45469,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40519,10 +43875,12 @@
+@@ -40619,10 +44071,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45321,7 +45485,7 @@
if test x$x11_dga2 = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40532,8 +43890,8 @@
+@@ -40632,8 +44086,8 @@
DGALIBS="-lXxf86dga"
fi
@@ -45332,7 +45496,7 @@
x11_xv=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40555,24 +43913,36 @@
+@@ -40655,24 +44109,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45377,7 +45541,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40583,10 +43953,12 @@
+@@ -40683,10 +44149,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45393,7 +45557,7 @@
if test x$x11_xv = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40596,8 +43968,8 @@
+@@ -40696,8 +44164,8 @@
XVLIBS="-lXv"
fi
@@ -45404,7 +45568,7 @@
x11_xvidmode=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -40619,24 +43991,36 @@
+@@ -40719,24 +44187,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45449,7 +45613,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40647,10 +44031,12 @@
+@@ -40747,10 +44227,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45465,7 +45629,7 @@
if test x$x11_xvidmode = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40674,22 +44060,14 @@
+@@ -40774,22 +44256,14 @@
LDFLAGS="$mpg_save_LDFLAGS"
CPPFLAGS="$mpg_save_CPPFLAGS"
@@ -45492,7 +45656,7 @@
-@@ -40714,8 +44092,8 @@
+@@ -40814,8 +44288,8 @@
kde_mpeglib_compiles=yes
;;
*)
@@ -45503,7 +45667,7 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
;;
esac
-@@ -40730,8 +44108,8 @@
+@@ -40830,8 +44304,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -45514,7 +45678,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -40742,9 +44120,9 @@
+@@ -40842,9 +44316,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -45527,7 +45691,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -40756,40 +44134,52 @@
+@@ -40856,40 +44330,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45592,7 +45756,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40798,14 +44188,16 @@
+@@ -40898,14 +44384,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45601,7 +45765,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45613,7 +45777,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -40818,8 +44210,8 @@
+@@ -40918,8 +44406,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -45624,7 +45788,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40832,40 +44224,52 @@
+@@ -40932,40 +44420,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45689,7 +45853,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40874,14 +44278,15 @@
+@@ -40974,14 +44474,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45698,7 +45862,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45709,7 +45873,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -40889,8 +44294,8 @@
+@@ -40989,8 +44490,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -45720,7 +45884,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -40909,40 +44314,53 @@
+@@ -41009,40 +44510,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45783,11 +45947,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -40955,8 +44373,8 @@
+@@ -41055,8 +44569,8 @@
case "$OS_TYPE" in
AIX)
@@ -45798,7 +45962,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_AIX 1
-@@ -40991,8 +44409,8 @@
+@@ -41091,8 +44605,8 @@
;;
NetBSD)
@@ -45809,7 +45973,7 @@
OS_TYPE="BSD"
cat >>confdefs.h <<\_ACEOF
-@@ -41011,8 +44429,8 @@
+@@ -41111,8 +44625,8 @@
;;
IRIX)
@@ -45820,7 +45984,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_IRIX 1
-@@ -41021,8 +44439,8 @@
+@@ -41121,8 +44635,8 @@
;;
HPUX)
@@ -45831,7 +45995,7 @@
cat >>confdefs.h <<\_ACEOF
#define OS_HPUX 1
-@@ -41031,8 +44449,8 @@
+@@ -41131,8 +44645,8 @@
;;
*)
@@ -45842,7 +46006,7 @@
;;
esac
-@@ -41183,9 +44601,9 @@
+@@ -41283,9 +44797,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`
@@ -45855,7 +46019,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41207,24 +44625,36 @@
+@@ -41307,24 +44821,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45900,7 +46064,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41233,12 +44663,14 @@
+@@ -41333,12 +44859,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45919,7 +46083,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 +44682,12 @@
+@@ -41350,13 +44878,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -45935,7 +46099,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41264,126 +44695,99 @@
+@@ -41364,126 +44891,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46071,7 +46235,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -46113,7 +46277,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41391,122 +44795,96 @@
+@@ -41491,122 +44991,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46249,7 +46413,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -46287,7 +46451,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41530,24 +44908,36 @@
+@@ -41630,24 +45104,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46332,7 +46496,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41556,9 +44946,10 @@
+@@ -41656,9 +45142,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46345,7 +46509,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -41614,6 +45005,7 @@
+@@ -41714,6 +45201,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -46353,7 +46517,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -41633,18 +45025,27 @@
+@@ -41733,18 +45221,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -46387,7 +46551,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41657,12 +45058,14 @@
+@@ -41757,12 +45254,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -46405,7 +46569,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41671,8 +45074,8 @@
+@@ -41771,8 +45270,8 @@
fi
@@ -46416,7 +46580,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41696,24 +45099,36 @@
+@@ -41796,24 +45295,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46461,7 +46625,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41722,12 +45137,13 @@
+@@ -41822,12 +45333,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46479,7 +46643,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41744,18 +45160,19 @@
+@@ -41844,18 +45356,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`
@@ -46507,7 +46671,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41766,24 +45183,36 @@
+@@ -41866,24 +45379,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -46552,7 +46716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41792,15 +45221,16 @@
+@@ -41892,15 +45417,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46575,7 +46739,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41809,8 +45239,13 @@
+@@ -41909,8 +45435,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -46591,7 +46755,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -41834,9 +45269,10 @@
+@@ -41934,9 +45465,10 @@
ac_header_preproc=no
fi
@@ -46604,7 +46768,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -41860,25 +45296,19 @@
+@@ -41960,25 +45492,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;}
@@ -46637,7 +46801,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -41894,9 +45324,9 @@
+@@ -41994,9 +45520,9 @@
for ac_func in usleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -46650,7 +46814,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41922,53 +45352,59 @@
+@@ -42022,53 +45548,59 @@
#undef $ac_func
@@ -46729,7 +46893,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41977,13 +45413,15 @@
+@@ -42077,13 +45609,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46738,7 +46902,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -46749,7 +46913,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 +45449,10 @@
+@@ -42111,11 +45645,10 @@
@@ -46764,7 +46928,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 +45483,42 @@
+@@ -42146,30 +45679,42 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46817,7 +46981,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_XSHMGETEVENTBASE 1
-@@ -42081,12 +45530,13 @@
+@@ -42181,12 +45726,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46834,7 +46998,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -42103,8 +45553,8 @@
+@@ -42203,8 +45749,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -46845,7 +47009,7 @@
if test "${ac_cv_lib_xine__x_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42117,40 +45567,52 @@
+@@ -42217,40 +45763,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46910,7 +47074,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42159,14 +45621,15 @@
+@@ -42259,14 +45817,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46919,7 +47083,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -46930,7 +47094,7 @@
if test $ac_cv_lib_xine__x_ao_new_port = yes; then
:
else
-@@ -42181,8 +45644,8 @@
+@@ -42281,8 +45840,8 @@
LDFLAGS="$kde_save_LDFLAGS"
LIBS="$kde_save_LIBS"
@@ -46941,7 +47105,7 @@
if test "${ac_cv_func_ao_new_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42209,53 +45672,59 @@
+@@ -42309,53 +45868,59 @@
#undef ao_new_port
@@ -47020,7 +47184,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42264,49 +45733,50 @@
+@@ -42364,49 +45929,50 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47029,7 +47193,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_ao_new_port" >&5
@@ -47091,7 +47255,7 @@
if test x$xine_config_exec_prefix != x ; then
xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix"
-@@ -42323,13 +45793,13 @@
+@@ -42423,13 +45989,13 @@
min_xine_version=1.0.0
if test "x$enable_xinetest" != "xyes" ; then
@@ -47109,7 +47273,7 @@
if test "${ac_cv_path_XINE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42344,30 +45814,31 @@
+@@ -42444,30 +46010,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -47149,7 +47313,7 @@
no_xine=""
if test "$XINE_CONFIG" = "no" ; then
no_xine=yes
-@@ -42388,7 +45859,6 @@
+@@ -42488,7 +46055,6 @@
CFLAGS="$CFLAGS $XINE_CFLAGS $all_includes"
LIBS="$XINE_LIBS $LIBS $all_libraries"
@@ -47157,7 +47321,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -42473,13 +45943,22 @@
+@@ -42573,13 +46139,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -47184,7 +47348,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42492,19 +45971,21 @@
+@@ -42592,19 +46167,21 @@
( exit $ac_status )
no_xine=yes
fi
@@ -47211,7 +47375,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 +46017,36 @@
+@@ -42636,24 +46213,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47256,7 +47420,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42571,12 +46064,13 @@
+@@ -42671,12 +46260,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47268,11 +47432,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -42602,9 +46096,9 @@
+@@ -42702,9 +46292,9 @@
for ac_func in strsep strpbrk setenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -47285,7 +47449,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42630,53 +46124,59 @@
+@@ -42730,53 +46320,59 @@
#undef $ac_func
@@ -47364,7 +47528,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42685,13 +46185,15 @@
+@@ -42785,13 +46381,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47373,7 +47537,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -47384,7 +47548,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 +46235,8 @@
+@@ -42833,8 +46431,8 @@
fi
for i in $ac_topsubdirs; do
@@ -47395,7 +47559,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -42745,8 +46247,8 @@
+@@ -42845,8 +46443,8 @@
else
install_it="no"
fi
@@ -47406,7 +47570,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -42968,331 +46470,331 @@
+@@ -43068,331 +46666,331 @@
mpeglib_artsplug_SUBDIR_included_FALSE=
fi
@@ -47901,7 +48065,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -43312,39 +46814,58 @@
+@@ -43412,39 +47010,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -47976,7 +48140,7 @@
fi
fi
rm -f confcache
-@@ -43353,38 +46874,31 @@
+@@ -43453,38 +47070,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -48028,7 +48192,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 +47231,35 @@
+@@ -43817,11 +47427,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -48066,7 +48230,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -43730,8 +47268,43 @@
+@@ -43830,8 +47464,43 @@
fi
@@ -48111,7 +48275,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -43745,18 +47318,19 @@
+@@ -43845,18 +47514,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -48134,7 +48298,7 @@
as_basename=basename
else
as_basename=false
-@@ -43764,159 +47338,120 @@
+@@ -43864,159 +47534,120 @@
# Name of the executable.
@@ -48365,7 +48529,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -43925,7 +47460,19 @@
+@@ -44025,7 +47656,19 @@
as_mkdir_p=false
fi
@@ -48386,7 +48550,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 +47481,14 @@
+@@ -44034,31 +47677,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -48418,11 +48582,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.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -43966,30 +47496,20 @@
+@@ -44066,30 +47692,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -48461,7 +48625,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -44016,19 +47536,21 @@
+@@ -44097,7 +47713,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -44116,19 +47732,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -48473,7 +48646,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.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -48489,7 +48662,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -44039,39 +47561,24 @@
+@@ -44139,39 +47757,24 @@
do
case $1 in
--*=*)
@@ -48535,7 +48708,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -44081,18 +47588,24 @@
+@@ -44181,18 +47784,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -48565,7 +48738,7 @@
esac
shift
-@@ -44108,201 +47621,213 @@
+@@ -44208,201 +47817,213 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -48953,7 +49126,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 +47839,817 @@
+@@ -44414,625 +48035,817 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -49266,14 +49439,6 @@
-s, at AKODE_CONFIG@,$AKODE_CONFIG,;t t
-s, at akode_includes@,$akode_includes,;t t
-s, at akode_libs@,$akode_libs,;t t
--s, at include_akode_mpeg_TRUE@,$include_akode_mpeg_TRUE,;t t
--s, at include_akode_mpeg_FALSE@,$include_akode_mpeg_FALSE,;t t
--s, at include_akode_mpc_TRUE@,$include_akode_mpc_TRUE,;t t
--s, at include_akode_mpc_FALSE@,$include_akode_mpc_FALSE,;t t
--s, at include_akode_xiph_TRUE@,$include_akode_xiph_TRUE,;t t
--s, at include_akode_xiph_FALSE@,$include_akode_xiph_FALSE,;t t
--s, at include_akode_ffmpeg_TRUE@,$include_akode_ffmpeg_TRUE,;t t
--s, at include_akode_ffmpeg_FALSE@,$include_akode_ffmpeg_FALSE,;t t
-s, at LIB_ARTS@,$LIB_ARTS,;t t
-s, at ARTS_CFLAGS@,$ARTS_CFLAGS,;t t
-s, at MPEGLIB_ARTS_MAJOR_VERSION@,$MPEGLIB_ARTS_MAJOR_VERSION,;t t
@@ -49283,6 +49448,14 @@
-s, at kde_artsplug_compiles@,$kde_artsplug_compiles,;t t
-s, at ARTSC_INCLUDE@,$ARTSC_INCLUDE,;t t
-s, at ARTSC_LIBS@,$ARTSC_LIBS,;t t
+-s, at include_akode_mpeg_TRUE@,$include_akode_mpeg_TRUE,;t t
+-s, at include_akode_mpeg_FALSE@,$include_akode_mpeg_FALSE,;t t
+-s, at include_akode_mpc_TRUE@,$include_akode_mpc_TRUE,;t t
+-s, at include_akode_mpc_FALSE@,$include_akode_mpc_FALSE,;t t
+-s, at include_akode_xiph_TRUE@,$include_akode_xiph_TRUE,;t t
+-s, at include_akode_xiph_FALSE@,$include_akode_xiph_FALSE,;t t
+-s, at include_akode_ffmpeg_TRUE@,$include_akode_ffmpeg_TRUE,;t t
+-s, at include_akode_ffmpeg_FALSE@,$include_akode_ffmpeg_FALSE,;t t
-s, at arts_datadir@,$arts_datadir,;t t
-s, at arts_includes@,$arts_includes,;t t
-s, at arts_libraries@,$arts_libraries,;t t
@@ -49778,14 +49951,6 @@
+AKODE_CONFIG!$AKODE_CONFIG$ac_delim
+akode_includes!$akode_includes$ac_delim
+akode_libs!$akode_libs$ac_delim
-+include_akode_mpeg_TRUE!$include_akode_mpeg_TRUE$ac_delim
-+include_akode_mpeg_FALSE!$include_akode_mpeg_FALSE$ac_delim
-+include_akode_mpc_TRUE!$include_akode_mpc_TRUE$ac_delim
-+include_akode_mpc_FALSE!$include_akode_mpc_FALSE$ac_delim
-+include_akode_xiph_TRUE!$include_akode_xiph_TRUE$ac_delim
-+include_akode_xiph_FALSE!$include_akode_xiph_FALSE$ac_delim
-+include_akode_ffmpeg_TRUE!$include_akode_ffmpeg_TRUE$ac_delim
-+include_akode_ffmpeg_FALSE!$include_akode_ffmpeg_FALSE$ac_delim
+LIB_ARTS!$LIB_ARTS$ac_delim
+ARTS_CFLAGS!$ARTS_CFLAGS$ac_delim
+MPEGLIB_ARTS_MAJOR_VERSION!$MPEGLIB_ARTS_MAJOR_VERSION$ac_delim
@@ -49795,6 +49960,14 @@
+kde_artsplug_compiles!$kde_artsplug_compiles$ac_delim
+ARTSC_INCLUDE!$ARTSC_INCLUDE$ac_delim
+ARTSC_LIBS!$ARTSC_LIBS$ac_delim
++include_akode_mpeg_TRUE!$include_akode_mpeg_TRUE$ac_delim
++include_akode_mpeg_FALSE!$include_akode_mpeg_FALSE$ac_delim
++include_akode_mpc_TRUE!$include_akode_mpc_TRUE$ac_delim
++include_akode_mpc_FALSE!$include_akode_mpc_FALSE$ac_delim
++include_akode_xiph_TRUE!$include_akode_xiph_TRUE$ac_delim
++include_akode_xiph_FALSE!$include_akode_xiph_FALSE$ac_delim
++include_akode_ffmpeg_TRUE!$include_akode_ffmpeg_TRUE$ac_delim
++include_akode_ffmpeg_FALSE!$include_akode_ffmpeg_FALSE$ac_delim
+arts_datadir!$arts_datadir$ac_delim
+arts_includes!$arts_includes$ac_delim
+arts_libraries!$arts_libraries$ac_delim
@@ -50335,7 +50508,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -44940,248 +48657,130 @@
+@@ -45040,248 +48853,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -50685,7 +50858,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -45192,135 +48791,39 @@
+@@ -45292,135 +48987,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -50847,7 +51020,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 +48833,29 @@
+@@ -45430,18 +49029,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
@@ -50885,7 +51058,7 @@
else
continue
fi
-@@ -45363,49 +48877,76 @@
+@@ -45463,49 +49073,76 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -50989,7 +51162,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 +48957,10 @@
+@@ -45516,11 +49153,10 @@
fi
fi
;;
@@ -51007,14 +51180,14 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.5.5") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -1287,12 +1289,6 @@
+@@ -1296,12 +1298,6 @@
AC_MSG_RESULT($OS_TYPE)
INTELCPPFLAG=
@@ -58172,8 +58345,8 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+-KDE_DIST=Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list