rev 4583 - trunk/packages/arts/debian/patches
Pierre Habouzit
madcoder at costa.debian.org
Tue Oct 3 21:04:30 UTC 2006
Author: madcoder
Date: 2006-10-03 21:04:25 +0000 (Tue, 03 Oct 2006)
New Revision: 4583
Modified:
trunk/packages/arts/debian/patches/98_buildprep.diff
Log:
build-preping arts
Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/arts/debian/patches/98_buildprep.diff 2006-10-03 20:59:41 UTC (rev 4582)
+++ trunk/packages/arts/debian/patches/98_buildprep.diff 2006-10-03 21:04:25 UTC (rev 4583)
@@ -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,11 +8827,26 @@
+@@ -8727,11 +8824,26 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1479,7 +1479,7 @@
# When large executables or shared objects are built, AIX ld can
# have problems creating the table of contents. If linking a library
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1488,7 +1488,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
@@ -1501,7 +1501,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
@@ -1522,7 +1522,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"
@@ -1538,7 +1538,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,16 +8925,26 @@
+@@ -8806,16 +8922,26 @@
# -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'
@@ -1570,7 +1570,7 @@
chorus*)
case $cc_basename in
*)
-@@ -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'
@@ -1585,7 +1585,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~
@@ -1719,7 +1719,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
;;
@@ -1736,7 +1736,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
@@ -1752,7 +1752,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.
@@ -1766,7 +1766,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,33 +9109,22 @@
+@@ -8969,33 +9106,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1807,7 +1807,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1834,7 +1834,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
@@ -1854,7 +1854,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,25 @@
;;
esac
;;
@@ -1882,7 +1882,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
@@ -1894,7 +1894,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)=:
;;
@@ -1915,7 +1915,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'
;;
@@ -1966,7 +1966,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
@@ -1975,7 +1975,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
;;
esac
;;
@@ -1984,7 +1984,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::"'
;;
@@ -2018,7 +2018,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'
;;
@@ -2036,7 +2036,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}\*'
@@ -2045,7 +2045,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
@@ -2061,7 +2061,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'
;;
@@ -2083,7 +2083,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}\*'
@@ -2092,7 +2092,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
;;
@@ -2122,7 +2122,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
@@ -2171,7 +2171,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'
;;
@@ -2183,7 +2183,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
@@ -2195,7 +2195,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.
@@ -2207,7 +2207,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
;;
@@ -2273,7 +2273,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)
@@ -2282,7 +2282,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2291,7 +2291,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.
@@ -2300,7 +2300,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,7 @@
fi
;;
@@ -2309,7 +2309,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
@@ -2348,7 +2348,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
@@ -2366,7 +2366,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.
@@ -2375,7 +2375,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
;;
@@ -2388,7 +2388,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])
@@ -2397,7 +2397,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)
@@ -2406,7 +2406,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
@@ -2435,7 +2435,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)
@@ -2444,7 +2444,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2453,7 +2453,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
@@ -2470,7 +2470,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
@@ -2485,7 +2485,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) | \
@@ -2494,7 +2494,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.
@@ -2508,7 +2508,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
@@ -2521,7 +2521,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
@@ -2531,7 +2531,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
@@ -2540,7 +2540,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").
@@ -2549,7 +2549,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)
@@ -2558,7 +2558,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.
@@ -2570,7 +2570,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]]*\)'
@@ -2580,7 +2580,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'"
;;
@@ -2613,7 +2613,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'*)
@@ -2633,7 +2633,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)=
;;
@@ -2644,7 +2644,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.
@@ -2653,7 +2653,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2685,7 +2685,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
@@ -2714,7 +2714,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,13 @@
;;
esac
;;
@@ -2729,7 +2729,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
;;
@@ -2761,7 +2761,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
@@ -2792,7 +2792,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*)
;;
@@ -2819,7 +2819,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
@@ -2834,7 +2834,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2843,7 +2843,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
;;
esac
;;
@@ -2859,7 +2859,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2871,7 +2871,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.
@@ -2880,7 +2880,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
;;
@@ -2897,7 +2897,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.
@@ -2906,7 +2906,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2929,7 +2929,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'
;;
@@ -2951,7 +2951,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2960,7 +2960,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
;;
@@ -2978,7 +2978,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
@@ -2987,7 +2987,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
@@ -3004,7 +3004,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3016,7 +3016,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)=
@@ -3025,7 +3025,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=
@@ -3035,7 +3035,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
;;
@@ -3046,7 +3046,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}'
@@ -3074,7 +3074,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
@@ -3083,7 +3083,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'
@@ -3100,7 +3100,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~
@@ -3177,7 +3177,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
@@ -3220,7 +3220,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
@@ -3252,7 +3252,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
@@ -3261,7 +3261,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
@@ -3285,7 +3285,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
@@ -3294,7 +3294,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
@@ -3307,7 +3307,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
@@ -3349,7 +3349,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'
@@ -3366,7 +3366,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3375,7 +3375,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)=' '
@@ -3491,7 +3491,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3502,7 +3502,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
@@ -3511,7 +3511,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'
;;
@@ -3598,7 +3598,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
@@ -3607,7 +3607,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
;;
@@ -3616,7 +3616,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
@@ -3626,7 +3626,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'
;;
*)
@@ -3635,7 +3635,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
@@ -3652,7 +3652,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}\*'
@@ -3668,7 +3668,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)=:
;;
@@ -3694,7 +3694,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]].*) ;;
@@ -3715,7 +3715,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.
@@ -3724,7 +3724,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
;;
@@ -3791,7 +3791,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
@@ -3803,7 +3803,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
@@ -3819,7 +3819,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
@@ -3979,7 +3979,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,
@@ -4669,19 +4669,53 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,301 @@
+@@ -430,42 +720,326 @@
+ # 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"
@@ -5175,9 +5209,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; }; };;
@@ -5187,15 +5227,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; }; };;
@@ -5592,7 +5626,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,
@@ -5611,7 +5645,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 $@
@@ -7006,7 +7040,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2718,46 +3400,70 @@
+@@ -2718,47 +3400,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.
@@ -7060,7 +7094,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
@@ -7097,16 +7131,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
-@@ -2770,19 +3476,23 @@
+
+@@ -2770,19 +3482,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
@@ -7130,7 +7169,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2801,22 +3511,27 @@
+@@ -2801,22 +3515,27 @@
fi
fi
fi
@@ -7170,7 +7209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2827,9 +3542,8 @@
+@@ -2827,9 +3546,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7181,7 +7220,7 @@
break;;
* ) break;;
esac
-@@ -2843,14 +3557,14 @@
+@@ -2843,14 +3561,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7200,7 +7239,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2870,14 +3584,20 @@
+@@ -2870,14 +3588,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7225,7 +7264,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2895,12 +3615,12 @@
+@@ -2895,12 +3619,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7242,7 +7281,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2923,24 +3643,36 @@
+@@ -2923,24 +3647,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7287,7 +7326,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2949,24 +3681,28 @@
+@@ -2949,24 +3685,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7324,7 +7363,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -2982,24 +3718,36 @@
+@@ -2982,24 +3722,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7369,7 +7408,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3008,285 +3756,278 @@
+@@ -3008,285 +3760,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7832,7 +7871,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3295,8 +4036,8 @@
+@@ -3295,8 +4040,8 @@
depcc="$CC" am_compiler_list=
@@ -7843,7 +7882,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3385,8 +4126,8 @@
+@@ -3385,8 +4130,8 @@
fi
fi
@@ -7854,7 +7893,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3408,8 +4149,8 @@
+@@ -3408,8 +4153,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
@@ -7865,7 +7904,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3443,8 +4184,13 @@
+@@ -3443,8 +4188,13 @@
#endif
Syntax error
_ACEOF
@@ -7881,7 +7920,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3469,9 +4215,10 @@
+@@ -3469,9 +4219,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7893,7 +7932,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3481,8 +4228,13 @@
+@@ -3481,8 +4232,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7909,7 +7948,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3509,6 +4261,7 @@
+@@ -3509,6 +4265,7 @@
ac_preproc_ok=:
break
fi
@@ -7917,7 +7956,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3526,8 +4279,8 @@
+@@ -3526,8 +4283,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7928,7 +7967,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3550,8 +4303,13 @@
+@@ -3550,8 +4307,13 @@
#endif
Syntax error
_ACEOF
@@ -7944,7 +7983,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3576,9 +4334,10 @@
+@@ -3576,9 +4338,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7956,7 +7995,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3588,8 +4347,13 @@
+@@ -3588,8 +4351,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7972,7 +8011,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3616,6 +4380,7 @@
+@@ -3616,6 +4384,7 @@
ac_preproc_ok=:
break
fi
@@ -7980,7 +8019,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3666,18 +4431,22 @@
+@@ -3666,18 +4435,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8008,7 +8047,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3690,36 +4459,38 @@
+@@ -3690,36 +4463,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8055,7 +8094,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3732,55 +4503,85 @@
+@@ -3732,55 +4507,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8159,7 +8198,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3803,24 +4604,36 @@
+@@ -3803,24 +4608,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8204,7 +8243,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3829,24 +4642,28 @@
+@@ -3829,24 +4646,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8241,7 +8280,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3862,24 +4679,36 @@
+@@ -3862,24 +4683,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8286,7 +8325,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3888,70 +4717,53 @@
+@@ -3888,70 +4721,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8381,7 +8420,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3960,61 +4772,91 @@
+@@ -3960,61 +4776,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8495,7 +8534,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4023,8 +4865,8 @@
+@@ -4023,8 +4869,8 @@
depcc="$CXX" am_compiler_list=
@@ -8506,7 +8545,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4113,8 +4955,8 @@
+@@ -4113,8 +4959,8 @@
fi
fi
@@ -8517,7 +8556,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4132,8 +4974,8 @@
+@@ -4132,8 +4978,8 @@
@@ -8528,7 +8567,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4158,24 +5000,36 @@
+@@ -4158,24 +5004,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8573,7 +8612,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4184,13 +5038,14 @@
+@@ -4184,13 +5042,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8592,7 +8631,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4232,17 +5087,16 @@
+@@ -4232,17 +5091,16 @@
fi
fi
@@ -8614,7 +8653,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'
-@@ -4270,24 +5124,36 @@
+@@ -4270,24 +5128,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8659,7 +8698,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4296,8 +5162,10 @@
+@@ -4296,8 +5166,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8667,11 +8706,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
-@@ -4310,29 +5178,28 @@
+@@ -4310,29 +5182,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8709,7 +8748,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'
-@@ -4359,24 +5226,36 @@
+@@ -4359,24 +5230,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8754,7 +8793,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4385,8 +5264,10 @@
+@@ -4385,8 +5268,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8762,11 +8801,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
-@@ -4399,13 +5280,13 @@
+@@ -4399,13 +5284,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8784,7 +8823,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4426,16 +5307,15 @@
+@@ -4426,16 +5311,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8805,7 +8844,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'
-@@ -4462,24 +5342,36 @@
+@@ -4462,24 +5346,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8850,7 +8889,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4488,8 +5380,10 @@
+@@ -4488,8 +5384,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8858,11 +8897,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
-@@ -4502,16 +5396,16 @@
+@@ -4502,16 +5400,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8883,7 +8922,7 @@
:
fi
-@@ -4526,16 +5420,15 @@
+@@ -4526,16 +5424,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"
@@ -8904,7 +8943,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'
-@@ -4562,24 +5455,36 @@
+@@ -4562,24 +5459,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8949,7 +8988,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4588,8 +5493,10 @@
+@@ -4588,8 +5497,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8957,11 +8996,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
-@@ -4602,27 +5509,26 @@
+@@ -4602,27 +5513,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8996,7 +9035,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4647,24 +5553,36 @@
+@@ -4647,24 +5557,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9041,7 +9080,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4673,8 +5591,10 @@
+@@ -4673,8 +5595,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9049,11 +9088,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
-@@ -4687,13 +5607,13 @@
+@@ -4687,13 +5611,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9071,7 +9110,7 @@
:
fi
-@@ -4701,16 +5621,15 @@
+@@ -4701,16 +5625,15 @@
;;
esac
@@ -9092,7 +9131,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'
-@@ -4737,24 +5656,36 @@
+@@ -4737,24 +5660,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9137,7 +9176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4763,8 +5694,10 @@
+@@ -4763,8 +5698,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9145,11 +9184,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
-@@ -4777,28 +5710,27 @@
+@@ -4777,28 +5714,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9186,7 +9225,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'
-@@ -4825,24 +5757,36 @@
+@@ -4825,24 +5761,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9231,7 +9270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4851,8 +5795,10 @@
+@@ -4851,8 +5799,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9239,11 +9278,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
-@@ -4865,28 +5811,27 @@
+@@ -4865,28 +5815,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9280,7 +9319,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'
-@@ -4913,24 +5858,36 @@
+@@ -4913,24 +5862,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9325,7 +9364,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4939,8 +5896,10 @@
+@@ -4939,8 +5900,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9333,11 +9372,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
-@@ -4953,13 +5912,13 @@
+@@ -4953,13 +5916,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9355,7 +9394,7 @@
:
fi
-@@ -4971,13 +5930,13 @@
+@@ -4971,13 +5934,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9373,7 +9412,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -4985,16 +5944,15 @@
+@@ -4985,16 +5948,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9394,7 +9433,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'
-@@ -5021,24 +5979,36 @@
+@@ -5021,24 +5983,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9439,7 +9478,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5047,8 +6017,10 @@
+@@ -5047,8 +6021,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9447,11 +9486,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
-@@ -5061,13 +6033,13 @@
+@@ -5061,13 +6037,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9469,7 +9508,7 @@
:
fi
-@@ -5079,16 +6051,15 @@
+@@ -5079,16 +6055,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9490,7 +9529,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'
-@@ -5115,24 +6086,36 @@
+@@ -5115,24 +6090,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9535,7 +9574,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5141,8 +6124,10 @@
+@@ -5141,8 +6128,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9543,11 +9582,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
-@@ -5155,28 +6140,27 @@
+@@ -5155,28 +6144,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9584,7 +9623,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'
-@@ -5203,24 +6187,36 @@
+@@ -5203,24 +6191,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9629,7 +9668,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5229,8 +6225,10 @@
+@@ -5229,8 +6229,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9637,11 +9676,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
-@@ -5243,28 +6241,27 @@
+@@ -5243,28 +6245,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9678,7 +9717,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'
-@@ -5291,24 +6288,36 @@
+@@ -5291,24 +6292,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9723,7 +9762,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5317,8 +6326,10 @@
+@@ -5317,8 +6330,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9731,11 +9770,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
-@@ -5331,28 +6342,27 @@
+@@ -5331,28 +6346,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9772,7 +9811,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'
-@@ -5379,24 +6389,36 @@
+@@ -5379,24 +6393,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9817,7 +9856,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5405,8 +6427,10 @@
+@@ -5405,8 +6431,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9825,11 +9864,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
-@@ -5419,13 +6443,13 @@
+@@ -5419,13 +6447,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9847,7 +9886,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5433,37 +6457,37 @@
+@@ -5433,37 +6461,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -9899,7 +9938,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5495,24 +6519,36 @@
+@@ -5495,24 +6523,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9944,7 +9983,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5521,18 +6557,19 @@
+@@ -5521,18 +6561,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9954,7 +9993,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"
@@ -9968,7 +10007,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5552,16 +6589,15 @@
+@@ -5552,16 +6593,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -9989,7 +10028,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'
-@@ -5588,24 +6624,36 @@
+@@ -5588,24 +6628,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10034,7 +10073,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5614,8 +6662,10 @@
+@@ -5614,8 +6666,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10042,11 +10081,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
-@@ -5628,29 +6678,28 @@
+@@ -5628,29 +6682,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10084,7 +10123,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'
-@@ -5677,24 +6726,36 @@
+@@ -5677,24 +6730,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10129,7 +10168,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5703,8 +6764,10 @@
+@@ -5703,8 +6768,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10137,11 +10176,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
-@@ -5717,28 +6780,27 @@
+@@ -5717,28 +6784,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10178,7 +10217,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'
-@@ -5765,24 +6827,36 @@
+@@ -5765,24 +6831,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10223,7 +10262,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5791,8 +6865,10 @@
+@@ -5791,8 +6869,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10231,11 +10270,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
-@@ -5805,28 +6881,27 @@
+@@ -5805,28 +6885,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10272,7 +10311,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'
-@@ -5853,24 +6928,36 @@
+@@ -5853,24 +6932,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10317,7 +10356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5879,8 +6966,10 @@
+@@ -5879,8 +6970,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10325,11 +10364,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
-@@ -5893,28 +6982,27 @@
+@@ -5893,28 +6986,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10366,7 +10405,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'
-@@ -5941,24 +7029,36 @@
+@@ -5941,24 +7033,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10411,7 +10450,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5967,8 +7067,10 @@
+@@ -5967,8 +7071,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10419,11 +10458,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
-@@ -5981,28 +7083,27 @@
+@@ -5981,28 +7087,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10460,7 +10499,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'
-@@ -6029,24 +7130,36 @@
+@@ -6029,24 +7134,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10505,7 +10544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6055,8 +7168,10 @@
+@@ -6055,8 +7172,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10513,11 +10552,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
-@@ -6069,13 +7184,13 @@
+@@ -6069,13 +7188,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10535,7 +10574,7 @@
:
fi
-@@ -6182,13 +7297,13 @@
+@@ -6182,13 +7301,13 @@
fi
@@ -10552,7 +10591,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6218,8 +7333,13 @@
+@@ -6218,8 +7337,13 @@
#endif
Syntax error
_ACEOF
@@ -10568,7 +10607,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6244,9 +7364,10 @@
+@@ -6244,9 +7368,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10580,7 +10619,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6256,8 +7377,13 @@
+@@ -6256,8 +7381,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10596,7 +10635,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6284,6 +7410,7 @@
+@@ -6284,6 +7414,7 @@
ac_preproc_ok=:
break
fi
@@ -10604,7 +10643,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6301,8 +7428,8 @@
+@@ -6301,8 +7432,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10615,7 +10654,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6325,8 +7452,13 @@
+@@ -6325,8 +7456,13 @@
#endif
Syntax error
_ACEOF
@@ -10631,7 +10670,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6351,9 +7483,10 @@
+@@ -6351,9 +7487,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10643,7 +10682,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6363,8 +7496,13 @@
+@@ -6363,8 +7500,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10659,7 +10698,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6391,6 +7529,7 @@
+@@ -6391,6 +7533,7 @@
ac_preproc_ok=:
break
fi
@@ -10667,7 +10706,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6417,16 +7556,15 @@
+@@ -6417,16 +7560,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -10688,7 +10727,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'
-@@ -6453,24 +7591,36 @@
+@@ -6453,24 +7595,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10733,7 +10772,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6479,8 +7629,10 @@
+@@ -6479,8 +7633,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10741,11 +10780,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
-@@ -6493,22 +7645,21 @@
+@@ -6493,22 +7649,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10774,7 +10813,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6524,36 +7675,36 @@
+@@ -6524,36 +7679,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -10821,7 +10860,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'
-@@ -6580,24 +7731,36 @@
+@@ -6580,24 +7735,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10866,7 +10905,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6606,8 +7769,10 @@
+@@ -6606,8 +7773,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10874,11 +10913,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
-@@ -6620,29 +7785,28 @@
+@@ -6620,29 +7789,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10916,7 +10955,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'
-@@ -6669,24 +7833,36 @@
+@@ -6669,24 +7837,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10961,7 +11000,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6695,8 +7871,10 @@
+@@ -6695,8 +7875,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10969,11 +11008,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
-@@ -6709,13 +7887,13 @@
+@@ -6709,13 +7891,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10991,7 +11030,7 @@
:
fi
-@@ -6725,13 +7903,13 @@
+@@ -6725,13 +7907,13 @@
@@ -11009,7 +11048,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6744,13 +7922,13 @@
+@@ -6744,13 +7926,13 @@
@@ -11027,7 +11066,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6761,253 +7939,73 @@
+@@ -6761,229 +7943,49 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11110,9 +11149,14 @@
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-fi
--fi
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+ if test "$kde_use_nmcheck" = "yes"; then
+ KDE_USE_NMCHECK_TRUE=""
+ KDE_USE_NMCHECK_FALSE="#"
@@ -11121,11 +11165,6 @@
+ KDE_USE_NMCHECK_FALSE=""
+ 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__%'`
@@ -11142,6 +11181,7 @@
-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'
+
+ case $enable_ltdl_convenience in
+ no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+echo "$as_me: error: this package needs a convenience libltdl" >&2;}
@@ -11154,7 +11194,6 @@
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
-
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11163,28 +11202,6 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# 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
-int
-main ()
@@ -11296,30 +11313,23 @@
-
-
-# Check whether --enable-shared or --disable-shared was given.
--if test "${enable_shared+set}" = set; then
++# 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
++ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+@@ -7002,12 +8004,12 @@
+ esac
+ else
+ enable_shared=yes
-fi;
++fi
-# Check whether --enable-static or --disable-static was given.
++
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -11328,7 +11338,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7026,7 +8024,8 @@
+@@ -7026,18 +8028,19 @@
esac
else
enable_static=no
@@ -11338,23 +11348,22 @@
-@@ -7035,11 +8034,11 @@
- 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
-@@ -7060,8 +8059,8 @@
+@@ -7058,8 +8061,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11365,7 +11374,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7077,14 +8076,13 @@
+@@ -7075,14 +8078,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11384,7 +11393,7 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7103,10 +8101,11 @@
+@@ -7101,10 +8103,11 @@
esac
else
enable_fast_install=yes
@@ -11399,7 +11408,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7130,7 +8129,7 @@
+@@ -7128,7 +8131,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
@@ -11408,7 +11417,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7159,37 +8158,184 @@
+@@ -7157,37 +8160,184 @@
fi
SED=$lt_cv_path_SED
@@ -11610,7 +11619,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7218,11 +8364,11 @@
+@@ -7216,11 +8366,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11626,7 +11635,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7235,7 +8381,7 @@
+@@ -7233,7 +8383,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,
@@ -11635,7 +11644,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'*)
-@@ -7255,21 +8401,21 @@
+@@ -7253,21 +8403,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11664,7 +11673,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7279,29 +8425,38 @@
+@@ -7277,29 +8427,38 @@
;;
esac
fi
@@ -11711,7 +11720,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7309,56 +8464,63 @@
+@@ -7307,56 +8466,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -11809,7 +11818,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7385,44 +8547,36 @@
+@@ -7383,44 +8549,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -11864,7 +11873,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7438,7 +8592,7 @@
+@@ -7436,7 +8594,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -11873,7 +11882,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
-@@ -7454,43 +8608,27 @@
+@@ -7452,43 +8610,27 @@
esac
;;
@@ -11930,7 +11939,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
-@@ -7509,32 +8647,22 @@
+@@ -7507,32 +8649,22 @@
;;
openbsd*)
@@ -11966,7 +11975,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]'
-@@ -7555,17 +8683,20 @@
+@@ -7553,17 +8685,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11990,7 +11999,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
-@@ -7574,14 +8705,17 @@
+@@ -7572,14 +8707,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12011,16 +12020,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7608,7 +8742,7 @@
+@@ -7606,7 +8744,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7611 "configure"' > conftest.$ac_ext
-+ echo '#line 8745 "configure"' > conftest.$ac_ext
+- echo '#line 7609 "configure"' > conftest.$ac_ext
++ echo '#line 8747 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7651,14 +8785,13 @@
+@@ -7649,14 +8787,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12037,7 +12046,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7670,7 +8803,6 @@
+@@ -7668,7 +8805,6 @@
esac
;;
*64-bit*)
@@ -12045,7 +12054,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7695,8 +8827,8 @@
+@@ -7693,8 +8829,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12056,7 +12065,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7722,24 +8854,36 @@
+@@ -7720,24 +8856,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12101,7 +12110,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7748,9 +8892,10 @@
+@@ -7746,9 +8894,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12110,11 +12119,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'
-@@ -7759,13 +8904,33 @@
+@@ -7757,13 +8906,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12150,7 +12159,7 @@
esac
-@@ -7773,8 +8938,8 @@
+@@ -7771,8 +8940,8 @@
@@ -12161,7 +12170,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7798,24 +8963,36 @@
+@@ -7796,24 +8965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12206,7 +12215,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7824,9 +9001,10 @@
+@@ -7822,9 +9003,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12219,7 +12228,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7882,6 +9060,7 @@
+@@ -7880,6 +9062,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12227,7 +12236,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7901,18 +9080,27 @@
+@@ -7899,18 +9082,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12261,7 +12270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7925,12 +9113,14 @@
+@@ -7923,12 +9115,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12279,7 +12288,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7953,9 +9143,9 @@
+@@ -7951,9 +9145,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12292,7 +12301,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -7969,24 +9159,36 @@
+@@ -7967,24 +9161,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12337,7 +12346,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7995,12 +9197,14 @@
+@@ -7993,12 +9199,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12356,7 +12365,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8015,18 +9219,19 @@
+@@ -8013,18 +9221,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12384,7 +12393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8037,24 +9242,36 @@
+@@ -8035,24 +9244,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12429,7 +12438,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8063,15 +9280,16 @@
+@@ -8061,15 +9282,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12452,7 +12461,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8080,8 +9298,13 @@
+@@ -8078,8 +9300,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12468,7 +12477,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8105,9 +9328,10 @@
+@@ -8103,9 +9330,10 @@
ac_header_preproc=no
fi
@@ -12481,7 +12490,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8131,25 +9355,19 @@
+@@ -8129,25 +9357,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;}
@@ -12514,64 +12523,12 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8161,239 +9379,558 @@
+@@ -8159,17 +9381,278 @@
done
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--if test -n "$ac_tool_prefix"; then
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-- do
-- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_F77+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$F77"; then
-- ac_cv_prog_F77="$F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
-
--fi
--fi
--F77=$ac_cv_prog_F77
--if test -n "$F77"; then
-- echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-
-- test -n "$F77" && break
-- done
--fi
--if test -z "$F77"; then
-- ac_ct_F77=$F77
-- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++
++
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
@@ -12584,88 +12541,21 @@
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$ac_ct_F77"; then
-- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
- do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_F77="$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_F77=$ac_cv_prog_ac_ct_F77
--if test -n "$ac_ct_F77"; then
-- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
-- test -n "$ac_ct_F77" && break
--done
--
-- F77=$ac_ct_F77
--fi
--
--
--# Provide some information about the compiler.
--echo "$as_me:8256:" \
-- "checking for Fortran 77 compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--rm -f a.out
--
--# If we don't use `.F' as extension, the preprocessor is not run on the
--# input file. (Note that this only needs to work for GNU compilers.)
--ac_save_ext=$ac_ext
--ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
--if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-- program main
--#ifndef __GNUC__
-- choke me
++ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
@@ -12675,14 +12565,9 @@
+# include <limits.h>
+#else
+# include <assert.h>
- #endif
--
-- end
++#endif
+ Syntax error
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
++_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12690,26 +12575,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_compiler_gnu=yes
++ 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -12722,43 +12592,21 @@
+fi
+if test -z "$ac_cpp_err"; then
+ :
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ # Broken: fails on valid input.
+continue
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
--fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
--ac_ext=$ac_save_ext
--ac_test_FFLAGS=${FFLAGS+set}
--ac_save_FFLAGS=$FFLAGS
--FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_f77_g+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- FFLAGS=-g
--cat >conftest.$ac_ext <<_ACEOF
-- program main
++fi
++
+rm -f conftest.err conftest.$ac_ext
-
-- end
++
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
++_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
@@ -12771,26 +12619,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_f77_g=yes
++ 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -12804,34 +12637,15 @@
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_f77_g=no
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ # Passes both tests.
+ac_preproc_ok=:
+break
- 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
-- 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"
-- else
-- FFLAGS="-g"
-- fi
--else
-- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-- FFLAGS="-O2"
-- else
-- FFLAGS=
-- fi
++fi
++
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -12839,12 +12653,8 @@
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
- fi
-
--G77=`test $ac_compiler_gnu = yes && echo yes`
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++fi
++
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
@@ -12978,97 +12788,104 @@
+
+fi
+
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$F77"; then
-+ ac_cv_prog_F77="$F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8182,36 +9665,38 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+IFS=$as_save_IFS
-+
-+fi
-+fi
-+F77=$ac_cv_prog_F77
-+if test -n "$F77"; then
+
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+- echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+ { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
-+else
+ 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
+ fi
+
+
-+
-+ test -n "$F77" && break
-+ done
-+fi
-+if test -z "$F77"; then
-+ ac_ct_F77=$F77
+ test -n "$F77" && break
+ done
+ fi
+ if test -z "$F77"; then
+ ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_F77"; then
-+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8224,48 +9709,78 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_F77="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_F77=$ac_cv_prog_ac_ct_F77
-+if test -n "$ac_ct_F77"; then
+
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
-+else
+ 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
+ fi
+
+
-+
-+ test -n "$ac_ct_F77" && break
-+done
-+
+ test -n "$ac_ct_F77" && break
+ done
+
+- F77=$ac_ct_F77
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
@@ -13084,12 +12901,16 @@
+esac
+ F77=$ac_ct_F77
+ fi
-+fi
-+
-+
-+# Provide some information about the compiler.
+ fi
+
+
+ # Provide some information about the compiler.
+-echo "$as_me:8254:" \
+- "checking for Fortran 77 compiler version" >&5
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13097,9 +12918,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13107,9 +12930,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13117,29 +12942,26 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+rm -f a.out
-+
-+# If we don't use `.F' as extension, the preprocessor is not run on the
-+# input file. (Note that this only needs to work for GNU compilers.)
-+ac_save_ext=$ac_ext
-+ac_ext=F
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+@@ -8275,8 +9790,8 @@
+ # input file. (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8289,24 +9804,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13147,12 +12969,16 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13160,49 +12986,55 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { (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
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8315,20 +9842,21 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
+ ac_compiler_gnu=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-+ac_ext=$ac_save_ext
-+ac_test_FFLAGS=${FFLAGS+set}
-+ac_save_FFLAGS=$FFLAGS
-+FFLAGS=
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_f77_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ FFLAGS=-g
-+cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8339,24 +9867,36 @@
+ end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13210,12 +13042,16 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13223,56 +13059,41 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+ { (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
-+ ac_cv_prog_f77_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -8365,13 +9905,14 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_f77_g=no
+ ac_cv_prog_f77_g=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+{ 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
-+elif test $ac_cv_prog_f77_g = yes; then
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+ FFLAGS="-g -O2"
-+ else
-+ FFLAGS="-g"
-+ fi
-+else
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+ FFLAGS="-O2"
-+ else
-+ FFLAGS=
-+ fi
-+fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-@@ -8402,13 +9939,13 @@
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8400,13 +9941,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13289,11 +13110,27 @@
case $build_os in
msdosdjgpp*)
-@@ -8437,20 +9974,70 @@
+@@ -8435,23 +9976,73 @@
lt_cv_sys_max_cmd_len=8192;
;;
- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # 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.
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
@@ -13344,29 +13181,27 @@
+ fi
+ ;;
+ *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
-- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
++ # If test is not a shell built-in, we'll probably end up computing a
++ # maximum length that is only half of the actual maximum length, but
++ # we can't tell.
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
-- testring=$testring$testring
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
+ teststring=$teststring$teststring
- done
-- testring=
++ done
+ teststring=
- # 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.
-@@ -8461,19 +10048,19 @@
++ # 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.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ ;;
+ esac
+@@ -8459,19 +10050,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13392,7 +13227,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8487,9 +10074,6 @@
+@@ -8485,9 +10076,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13402,7 +13237,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'"
-@@ -8511,14 +10095,30 @@
+@@ -8509,14 +10097,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'"
;;
@@ -13435,7 +13270,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8536,14 +10136,17 @@
+@@ -8534,14 +10138,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13455,7 +13290,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8661,15 +10264,15 @@
+@@ -8659,15 +10266,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
@@ -13477,7 +13312,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8683,8 +10286,8 @@
+@@ -8681,8 +10288,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13488,7 +13323,7 @@
objdir=$lt_cv_objdir
-@@ -8705,7 +10308,7 @@
+@@ -8703,7 +10310,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13497,7 +13332,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8725,7 +10328,7 @@
+@@ -8723,7 +10330,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13506,7 +13341,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8735,8 +10338,8 @@
+@@ -8733,8 +10340,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
@@ -13517,7 +13352,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8749,32 +10352,34 @@
+@@ -8747,32 +10354,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13559,7 +13394,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8787,27 +10392,41 @@
+@@ -8785,27 +10394,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13608,7 +13443,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8815,8 +10434,8 @@
+@@ -8813,8 +10436,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
@@ -13619,7 +13454,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8829,32 +10448,34 @@
+@@ -8827,32 +10450,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13661,7 +13496,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8867,27 +10488,41 @@
+@@ -8865,27 +10490,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13710,7 +13545,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8895,8 +10530,8 @@
+@@ -8893,8 +10532,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
@@ -13721,7 +13556,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8909,32 +10544,34 @@
+@@ -8907,32 +10546,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13763,7 +13598,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8947,27 +10584,41 @@
+@@ -8945,27 +10586,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13812,7 +13647,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -8982,6 +10633,7 @@
+@@ -8980,6 +10635,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -13820,7 +13655,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9001,21 +10653,32 @@
+@@ -8999,21 +10655,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -13857,7 +13692,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9035,7 +10698,7 @@
+@@ -9033,7 +10700,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13866,7 +13701,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
-@@ -9067,17 +10730,17 @@
+@@ -9065,17 +10732,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13890,7 +13725,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9097,7 +10760,7 @@
+@@ -9095,7 +10762,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13899,7 +13734,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
-@@ -9129,11 +10792,11 @@
+@@ -9127,11 +10794,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13915,7 +13750,7 @@
fi
else
-@@ -9148,21 +10811,21 @@
+@@ -9146,21 +10813,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -13944,7 +13779,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9192,68 +10855,25 @@
+@@ -9190,68 +10857,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14028,7 +13863,7 @@
## CAVEAT EMPTOR:
-@@ -9267,8 +10887,8 @@
+@@ -9265,8 +10889,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14039,7 +13874,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9282,26 +10902,28 @@
+@@ -9280,26 +10904,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 \
@@ -14047,13 +13882,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:9288: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10908: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9286: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10910: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9292: \$? = $ac_status" >&5
-+ echo "$as_me:10912: \$? = $ac_status" >&5
+- echo "$as_me:9290: \$? = $ac_status" >&5
++ echo "$as_me:10914: \$? = $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
@@ -14075,7 +13910,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"
-@@ -9315,8 +10937,8 @@
+@@ -9313,8 +10939,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14086,7 +13921,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9354,6 +10976,11 @@
+@@ -9352,6 +10978,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14098,7 +13933,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9370,7 +10997,7 @@
+@@ -9368,7 +10999,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14107,7 +13942,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9396,6 +11023,16 @@
+@@ -9394,6 +11025,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14124,7 +13959,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9407,7 +11044,7 @@
+@@ -9405,7 +11046,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.
@@ -14133,7 +13968,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9430,13 +11067,20 @@
+@@ -9428,13 +11069,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14156,7 +13991,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9451,15 +11095,15 @@
+@@ -9449,15 +11097,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14178,7 +14013,7 @@
;;
sunos4*)
-@@ -9468,7 +11112,7 @@
+@@ -9466,7 +11114,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14187,7 +14022,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9481,6 +11125,17 @@
+@@ -9479,6 +11127,17 @@
fi
;;
@@ -14205,7 +14040,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9492,16 +11147,16 @@
+@@ -9490,16 +11149,16 @@
esac
fi
@@ -14226,7 +14061,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9515,26 +11170,28 @@
+@@ -9513,26 +11172,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 \
@@ -14234,13 +14069,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:9521: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11176: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9519: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11178: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9525: \$? = $ac_status" >&5
-+ echo "$as_me:11180: \$? = $ac_status" >&5
+- echo "$as_me:9523: \$? = $ac_status" >&5
++ echo "$as_me:11182: \$? = $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
@@ -14262,7 +14097,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9547,7 +11204,7 @@
+@@ -9545,7 +11206,7 @@
fi
fi
@@ -14271,7 +14106,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9557,8 +11214,50 @@
+@@ -9555,8 +11216,50 @@
;;
esac
@@ -14324,7 +14159,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9569,60 +11268,58 @@
+@@ -9567,60 +11270,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14345,13 +14180,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:9588: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11280: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9586: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11282: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9592: \$? = $ac_status" >&5
-+ echo "$as_me:11284: \$? = $ac_status" >&5
+- echo "$as_me:9590: \$? = $ac_status" >&5
++ echo "$as_me:11286: \$? = $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
@@ -14403,7 +14238,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;}
-@@ -9632,8 +11329,8 @@
+@@ -9630,8 +11331,8 @@
need_locks=no
fi
@@ -14414,7 +14249,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9671,6 +11368,16 @@
+@@ -9669,6 +11370,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14431,7 +14266,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9681,6 +11388,10 @@
+@@ -9679,6 +11390,10 @@
with_gnu_ld=no
fi
;;
@@ -14442,7 +14277,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9691,6 +11402,27 @@
+@@ -9689,6 +11404,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14470,7 +14305,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9728,7 +11460,7 @@
+@@ -9726,7 +11462,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14479,7 +14314,7 @@
else
ld_shlibs=no
fi
-@@ -9738,13 +11470,13 @@
+@@ -9736,13 +11472,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'
@@ -14496,7 +14331,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
-@@ -9753,23 +11485,70 @@
+@@ -9751,23 +11487,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14572,7 +14407,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9783,13 +11562,40 @@
+@@ -9781,13 +11564,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14615,7 +14450,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9799,24 +11605,19 @@
+@@ -9797,24 +11607,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14647,7 +14482,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9828,7 +11629,7 @@
+@@ -9826,7 +11631,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14656,7 +14491,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9850,9 +11651,21 @@
+@@ -9848,9 +11653,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
@@ -14680,7 +14515,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9869,7 +11682,7 @@
+@@ -9867,7 +11684,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -14689,7 +14524,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`
-@@ -9888,8 +11701,12 @@
+@@ -9886,8 +11703,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -14702,7 +14537,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9897,22 +11714,23 @@
+@@ -9895,22 +11716,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -14733,7 +14568,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9928,24 +11746,36 @@
+@@ -9926,24 +11748,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14778,7 +14613,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9959,19 +11789,20 @@
+@@ -9957,19 +11791,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14786,7 +14621,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
@@ -14804,7 +14639,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9990,24 +11821,36 @@
+@@ -9988,24 +11823,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14849,7 +14684,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10021,8 +11864,10 @@
+@@ -10019,8 +11866,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14857,11 +14692,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
-@@ -10031,13 +11876,11 @@
+@@ -10029,13 +11878,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -14878,7 +14713,7 @@
fi
fi
;;
-@@ -10050,7 +11893,7 @@
+@@ -10048,7 +11895,7 @@
ld_shlibs=no
;;
@@ -14887,7 +14722,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10060,13 +11903,13 @@
+@@ -10058,13 +11905,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -14904,7 +14739,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.
-@@ -10076,52 +11919,52 @@
+@@ -10074,52 +11921,52 @@
;;
darwin* | rhapsody*)
@@ -14997,7 +14832,7 @@
fi
;;
-@@ -10155,8 +11998,8 @@
+@@ -10153,8 +12000,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15008,7 +14843,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10164,7 +12007,7 @@
+@@ -10162,7 +12009,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15017,7 +14852,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
-@@ -10178,47 +12021,62 @@
+@@ -10176,47 +12023,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15104,7 +14939,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10232,7 +12090,7 @@
+@@ -10230,7 +12092,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15113,7 +14948,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'
-@@ -10242,7 +12100,7 @@
+@@ -10240,7 +12102,7 @@
link_all_deplibs=yes
;;
@@ -15122,7 +14957,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10265,7 +12123,8 @@
+@@ -10263,7 +12125,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
@@ -15132,7 +14967,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10275,7 +12134,7 @@
+@@ -10273,7 +12136,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15141,7 +14976,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10286,14 +12145,14 @@
+@@ -10284,14 +12147,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15158,7 +14993,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'
-@@ -10305,13 +12164,13 @@
+@@ -10303,13 +12166,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15174,7 +15009,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10319,21 +12178,15 @@
+@@ -10317,21 +12180,15 @@
hardcode_libdir_separator=:
;;
@@ -15200,7 +15035,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'
-@@ -10342,8 +12195,18 @@
+@@ -10340,8 +12197,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15221,7 +15056,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10352,7 +12215,7 @@
+@@ -10350,7 +12217,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.
@@ -15230,7 +15065,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10400,36 +12263,45 @@
+@@ -10398,36 +12265,45 @@
fi
;;
@@ -15297,7 +15132,7 @@
;;
uts4*)
-@@ -10444,15 +12316,10 @@
+@@ -10442,15 +12318,10 @@
esac
fi
@@ -15315,7 +15150,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10470,8 +12337,8 @@
+@@ -10468,8 +12339,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.
@@ -15326,7 +15161,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10485,6 +12352,7 @@
+@@ -10483,6 +12354,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15334,7 +15169,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10507,20 +12375,20 @@
+@@ -10505,20 +12377,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15360,7 +15195,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10530,7 +12398,20 @@
+@@ -10528,7 +12400,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15382,7 +15217,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10595,7 +12476,7 @@
+@@ -10593,7 +12478,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15391,7 +15226,7 @@
;;
beos*)
-@@ -10604,7 +12485,7 @@
+@@ -10602,7 +12487,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15400,7 +15235,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10620,7 +12501,7 @@
+@@ -10618,7 +12503,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15409,7 +15244,7 @@
need_version=no
need_lib_prefix=no
-@@ -10632,7 +12513,8 @@
+@@ -10630,7 +12515,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15419,7 +15254,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10662,7 +12544,7 @@
+@@ -10660,7 +12546,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15428,7 +15263,7 @@
;;
esac
;;
-@@ -10685,7 +12567,7 @@
+@@ -10683,7 +12569,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15437,7 +15272,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"`
-@@ -10708,20 +12590,17 @@
+@@ -10706,20 +12592,17 @@
dynamic_linker=no
;;
@@ -15469,7 +15304,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10739,14 +12618,19 @@
+@@ -10737,14 +12620,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15491,7 +15326,7 @@
esac
;;
-@@ -10766,9 +12650,9 @@
+@@ -10764,9 +12652,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15503,7 +15338,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10783,7 +12667,7 @@
+@@ -10781,7 +12669,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15512,7 +15347,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10794,7 +12678,7 @@
+@@ -10792,7 +12680,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15521,7 +15356,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10806,6 +12690,18 @@
+@@ -10804,6 +12692,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15540,7 +15375,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10849,29 +12745,26 @@
+@@ -10847,29 +12747,26 @@
;;
# This must be Linux ELF.
@@ -15577,7 +15412,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,
-@@ -10881,6 +12774,18 @@
+@@ -10879,6 +12776,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15596,7 +15431,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10890,7 +12795,7 @@
+@@ -10888,7 +12797,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15605,7 +15440,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10918,8 +12823,13 @@
+@@ -10916,8 +12825,13 @@
openbsd*)
version_type=sunos
@@ -15620,7 +15455,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
-@@ -10939,7 +12849,7 @@
+@@ -10937,7 +12851,7 @@
os2*)
libname_spec='$name'
@@ -15629,7 +15464,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10957,13 +12867,6 @@
+@@ -10955,13 +12869,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15643,7 +15478,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -10989,7 +12892,7 @@
+@@ -10987,7 +12894,7 @@
need_version=yes
;;
@@ -15652,7 +15487,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'
-@@ -11022,6 +12925,29 @@
+@@ -11020,6 +12927,29 @@
fi
;;
@@ -15682,7 +15517,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11033,16 +12959,21 @@
+@@ -11031,16 +12961,21 @@
dynamic_linker=no
;;
esac
@@ -15710,7 +15545,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11062,8 +12993,8 @@
+@@ -11060,8 +12995,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -15721,7 +15556,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11076,29 +13007,29 @@
+@@ -11074,29 +13009,29 @@
striplib=
old_striplib=
@@ -15761,7 +15596,7 @@
;;
esac
fi
-@@ -11130,8 +13061,8 @@
+@@ -11128,8 +13063,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -15772,7 +15607,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11144,40 +13075,52 @@
+@@ -11142,40 +13077,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15837,7 +15672,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11186,14 +13129,15 @@
+@@ -11184,14 +13131,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15846,7 +15681,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
@@ -15857,7 +15692,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11207,8 +13151,8 @@
+@@ -11205,8 +13153,8 @@
;;
*)
@@ -15868,7 +15703,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11235,53 +13179,59 @@
+@@ -11233,53 +13181,59 @@
#undef shl_load
@@ -15947,7 +15782,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11290,18 +13240,19 @@
+@@ -11288,18 +13242,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15956,7 +15791,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
@@ -15973,7 +15808,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11314,40 +13265,52 @@
+@@ -11312,40 +13267,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16038,7 +15873,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11356,19 +13319,20 @@
+@@ -11354,19 +13321,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16047,7 +15882,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
@@ -16065,7 +15900,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11395,53 +13359,59 @@
+@@ -11393,53 +13361,59 @@
#undef dlopen
@@ -16144,7 +15979,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11450,18 +13420,19 @@
+@@ -11448,18 +13422,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16153,7 +15988,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
@@ -16170,7 +16005,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11474,40 +13445,52 @@
+@@ -11472,40 +13447,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16235,7 +16070,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11516,19 +13499,20 @@
+@@ -11514,19 +13501,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16244,7 +16079,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
@@ -16262,7 +16097,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11541,40 +13525,52 @@
+@@ -11539,40 +13527,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16327,7 +16162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11583,19 +13579,20 @@
+@@ -11581,19 +13581,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16336,7 +16171,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
@@ -16354,7 +16189,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11608,40 +13605,52 @@
+@@ -11606,40 +13607,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16419,7 +16254,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11650,14 +13659,15 @@
+@@ -11648,14 +13661,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16428,7 +16263,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
@@ -16439,7 +16274,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11692,13 +13702,13 @@
+@@ -11690,13 +13704,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16456,16 +16291,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11708,7 +13718,7 @@
+@@ -11706,7 +13720,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11711 "configure"
-+#line 13721 "configure"
+-#line 11709 "configure"
++#line 13723 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11765,6 +13775,8 @@
+@@ -11763,6 +13777,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16474,7 +16309,7 @@
exit (status);
}
-@@ -11774,12 +13786,12 @@
+@@ -11772,12 +13788,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16489,7 +16324,7 @@
esac
else :
# compilation failed
-@@ -11790,13 +13802,13 @@
+@@ -11788,13 +13804,13 @@
fi
@@ -16508,16 +16343,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11806,7 +13818,7 @@
+@@ -11804,7 +13820,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11809 "configure"
-+#line 13821 "configure"
+-#line 11807 "configure"
++#line 13823 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11863,6 +13875,8 @@
+@@ -11861,6 +13877,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16526,7 +16361,7 @@
exit (status);
}
-@@ -11872,12 +13886,12 @@
+@@ -11870,12 +13888,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16541,7 +16376,7 @@
esac
else :
# compilation failed
-@@ -11888,8 +13902,8 @@
+@@ -11886,8 +13904,8 @@
fi
@@ -16552,7 +16387,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11910,19 +13924,19 @@
+@@ -11908,19 +13926,19 @@
fi
@@ -16580,7 +16415,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11931,58 +13945,21 @@
+@@ -11929,58 +13947,21 @@
fi
;;
@@ -16646,7 +16481,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -11997,7 +13974,8 @@
+@@ -11995,7 +13976,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.
@@ -16656,7 +16491,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 \
-@@ -12111,11 +14089,11 @@
+@@ -12109,11 +14091,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16670,7 +16505,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12145,6 +14123,12 @@
+@@ -12143,6 +14125,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16683,7 +16518,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12156,6 +14140,9 @@
+@@ -12154,6 +14142,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -16693,7 +16528,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12175,7 +14162,7 @@
+@@ -12173,7 +14164,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -16702,7 +16537,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12206,7 +14193,7 @@
+@@ -12204,7 +14195,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -16711,7 +16546,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12221,7 +14208,7 @@
+@@ -12219,7 +14210,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -16720,7 +16555,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12448,7 +14435,10 @@
+@@ -12446,7 +14437,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.
@@ -16732,7 +16567,7 @@
fi
-@@ -12461,11 +14451,11 @@
+@@ -12459,11 +14453,11 @@
CC="$lt_save_CC"
@@ -16748,7 +16583,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12483,6 +14473,9 @@
+@@ -12481,6 +14475,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -16758,7 +16593,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12513,8 +14506,10 @@
+@@ -12511,8 +14508,10 @@
case $tagname in
CXX)
@@ -16771,7 +16606,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'
-@@ -12533,6 +14528,7 @@
+@@ -12531,6 +14530,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -16779,7 +16614,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12550,7 +14546,7 @@
+@@ -12548,7 +14548,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -16788,7 +16623,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12560,17 +14556,34 @@
+@@ -12558,17 +14558,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -16824,7 +16659,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12581,18 +14594,27 @@
+@@ -12579,18 +14596,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -16855,7 +16690,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12606,18 +14628,18 @@
+@@ -12604,18 +14630,18 @@
# Set up default GNU C++ configuration
@@ -16880,7 +16715,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12646,11 +14668,11 @@
+@@ -12644,11 +14670,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16896,7 +16731,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12663,7 +14685,7 @@
+@@ -12661,7 +14687,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,
@@ -16905,7 +16740,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'*)
-@@ -12683,21 +14705,21 @@
+@@ -12681,21 +14707,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -16934,7 +16769,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12707,8 +14729,8 @@
+@@ -12705,8 +14731,8 @@
;;
esac
fi
@@ -16945,7 +16780,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12716,8 +14738,8 @@
+@@ -12714,8 +14740,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
@@ -16956,7 +16791,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12743,7 +14765,7 @@
+@@ -12741,7 +14767,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.
@@ -16965,7 +16800,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12758,8 +14780,8 @@
+@@ -12756,8 +14782,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -16976,7 +16811,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12774,8 +14796,23 @@
+@@ -12772,8 +14798,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17002,7 +16837,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12792,7 +14829,7 @@
+@@ -12790,7 +14831,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17011,7 +16846,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`
-@@ -12811,8 +14848,12 @@
+@@ -12809,8 +14850,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17024,7 +16859,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12821,15 +14862,16 @@
+@@ -12819,15 +14864,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17045,7 +16880,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.
-@@ -12851,24 +14893,36 @@
+@@ -12849,24 +14895,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17090,7 +16925,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12882,20 +14936,21 @@
+@@ -12880,20 +14938,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17098,7 +16933,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
@@ -17116,7 +16951,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12914,24 +14969,36 @@
+@@ -12912,24 +14971,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17161,7 +16996,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12945,8 +15012,10 @@
+@@ -12943,8 +15014,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17169,11 +17004,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
-@@ -12955,16 +15024,26 @@
+@@ -12953,16 +15026,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17205,7 +17040,7 @@
chorus*)
case $cc_basename in
*)
-@@ -12978,12 +15057,12 @@
+@@ -12976,12 +15059,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'
@@ -17220,7 +17055,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
-@@ -12992,70 +15071,81 @@
+@@ -12990,70 +15073,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17354,7 +17189,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13066,14 +15156,14 @@
+@@ -13064,14 +15158,14 @@
;;
esac
;;
@@ -17371,7 +17206,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13090,12 +15180,12 @@
+@@ -13088,12 +15182,12 @@
# location of the library.
case $cc_basename in
@@ -17387,7 +17222,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13104,11 +15194,11 @@
+@@ -13102,11 +15196,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.
@@ -17401,7 +17236,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13118,33 +15208,22 @@
+@@ -13116,33 +15210,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17442,7 +17277,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13155,17 +15234,20 @@
+@@ -13153,17 +15236,20 @@
esac
case $cc_basename in
@@ -17469,7 +17304,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13181,12 +15263,15 @@
+@@ -13179,12 +15265,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17489,7 +17324,7 @@
;;
esac
fi
-@@ -13197,11 +15282,25 @@
+@@ -13195,11 +15284,25 @@
;;
esac
;;
@@ -17517,7 +17352,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13212,9 +15311,9 @@
+@@ -13210,9 +15313,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17529,7 +17364,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13223,16 +15322,16 @@
+@@ -13221,16 +15324,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17550,7 +17385,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13250,20 +15349,44 @@
+@@ -13248,20 +15351,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17601,7 +17436,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13291,7 +15414,7 @@
+@@ -13289,7 +15416,7 @@
;;
mvs*)
case $cc_basename in
@@ -17610,7 +17445,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13301,7 +15424,7 @@
+@@ -13299,7 +15426,7 @@
;;
esac
;;
@@ -17619,7 +17454,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=
-@@ -13312,15 +15435,31 @@
+@@ -13310,15 +15437,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::"'
;;
@@ -17653,7 +17488,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13330,14 +15469,14 @@
+@@ -13328,14 +15471,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17671,7 +17506,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13355,7 +15494,7 @@
+@@ -13353,7 +15496,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17680,7 +17515,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13374,13 +15513,13 @@
+@@ -13372,13 +15515,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -17696,7 +17531,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13389,17 +15528,17 @@
+@@ -13387,17 +15530,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -17718,7 +17553,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13418,7 +15557,7 @@
+@@ -13416,7 +15559,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17727,7 +17562,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13439,27 +15578,14 @@
+@@ -13437,27 +15580,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17757,7 +17592,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13472,36 +15598,33 @@
+@@ -13470,36 +15600,33 @@
;;
solaris*)
case $cc_basename in
@@ -17806,7 +17641,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13509,9 +15632,9 @@
+@@ -13507,9 +15634,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -17818,7 +17653,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13521,9 +15644,9 @@
+@@ -13519,9 +15646,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
@@ -17830,7 +17665,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13532,9 +15655,9 @@
+@@ -13530,9 +15657,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -17842,14 +17677,14 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13547,12 +15670,63 @@
+@@ -13545,12 +15672,63 @@
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
-+ archive_cmds_need_lc_CXX=no
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
@@ -17882,7 +17717,7 @@
+ # names for shared libraries.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
- archive_cmds_need_lc_CXX=no
++ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator_CXX=':'
@@ -17908,7 +17743,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13572,8 +15746,8 @@
+@@ -13570,8 +15748,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -17919,7 +17754,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13609,7 +15783,7 @@
+@@ -13607,7 +15785,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.
@@ -17928,7 +17763,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13649,7 +15823,7 @@
+@@ -13647,7 +15825,7 @@
fi
;;
@@ -17937,7 +17772,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13685,6 +15859,29 @@
+@@ -13683,6 +15861,29 @@
$rm -f confest.$objext
@@ -17967,7 +17802,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13693,8 +15890,8 @@
+@@ -13691,8 +15892,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17978,7 +17813,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13732,6 +15929,10 @@
+@@ -13730,6 +15931,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17989,7 +17824,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13740,7 +15941,7 @@
+@@ -13738,7 +15943,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -17998,7 +17833,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13765,18 +15966,28 @@
+@@ -13763,18 +15968,28 @@
;;
chorus*)
case $cc_basename in
@@ -18030,7 +17865,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13784,22 +15995,22 @@
+@@ -13782,22 +15997,22 @@
;;
esac
;;
@@ -18059,7 +17894,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13812,9 +16023,13 @@
+@@ -13810,9 +16025,13 @@
;;
esac
;;
@@ -18074,7 +17909,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13823,20 +16038,26 @@
+@@ -13821,20 +16040,26 @@
;;
esac
;;
@@ -18105,7 +17940,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13853,25 +16074,25 @@
+@@ -13851,25 +16076,25 @@
;;
mvs*)
case $cc_basename in
@@ -18136,7 +17971,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13885,24 +16106,15 @@
+@@ -13883,24 +16108,15 @@
;;
psos*)
;;
@@ -18163,7 +17998,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13912,12 +16124,12 @@
+@@ -13910,12 +16126,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18178,7 +18013,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13927,7 +16139,7 @@
+@@ -13925,7 +16141,7 @@
;;
tandem*)
case $cc_basename in
@@ -18187,7 +18022,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13935,7 +16147,14 @@
+@@ -13933,7 +16149,14 @@
;;
esac
;;
@@ -18203,7 +18038,7 @@
;;
vxworks*)
;;
-@@ -13945,16 +16164,16 @@
+@@ -13943,16 +16166,16 @@
esac
fi
@@ -18224,7 +18059,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13968,26 +16187,28 @@
+@@ -13966,26 +16189,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 \
@@ -18232,13 +18067,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:13974: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13972: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16195: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13978: \$? = $ac_status" >&5
-+ echo "$as_me:16197: \$? = $ac_status" >&5
+- echo "$as_me:13976: \$? = $ac_status" >&5
++ echo "$as_me:16199: \$? = $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
@@ -18260,7 +18095,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14000,7 +16221,7 @@
+@@ -13998,7 +16223,7 @@
fi
fi
@@ -18269,7 +18104,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14010,8 +16231,50 @@
+@@ -14008,8 +16233,50 @@
;;
esac
@@ -18322,7 +18157,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14022,60 +16285,58 @@
+@@ -14020,60 +16287,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18343,13 +18178,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:14041: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16297: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14039: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16299: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14045: \$? = $ac_status" >&5
-+ echo "$as_me:16301: \$? = $ac_status" >&5
+- echo "$as_me:14043: \$? = $ac_status" >&5
++ echo "$as_me:16303: \$? = $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
@@ -18401,7 +18236,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;}
-@@ -14085,8 +16346,8 @@
+@@ -14083,8 +16348,8 @@
need_locks=no
fi
@@ -18412,7 +18247,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14103,22 +16364,20 @@
+@@ -14101,22 +16366,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18441,7 +18276,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14136,8 +16395,8 @@
+@@ -14134,8 +16397,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.
@@ -18452,7 +18287,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14151,6 +16410,7 @@
+@@ -14149,6 +16412,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18460,7 +18295,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14173,20 +16433,20 @@
+@@ -14171,20 +16435,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18486,7 +18321,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14196,7 +16456,20 @@
+@@ -14194,7 +16458,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18508,7 +18343,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14261,7 +16534,7 @@
+@@ -14259,7 +16536,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18517,7 +18352,7 @@
;;
beos*)
-@@ -14270,7 +16543,7 @@
+@@ -14268,7 +16545,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18526,7 +18361,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14286,7 +16559,7 @@
+@@ -14284,7 +16561,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18535,7 +18370,7 @@
need_version=no
need_lib_prefix=no
-@@ -14298,7 +16571,8 @@
+@@ -14296,7 +16573,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18545,7 +18380,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14328,7 +16602,7 @@
+@@ -14326,7 +16604,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18554,7 +18389,7 @@
;;
esac
;;
-@@ -14351,7 +16625,7 @@
+@@ -14349,7 +16627,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18563,7 +18398,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"`
-@@ -14374,20 +16648,17 @@
+@@ -14372,20 +16650,17 @@
dynamic_linker=no
;;
@@ -18595,7 +18430,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14405,14 +16676,19 @@
+@@ -14403,14 +16678,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18617,7 +18452,7 @@
esac
;;
-@@ -14432,9 +16708,9 @@
+@@ -14430,9 +16710,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18629,7 +18464,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14449,7 +16725,7 @@
+@@ -14447,7 +16727,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18638,7 +18473,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14460,7 +16736,7 @@
+@@ -14458,7 +16738,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18647,7 +18482,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14472,6 +16748,18 @@
+@@ -14470,6 +16750,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18666,7 +18501,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14515,29 +16803,26 @@
+@@ -14513,29 +16805,26 @@
;;
# This must be Linux ELF.
@@ -18703,7 +18538,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,
-@@ -14547,6 +16832,18 @@
+@@ -14545,6 +16834,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18722,7 +18557,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14556,7 +16853,7 @@
+@@ -14554,7 +16855,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18731,7 +18566,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14584,8 +16881,13 @@
+@@ -14582,8 +16883,13 @@
openbsd*)
version_type=sunos
@@ -18746,7 +18581,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
-@@ -14605,7 +16907,7 @@
+@@ -14603,7 +16909,7 @@
os2*)
libname_spec='$name'
@@ -18755,7 +18590,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14623,13 +16925,6 @@
+@@ -14621,13 +16927,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18769,7 +18604,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14655,7 +16950,7 @@
+@@ -14653,7 +16952,7 @@
need_version=yes
;;
@@ -18778,7 +18613,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'
-@@ -14688,6 +16983,29 @@
+@@ -14686,6 +16985,29 @@
fi
;;
@@ -18808,7 +18643,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14699,16 +17017,21 @@
+@@ -14697,16 +17019,21 @@
dynamic_linker=no
;;
esac
@@ -18836,7 +18671,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14728,8 +17051,8 @@
+@@ -14726,8 +17053,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18847,7 +18682,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14740,1001 +17063,176 @@
+@@ -14738,1118 +17065,293 @@
enable_fast_install=needless
fi
@@ -19209,9 +19044,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19253,8 +19086,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
-ac_cv_lib_dld_shl_load=no
-fi
@@ -19281,28 +19114,28 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# The linker used to build libraries.
++LD=$lt_LD_CXX
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+
+-#undef dlopen
+# A BSD-compatible nm program.
+NM=$lt_NM
--#undef dlopen
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19322,8 +19155,8 @@
-#ifdef __cplusplus
-}
-#endif
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# A symbol stripping program
++STRIP=$lt_STRIP
-int
-main ()
@@ -19359,8 +19192,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
-ac_cv_func_dlopen=no
-fi
@@ -19385,8 +19218,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
@@ -19429,8 +19262,8 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
-ac_cv_lib_dl_dlopen=no
-fi
@@ -19456,7 +19289,9 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++# Used on cygwin: assembler.
++AS="$AS"
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19498,7 +19333,9 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -19523,7 +19360,10 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -19565,7 +19405,9 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -19577,42 +19419,75 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
--
--
++# Object file suffix (normally "o").
++objext="$ac_objext"
+
++# Old archive suffix (normally "a").
++libext="$libext"
+
-fi
--
--
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
+
++# Executable file suffix (normally "").
++exeext="$exeext"
+
-fi
--
--
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+
-fi
--
--
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+
-fi
--
--
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+
++# Do we need a version for libraries?
++need_version=$need_version
+
-fi
--
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+
- ;;
- esac
--
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
--
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
+
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
--
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -19624,15 +19499,21 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15377 "configure"
+-#line 15375 "configure"
-#include "confdefs.h"
--
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
--
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
-#include <stdio.h>
--
++# Library versioning type.
++version_type=$version_type
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -19642,7 +19523,9 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -19664,24 +19547,36 @@
-# endif
-# endif
-#endif
--
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
- exit (status);
-}
-EOF
@@ -19703,12 +19598,22 @@
- fi
-fi
-rm -fr conftest*
--
--
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -19722,15 +19627,24 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15475 "configure"
+-#line 15473 "configure"
-#include "confdefs.h"
--
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
--
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+
-#include <stdio.h>
--
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -19740,7 +19654,10 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -19985,30 +19902,130 @@
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
- # How to create reloadable object files.
- reload_flag=$lt_reload_flag
-@@ -15750,7 +17248,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
-shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -15765,7 +17263,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
-# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
- # Do we need the lib prefix for modules?
-@@ -15967,7 +17465,10 @@
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -15965,7 +17467,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.
@@ -20020,7 +20037,7 @@
fi
-@@ -16039,29 +17540,55 @@
+@@ -16037,29 +17542,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20084,7 +20101,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16069,21 +17596,21 @@
+@@ -16067,21 +17598,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20116,7 +20133,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16092,8 +17619,8 @@
+@@ -16090,8 +17621,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20127,7 +20144,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16131,6 +17658,11 @@
+@@ -16129,6 +17660,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20139,7 +20156,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16147,7 +17679,7 @@
+@@ -16145,7 +17681,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20148,7 +20165,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16173,6 +17705,16 @@
+@@ -16171,6 +17707,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20165,7 +20182,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16184,7 +17726,7 @@
+@@ -16182,7 +17728,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.
@@ -20174,7 +20191,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16207,13 +17749,20 @@
+@@ -16205,13 +17751,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20197,7 +20214,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16228,15 +17777,15 @@
+@@ -16226,15 +17779,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20219,7 +20236,7 @@
;;
sunos4*)
-@@ -16245,7 +17794,7 @@
+@@ -16243,7 +17796,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20228,7 +20245,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16258,6 +17807,17 @@
+@@ -16256,6 +17809,17 @@
fi
;;
@@ -20246,7 +20263,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16269,16 +17829,16 @@
+@@ -16267,16 +17831,16 @@
esac
fi
@@ -20267,7 +20284,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16292,26 +17852,28 @@
+@@ -16290,26 +17854,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 \
@@ -20275,13 +20292,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:16298: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17858: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16296: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16302: \$? = $ac_status" >&5
-+ echo "$as_me:17862: \$? = $ac_status" >&5
+- echo "$as_me:16300: \$? = $ac_status" >&5
++ echo "$as_me:17864: \$? = $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
@@ -20303,7 +20320,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16324,7 +17886,7 @@
+@@ -16322,7 +17888,7 @@
fi
fi
@@ -20312,13 +20329,12 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16334,9 +17896,51 @@
+@@ -16332,8 +17898,50 @@
;;
esac
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+#
+# Check to make sure the static flag actually works.
+#
@@ -20363,11 +20379,10 @@
+
+{ 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
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_c_o_F77=no
-@@ -16346,60 +17950,58 @@
+@@ -16344,60 +17952,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20388,13 +20403,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:16365: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17962: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16363: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17964: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16369: \$? = $ac_status" >&5
-+ echo "$as_me:17966: \$? = $ac_status" >&5
+- echo "$as_me:16367: \$? = $ac_status" >&5
++ echo "$as_me:17968: \$? = $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
@@ -20446,7 +20461,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;}
-@@ -16409,8 +18011,8 @@
+@@ -16407,8 +18013,8 @@
need_locks=no
fi
@@ -20457,7 +20472,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16448,6 +18050,16 @@
+@@ -16446,6 +18052,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20474,7 +20489,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16458,6 +18070,10 @@
+@@ -16456,6 +18072,10 @@
with_gnu_ld=no
fi
;;
@@ -20485,7 +20500,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16468,6 +18084,27 @@
+@@ -16466,6 +18086,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20513,7 +20528,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16505,7 +18142,7 @@
+@@ -16503,7 +18144,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20522,7 +20537,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16515,13 +18152,13 @@
+@@ -16513,13 +18154,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'
@@ -20539,7 +20554,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
-@@ -16530,23 +18167,70 @@
+@@ -16528,23 +18169,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20616,7 +20631,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16560,13 +18244,40 @@
+@@ -16558,13 +18246,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20659,7 +20674,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16576,24 +18287,19 @@
+@@ -16574,24 +18289,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20691,7 +20706,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16605,7 +18311,7 @@
+@@ -16603,7 +18313,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -20700,7 +20715,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16627,9 +18333,21 @@
+@@ -16625,9 +18335,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
@@ -20724,7 +20739,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16646,7 +18364,7 @@
+@@ -16644,7 +18366,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -20733,7 +20748,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`
-@@ -16665,8 +18383,12 @@
+@@ -16663,8 +18385,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -20746,7 +20761,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16674,45 +18396,58 @@
+@@ -16672,45 +18398,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20820,7 +20835,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16726,19 +18461,20 @@
+@@ -16724,19 +18463,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20828,7 +20843,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
@@ -20846,7 +20861,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16747,24 +18483,36 @@
+@@ -16745,24 +18485,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20891,7 +20906,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16778,8 +18526,10 @@
+@@ -16776,8 +18528,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20899,11 +20914,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
-@@ -16788,13 +18538,11 @@
+@@ -16786,13 +18540,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -20920,7 +20935,7 @@
fi
fi
;;
-@@ -16807,7 +18555,7 @@
+@@ -16805,7 +18557,7 @@
ld_shlibs_F77=no
;;
@@ -20929,7 +20944,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16817,68 +18565,68 @@
+@@ -16815,68 +18567,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21042,7 +21057,7 @@
fi
;;
-@@ -16912,8 +18660,8 @@
+@@ -16910,8 +18662,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21053,7 +21068,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16921,7 +18669,7 @@
+@@ -16919,7 +18671,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21062,7 +21077,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
-@@ -16935,47 +18683,62 @@
+@@ -16933,47 +18685,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21131,25 +21146,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
-- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
- ;;
+- ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -16989,7 +18752,7 @@
+@@ -16987,7 +18754,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21158,7 +21173,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'
-@@ -16999,7 +18762,7 @@
+@@ -16997,7 +18764,7 @@
link_all_deplibs_F77=yes
;;
@@ -21167,7 +21182,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
-@@ -17022,7 +18785,8 @@
+@@ -17020,7 +18787,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
@@ -21177,7 +21192,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17032,7 +18796,7 @@
+@@ -17030,7 +18798,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21186,7 +21201,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17043,14 +18807,14 @@
+@@ -17041,14 +18809,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21203,7 +21218,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'
-@@ -17062,13 +18826,13 @@
+@@ -17060,13 +18828,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21219,7 +21234,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17076,21 +18840,15 @@
+@@ -17074,21 +18842,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21245,7 +21260,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'
-@@ -17099,8 +18857,18 @@
+@@ -17097,8 +18859,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21266,7 +21281,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17109,7 +18877,7 @@
+@@ -17107,7 +18879,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.
@@ -21275,7 +21290,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17157,36 +18925,45 @@
+@@ -17155,36 +18927,45 @@
fi
;;
@@ -21342,7 +21357,7 @@
;;
uts4*)
-@@ -17201,15 +18978,10 @@
+@@ -17199,15 +18980,10 @@
esac
fi
@@ -21360,7 +21375,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17227,8 +18999,8 @@
+@@ -17225,8 +19001,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.
@@ -21371,7 +21386,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17242,6 +19014,7 @@
+@@ -17240,6 +19016,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21379,7 +21394,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17264,20 +19037,20 @@
+@@ -17262,20 +19039,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21405,7 +21420,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17287,7 +19060,20 @@
+@@ -17285,7 +19062,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21427,7 +21442,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17352,7 +19138,7 @@
+@@ -17350,7 +19140,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21436,7 +21451,7 @@
;;
beos*)
-@@ -17361,7 +19147,7 @@
+@@ -17359,7 +19149,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21445,7 +21460,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17377,7 +19163,7 @@
+@@ -17375,7 +19165,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21454,7 +21469,7 @@
need_version=no
need_lib_prefix=no
-@@ -17389,7 +19175,8 @@
+@@ -17387,7 +19177,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21464,7 +21479,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17419,7 +19206,7 @@
+@@ -17417,7 +19208,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21473,7 +21488,7 @@
;;
esac
;;
-@@ -17442,7 +19229,7 @@
+@@ -17440,7 +19231,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21482,7 +21497,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"`
-@@ -17465,20 +19252,17 @@
+@@ -17463,20 +19254,17 @@
dynamic_linker=no
;;
@@ -21514,7 +21529,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17496,14 +19280,19 @@
+@@ -17494,14 +19282,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21536,7 +21551,7 @@
esac
;;
-@@ -17523,9 +19312,9 @@
+@@ -17521,9 +19314,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21548,7 +21563,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17540,7 +19329,7 @@
+@@ -17538,7 +19331,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21557,7 +21572,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17551,7 +19340,7 @@
+@@ -17549,7 +19342,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21566,7 +21581,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17563,6 +19352,18 @@
+@@ -17561,6 +19354,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21585,7 +21600,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17606,29 +19407,26 @@
+@@ -17604,29 +19409,26 @@
;;
# This must be Linux ELF.
@@ -21622,7 +21637,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,
-@@ -17638,6 +19436,18 @@
+@@ -17636,6 +19438,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21641,7 +21656,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17647,7 +19457,7 @@
+@@ -17645,7 +19459,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21650,7 +21665,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17675,8 +19485,13 @@
+@@ -17673,8 +19487,13 @@
openbsd*)
version_type=sunos
@@ -21665,7 +21680,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
-@@ -17696,7 +19511,7 @@
+@@ -17694,7 +19513,7 @@
os2*)
libname_spec='$name'
@@ -21674,7 +21689,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17714,13 +19529,6 @@
+@@ -17712,13 +19531,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21688,7 +21703,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17746,7 +19554,7 @@
+@@ -17744,7 +19556,7 @@
need_version=yes
;;
@@ -21697,7 +21712,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'
-@@ -17779,6 +19587,29 @@
+@@ -17777,6 +19589,29 @@
fi
;;
@@ -21727,7 +21742,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17790,16 +19621,21 @@
+@@ -17788,16 +19623,21 @@
dynamic_linker=no
;;
esac
@@ -21755,7 +21770,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17819,8 +19655,8 @@
+@@ -17817,8 +19657,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -21766,7 +21781,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17831,36 +19667,6 @@
+@@ -17829,36 +19669,6 @@
enable_fast_install=needless
fi
@@ -21803,7 +21818,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17875,7 +19681,8 @@
+@@ -17873,7 +19683,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.
@@ -21813,7 +21828,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 \
-@@ -17975,6 +19782,12 @@
+@@ -17973,6 +19784,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -21826,7 +21841,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17986,6 +19799,9 @@
+@@ -17984,6 +19801,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -21836,7 +21851,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18005,7 +19821,7 @@
+@@ -18003,7 +19823,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -21845,7 +21860,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18036,7 +19852,7 @@
+@@ -18034,7 +19854,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -21854,7 +21869,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18051,7 +19867,7 @@
+@@ -18049,7 +19869,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -21863,7 +21878,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18253,7 +20069,10 @@
+@@ -18251,7 +20071,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.
@@ -21875,7 +21890,7 @@
fi
-@@ -18274,7 +20093,6 @@
+@@ -18272,7 +20095,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -21883,7 +21898,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18286,26 +20104,55 @@
+@@ -18284,26 +20106,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -21940,7 +21955,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
-@@ -18317,8 +20164,8 @@
+@@ -18315,8 +20166,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -21951,7 +21966,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18332,26 +20179,28 @@
+@@ -18330,26 +20181,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 \
@@ -21959,13 +21974,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:18338: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20185: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20187: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18342: \$? = $ac_status" >&5
-+ echo "$as_me:20189: \$? = $ac_status" >&5
+- echo "$as_me:18340: \$? = $ac_status" >&5
++ echo "$as_me:20191: \$? = $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
@@ -21987,7 +22002,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"
-@@ -18365,8 +20214,8 @@
+@@ -18363,8 +20216,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -21998,7 +22013,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18404,6 +20253,11 @@
+@@ -18402,6 +20255,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22010,7 +22025,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18420,7 +20274,7 @@
+@@ -18418,7 +20276,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22019,7 +22034,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18446,6 +20300,16 @@
+@@ -18444,6 +20302,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22036,7 +22051,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18457,7 +20321,7 @@
+@@ -18455,7 +20323,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.
@@ -22045,7 +22060,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18480,13 +20344,20 @@
+@@ -18478,13 +20346,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22068,7 +22083,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18501,15 +20372,15 @@
+@@ -18499,15 +20374,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22090,7 +22105,7 @@
;;
sunos4*)
-@@ -18518,7 +20389,7 @@
+@@ -18516,7 +20391,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22099,7 +22114,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18531,6 +20402,17 @@
+@@ -18529,6 +20404,17 @@
fi
;;
@@ -22117,7 +22132,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18542,16 +20424,16 @@
+@@ -18540,16 +20426,16 @@
esac
fi
@@ -22138,7 +22153,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18565,26 +20447,28 @@
+@@ -18563,26 +20449,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 \
@@ -22146,13 +22161,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:18571: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20453: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18569: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20455: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18575: \$? = $ac_status" >&5
-+ echo "$as_me:20457: \$? = $ac_status" >&5
+- echo "$as_me:18573: \$? = $ac_status" >&5
++ echo "$as_me:20459: \$? = $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
@@ -22174,7 +22189,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18597,7 +20481,7 @@
+@@ -18595,7 +20483,7 @@
fi
fi
@@ -22183,7 +22198,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18607,8 +20491,50 @@
+@@ -18605,8 +20493,50 @@
;;
esac
@@ -22236,7 +22251,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18619,60 +20545,58 @@
+@@ -18617,60 +20547,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22257,13 +22272,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:18638: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20557: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18636: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18642: \$? = $ac_status" >&5
-+ echo "$as_me:20561: \$? = $ac_status" >&5
+- echo "$as_me:18640: \$? = $ac_status" >&5
++ echo "$as_me:20563: \$? = $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
@@ -22315,7 +22330,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;}
-@@ -18682,8 +20606,8 @@
+@@ -18680,8 +20608,8 @@
need_locks=no
fi
@@ -22326,7 +22341,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18721,6 +20645,16 @@
+@@ -18719,6 +20647,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22343,7 +22358,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18731,6 +20665,10 @@
+@@ -18729,6 +20667,10 @@
with_gnu_ld=no
fi
;;
@@ -22354,7 +22369,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18741,6 +20679,27 @@
+@@ -18739,6 +20681,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22382,7 +22397,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18778,7 +20737,7 @@
+@@ -18776,7 +20739,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22391,7 +22406,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18788,13 +20747,13 @@
+@@ -18786,13 +20749,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'
@@ -22408,7 +22423,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
-@@ -18803,23 +20762,70 @@
+@@ -18801,23 +20764,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22485,7 +22500,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18833,13 +20839,40 @@
+@@ -18831,13 +20841,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22528,7 +22543,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18849,24 +20882,19 @@
+@@ -18847,24 +20884,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22560,7 +22575,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18878,7 +20906,7 @@
+@@ -18876,7 +20908,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22569,7 +22584,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18900,9 +20928,21 @@
+@@ -18898,9 +20930,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
@@ -22593,7 +22608,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18919,7 +20959,7 @@
+@@ -18917,7 +20961,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22602,7 +22617,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`
-@@ -18938,8 +20978,12 @@
+@@ -18936,8 +20980,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22615,7 +22630,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18947,22 +20991,23 @@
+@@ -18945,22 +20993,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22646,7 +22661,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18978,24 +21023,36 @@
+@@ -18976,24 +21025,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22691,7 +22706,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19009,19 +21066,20 @@
+@@ -19007,19 +21068,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22699,7 +22714,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
@@ -22717,7 +22732,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19040,24 +21098,36 @@
+@@ -19038,24 +21100,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22762,7 +22777,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19071,8 +21141,10 @@
+@@ -19069,8 +21143,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22770,11 +22785,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
-@@ -19081,13 +21153,11 @@
+@@ -19079,13 +21155,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -22791,7 +22806,7 @@
fi
fi
;;
-@@ -19100,7 +21170,7 @@
+@@ -19098,7 +21172,7 @@
ld_shlibs_GCJ=no
;;
@@ -22800,7 +22815,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19110,68 +21180,68 @@
+@@ -19108,68 +21182,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -22913,7 +22928,7 @@
fi
;;
-@@ -19205,8 +21275,8 @@
+@@ -19203,8 +21277,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22924,7 +22939,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19214,7 +21284,7 @@
+@@ -19212,7 +21286,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -22933,7 +22948,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
-@@ -19228,47 +21298,62 @@
+@@ -19226,47 +21300,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23020,7 +23035,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19282,7 +21367,7 @@
+@@ -19280,7 +21369,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23029,7 +23044,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'
-@@ -19292,7 +21377,7 @@
+@@ -19290,7 +21379,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23038,7 +23053,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
-@@ -19315,7 +21400,8 @@
+@@ -19313,7 +21402,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
@@ -23048,7 +23063,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19325,7 +21411,7 @@
+@@ -19323,7 +21413,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23057,7 +23072,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19336,14 +21422,14 @@
+@@ -19334,14 +21424,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23074,7 +23089,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'
-@@ -19355,13 +21441,13 @@
+@@ -19353,13 +21443,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23090,7 +23105,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19369,21 +21455,15 @@
+@@ -19367,21 +21457,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23116,7 +23131,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'
-@@ -19392,8 +21472,18 @@
+@@ -19390,8 +21474,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23137,7 +23152,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19402,7 +21492,7 @@
+@@ -19400,7 +21494,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.
@@ -23146,7 +23161,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19450,36 +21540,45 @@
+@@ -19448,36 +21542,45 @@
fi
;;
@@ -23213,7 +23228,7 @@
;;
uts4*)
-@@ -19494,15 +21593,10 @@
+@@ -19492,15 +21595,10 @@
esac
fi
@@ -23231,7 +23246,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19520,8 +21614,8 @@
+@@ -19518,8 +21616,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.
@@ -23242,7 +23257,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19535,6 +21629,7 @@
+@@ -19533,6 +21631,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23250,7 +23265,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19557,20 +21652,20 @@
+@@ -19555,20 +21654,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23276,7 +23291,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19580,7 +21675,20 @@
+@@ -19578,7 +21677,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23298,7 +23313,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19645,7 +21753,7 @@
+@@ -19643,7 +21755,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23307,7 +23322,7 @@
;;
beos*)
-@@ -19654,7 +21762,7 @@
+@@ -19652,7 +21764,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23316,7 +23331,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19670,7 +21778,7 @@
+@@ -19668,7 +21780,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23325,7 +23340,7 @@
need_version=no
need_lib_prefix=no
-@@ -19682,7 +21790,8 @@
+@@ -19680,7 +21792,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23335,7 +23350,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19712,7 +21821,7 @@
+@@ -19710,7 +21823,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23344,7 +23359,7 @@
;;
esac
;;
-@@ -19735,7 +21844,7 @@
+@@ -19733,7 +21846,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23353,7 +23368,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"`
-@@ -19758,20 +21867,17 @@
+@@ -19756,20 +21869,17 @@
dynamic_linker=no
;;
@@ -23385,7 +23400,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19789,1174 +21895,391 @@
+@@ -19787,14 +21897,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23405,82 +23420,61 @@
+ 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
+ ;;
+
+@@ -19814,9 +21929,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
+@@ -19831,7 +21946,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
+@@ -19842,7 +21957,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=
-- ;;
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19854,6 +21969,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 ;;
+@@ -19872,1089 +21999,289 @@
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
@@ -24321,142 +24315,6 @@
-
-
-fi
--
--
--fi
--
--
--fi
--
--
--fi
--
--
--fi
--
-- ;;
-- esac
--
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
-- else
-- enable_dlopen=no
-- 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"
-+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
-+ ;;
-
-- 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 20761 "configure"
--#include "confdefs.h"
-+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'
-+ ;;
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+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
-+ ;;
-
--#include <stdio.h>
-+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 ")
@@ -24476,41 +24334,12 @@
+ hardcode_into_libs=yes
+ ;;
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
+-fi
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
@@ -24526,20 +24355,13 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
+-fi
+ # 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,
@@ -24549,12 +24371,6 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -24567,24 +24383,7 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
-- exit (status);
--}
--EOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-- lt_status=$?
-- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
-- else :
-- # compilation failed
-- lt_cv_dlopen_self=no
+-fi
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -24597,18 +24396,12 @@
+ 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
--rm -fr conftest*
--
++ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24616,21 +24409,7 @@
+ shlibpath_overrides_runpath=yes
+ ;;
-- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test "$cross_compiling" = yes; then :
-- lt_cv_dlopen_self_static=cross
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--#line 20859 "configure"
--#include "confdefs.h"
+-fi
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
@@ -24641,9 +24420,7 @@
+ shlibpath_overrides_runpath=yes
+ ;;
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+- ;;
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
@@ -24652,7 +24429,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
@@ -24665,11 +24445,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 20759 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
-#include <stdio.h>
+os2*)
+ libname_spec='$name'
@@ -24804,9 +24614,9 @@
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
-- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -24828,13 +24638,81 @@
esac
- else :
- # compilation failed
-- lt_cv_dlopen_self_static=no
+- lt_cv_dlopen_self=no
fi
-fi
-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20857 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-+
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24842,6 +24720,12 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+*)
+ dynamic_linker=no
+ ;;
@@ -24850,19 +24734,31 @@
+echo "${ECHO_T}$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self_static=no
+- fi
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
+-rm -fr conftest*
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
@@ -24870,10 +24766,6 @@
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -24891,10 +24783,24 @@
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+-
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
@@ -24909,7 +24815,7 @@
fi
-@@ -20973,7 +22296,8 @@
+@@ -20971,7 +22298,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.
@@ -24919,7 +24825,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 \
-@@ -21073,6 +22397,12 @@
+@@ -21071,6 +22399,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24932,7 +24838,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21084,6 +22414,9 @@
+@@ -21082,6 +22416,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24942,7 +24848,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21103,7 +22436,7 @@
+@@ -21101,7 +22438,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24951,7 +24857,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21134,7 +22467,7 @@
+@@ -21132,7 +22469,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24960,7 +24866,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21149,7 +22482,7 @@
+@@ -21147,7 +22484,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24969,7 +24875,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21351,7 +22684,10 @@
+@@ -21349,7 +22686,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.
@@ -24981,7 +24887,7 @@
fi
-@@ -21371,7 +22707,6 @@
+@@ -21369,7 +22709,6 @@
RC)
@@ -24989,7 +24895,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21390,15 +22725,42 @@
+@@ -21388,15 +22727,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -25032,7 +24938,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21414,7 +22776,8 @@
+@@ -21412,7 +22778,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.
@@ -25042,7 +24948,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 \
-@@ -21514,6 +22877,12 @@
+@@ -21512,6 +22879,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25055,7 +24961,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21525,6 +22894,9 @@
+@@ -21523,6 +22896,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25065,7 +24971,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21544,7 +22916,7 @@
+@@ -21542,7 +22918,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25074,7 +24980,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21575,7 +22947,7 @@
+@@ -21573,7 +22949,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25083,7 +24989,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21590,7 +22962,7 @@
+@@ -21588,7 +22964,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25092,7 +24998,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21792,7 +23164,10 @@
+@@ -21790,7 +23166,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.
@@ -25104,7 +25010,7 @@
fi
-@@ -21839,7 +23214,7 @@
+@@ -21837,7 +23216,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25113,7 +25019,7 @@
# Prevent multiple expansion
-@@ -21891,18 +23266,17 @@
+@@ -21889,18 +23268,17 @@
@@ -25135,7 +25041,7 @@
-@@ -21931,8 +23305,8 @@
+@@ -21929,8 +23307,8 @@
. ./conftest
rm -f conftest
@@ -25146,7 +25052,7 @@
if test "${libltdl_cv_shlibext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21956,8 +23330,8 @@
+@@ -21954,8 +23332,8 @@
rm -f conftest
fi
@@ -25157,7 +25063,7 @@
if test -n "$libltdl_cv_shlibext"; then
cat >>confdefs.h <<_ACEOF
-@@ -21966,15 +23340,15 @@
+@@ -21964,15 +23342,15 @@
fi
@@ -25177,7 +25083,7 @@
if test -n "$libltdl_cv_shlibpath_var"; then
cat >>confdefs.h <<_ACEOF
-@@ -21983,15 +23357,15 @@
+@@ -21981,15 +23359,15 @@
fi
@@ -25197,7 +25103,7 @@
if test -n "$libltdl_cv_sys_search_path"; then
case "$host" in
*-*-mingw*) pathsep=";" ;;
-@@ -22012,8 +23386,8 @@
+@@ -22010,8 +23388,8 @@
fi
@@ -25208,7 +25114,7 @@
if test "${libltdl_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22032,8 +23406,8 @@
+@@ -22030,8 +23408,8 @@
rmdir .libs 2>/dev/null
fi
fi
@@ -25219,7 +25125,7 @@
cat >>confdefs.h <<_ACEOF
#define LTDL_OBJDIR "$libltdl_cv_objdir/"
-@@ -22041,8 +23415,8 @@
+@@ -22039,8 +23417,8 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -25230,7 +25136,7 @@
if test "${ac_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22216,11 +23590,11 @@
+@@ -22214,11 +23592,11 @@
if test -z "$ac_cv_sys_global_symbol_pipe"; then
ac_result=no
fi
@@ -25246,7 +25152,7 @@
if test "${libltdl_cv_preloaded_symbols+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22231,8 +23605,8 @@
+@@ -22229,8 +23607,8 @@
fi
fi
@@ -25257,7 +25163,7 @@
if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -22242,8 +23616,8 @@
+@@ -22240,8 +23618,8 @@
fi
LIBADD_DL=
@@ -25268,7 +25174,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22256,40 +23630,52 @@
+@@ -22254,40 +23632,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25333,7 +25239,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22298,14 +23684,15 @@
+@@ -22296,14 +23686,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25342,7 +25248,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
@@ -25353,7 +25259,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22313,8 +23700,8 @@
+@@ -22311,8 +23702,8 @@
_ACEOF
LIBADD_DL="-ldl"
else
@@ -25364,7 +25270,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22341,53 +23728,59 @@
+@@ -22339,53 +23730,59 @@
#undef dlopen
@@ -25443,7 +25349,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22396,13 +23789,14 @@
+@@ -22394,13 +23791,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25452,7 +25358,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
@@ -25462,7 +25368,7 @@
if test $ac_cv_func_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22410,8 +23804,8 @@
+@@ -22408,8 +23806,8 @@
_ACEOF
else
@@ -25473,7 +25379,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22424,40 +23818,52 @@
+@@ -22422,40 +23820,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25538,7 +25444,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22466,14 +23872,15 @@
+@@ -22464,14 +23874,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25547,7 +25453,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
@@ -25558,7 +25464,7 @@
if test $ac_cv_lib_svld_dlopen = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22487,8 +23894,8 @@
+@@ -22485,8 +23896,8 @@
fi
@@ -25569,7 +25475,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22515,53 +23922,59 @@
+@@ -22513,53 +23924,59 @@
#undef shl_load
@@ -25648,7 +25554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22570,13 +23983,14 @@
+@@ -22568,13 +23985,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25657,7 +25563,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
@@ -25667,7 +25573,7 @@
if test $ac_cv_func_shl_load = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22584,8 +23998,8 @@
+@@ -22582,8 +24000,8 @@
_ACEOF
else
@@ -25678,7 +25584,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22598,40 +24012,52 @@
+@@ -22596,40 +24014,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25743,7 +25649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22640,14 +24066,15 @@
+@@ -22638,14 +24068,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25752,7 +25658,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
@@ -25763,7 +25669,7 @@
if test $ac_cv_lib_dld_shl_load = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22660,8 +24087,8 @@
+@@ -22658,8 +24089,8 @@
fi
@@ -25774,7 +25680,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22674,40 +24101,52 @@
+@@ -22672,40 +24103,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25839,7 +25745,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22716,14 +24155,15 @@
+@@ -22714,14 +24157,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25848,7 +25754,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
@@ -25859,7 +25765,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -22741,9 +24181,9 @@
+@@ -22739,9 +24183,9 @@
for ac_func in dlerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -25872,7 +25778,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -22769,53 +24209,59 @@
+@@ -22767,53 +24211,59 @@
#undef $ac_func
@@ -25951,7 +25857,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22824,13 +24270,15 @@
+@@ -22822,13 +24272,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25960,7 +25866,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
@@ -25971,7 +25877,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -22842,8 +24290,8 @@
+@@ -22840,8 +24292,8 @@
LIBS="$LIBS_SAVE"
fi
@@ -25982,7 +25888,7 @@
if test "${ac_cv_sys_symbol_underscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22885,14 +24333,14 @@
+@@ -22883,14 +24335,14 @@
fi
@@ -26001,7 +25907,7 @@
if test "${libltdl_cv_need_uscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22953,13 +24401,22 @@
+@@ -22951,13 +24403,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -26028,7 +25934,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22972,11 +24429,13 @@
+@@ -22970,11 +24431,13 @@
( exit $ac_status )
libltdl_cv_need_uscore=yes
fi
@@ -26045,7 +25951,7 @@
fi
fi
-@@ -22994,8 +24453,8 @@
+@@ -22992,8 +24455,8 @@
fi
@@ -26056,7 +25962,7 @@
if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23026,8 +24485,8 @@
+@@ -23024,8 +24487,8 @@
esac
fi
@@ -26067,7 +25973,7 @@
if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -23048,18 +24507,19 @@
+@@ -23046,18 +24509,19 @@
for ac_header in malloc.h memory.h stdlib.h stdio.h ctype.h dlfcn.h dl.h dld.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26095,7 +26001,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23070,24 +24530,36 @@
+@@ -23068,24 +24532,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -26140,7 +26046,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23096,15 +24568,16 @@
+@@ -23094,15 +24570,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26163,7 +26069,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23113,8 +24586,13 @@
+@@ -23111,8 +24588,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -26179,7 +26085,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23138,9 +24616,10 @@
+@@ -23136,9 +24618,10 @@
ac_header_preproc=no
fi
@@ -26192,7 +26098,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23164,25 +24643,19 @@
+@@ -23162,25 +24645,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;}
@@ -26225,7 +26131,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23199,18 +24672,19 @@
+@@ -23197,18 +24674,19 @@
for ac_header in string.h strings.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26253,7 +26159,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23221,24 +24695,36 @@
+@@ -23219,24 +24697,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -26298,7 +26204,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23247,15 +24733,16 @@
+@@ -23245,15 +24735,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26321,7 +26227,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23264,8 +24751,13 @@
+@@ -23262,8 +24753,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -26337,7 +26243,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23289,9 +24781,10 @@
+@@ -23287,9 +24783,10 @@
ac_header_preproc=no
fi
@@ -26350,7 +26256,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23315,25 +24808,19 @@
+@@ -23313,25 +24810,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;}
@@ -26383,7 +26289,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -23350,9 +24837,9 @@
+@@ -23348,9 +24839,9 @@
for ac_func in strchr index
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26396,7 +26302,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23378,53 +24865,59 @@
+@@ -23376,53 +24867,59 @@
#undef $ac_func
@@ -26475,7 +26381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23433,13 +24926,15 @@
+@@ -23431,13 +24928,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26484,7 +26390,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
@@ -26495,7 +26401,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23453,9 +24948,9 @@
+@@ -23451,9 +24950,9 @@
for ac_func in strrchr rindex
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26508,7 +26414,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23481,53 +24976,59 @@
+@@ -23479,53 +24978,59 @@
#undef $ac_func
@@ -26587,7 +26493,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23536,13 +25037,15 @@
+@@ -23534,13 +25039,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26596,7 +26502,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
@@ -26607,7 +26513,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23556,9 +25059,9 @@
+@@ -23554,9 +25061,9 @@
for ac_func in memcpy bcopy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26620,7 +26526,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23584,53 +25087,59 @@
+@@ -23582,53 +25089,59 @@
#undef $ac_func
@@ -26699,7 +26605,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23639,13 +25148,15 @@
+@@ -23637,13 +25150,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26708,7 +26614,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
@@ -26719,7 +26625,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23658,9 +25169,9 @@
+@@ -23656,9 +25171,9 @@
for ac_func in strcmp
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26732,7 +26638,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -23686,53 +25197,59 @@
+@@ -23684,53 +25199,59 @@
#undef $ac_func
@@ -26811,7 +26717,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23741,13 +25258,15 @@
+@@ -23739,13 +25260,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26820,7 +26726,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
@@ -26831,7 +26737,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23768,17 +25287,17 @@
+@@ -23766,17 +25289,17 @@
# this checks for --with-extra-libs
@@ -26855,7 +26761,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -23796,21 +25315,21 @@
+@@ -23794,21 +25317,21 @@
fi
@@ -26885,7 +26791,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -23829,21 +25348,20 @@
+@@ -23827,21 +25350,20 @@
@@ -26912,7 +26818,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'
-@@ -23855,9 +25373,6 @@
+@@ -23853,9 +25375,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26922,7 +26828,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23883,24 +25398,36 @@
+@@ -23881,24 +25400,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26967,7 +26873,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23909,9 +25436,10 @@
+@@ -23907,9 +25438,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26980,7 +26886,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -23924,11 +25452,11 @@
+@@ -23922,11 +25454,11 @@
fi
@@ -26996,7 +26902,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23949,8 +25477,7 @@
+@@ -23947,8 +25479,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -27006,7 +26912,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'
-@@ -23988,24 +25515,36 @@
+@@ -23986,24 +25517,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27051,7 +26957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24015,10 +25554,11 @@
+@@ -24013,10 +25556,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27061,11 +26967,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
-@@ -24031,8 +25571,8 @@
+@@ -24029,8 +25573,8 @@
fi
@@ -27076,7 +26982,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -24056,15 +25596,14 @@
+@@ -24054,15 +25598,14 @@
@@ -27095,7 +27001,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'
-@@ -24076,9 +25615,6 @@
+@@ -24074,9 +25617,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27105,7 +27011,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24103,24 +25639,36 @@
+@@ -24101,24 +25641,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27150,7 +27056,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24129,9 +25677,10 @@
+@@ -24127,9 +25679,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27163,7 +27069,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24144,11 +25693,11 @@
+@@ -24142,11 +25695,11 @@
fi
@@ -27179,7 +27085,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24169,8 +25718,7 @@
+@@ -24167,8 +25720,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -27189,7 +27095,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'
-@@ -24207,24 +25755,36 @@
+@@ -24205,24 +25757,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27234,7 +27140,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24234,10 +25794,11 @@
+@@ -24232,10 +25796,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27244,11 +27150,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
-@@ -24250,8 +25811,8 @@
+@@ -24248,8 +25813,8 @@
fi
@@ -27259,7 +27165,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -24274,8 +25835,8 @@
+@@ -24272,8 +25837,8 @@
@@ -27270,7 +27176,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24292,30 +25853,42 @@
+@@ -24290,30 +25855,42 @@
int
main ()
{
@@ -27322,7 +27228,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24324,20 +25897,21 @@
+@@ -24322,20 +25899,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27331,7 +27237,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
@@ -27350,7 +27256,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24354,30 +25928,42 @@
+@@ -24352,30 +25930,42 @@
int
main ()
{
@@ -27402,7 +27308,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24386,21 +25972,22 @@
+@@ -24384,21 +25974,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27411,7 +27317,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
@@ -27431,7 +27337,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24413,40 +26000,52 @@
+@@ -24411,40 +26002,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27496,7 +27402,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24455,19 +26054,20 @@
+@@ -24453,19 +26056,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27505,7 +27411,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
@@ -27523,7 +27429,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24480,40 +26080,52 @@
+@@ -24478,40 +26082,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27588,7 +27494,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24522,14 +26134,15 @@
+@@ -24520,14 +26136,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27597,7 +27503,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
@@ -27608,7 +27514,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -24555,13 +26168,13 @@
+@@ -24553,13 +26170,13 @@
fi
@@ -27625,7 +27531,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'
-@@ -24590,24 +26203,36 @@
+@@ -24588,24 +26205,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27670,7 +27576,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24619,8 +26244,10 @@
+@@ -24617,8 +26246,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27682,7 +27588,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -24630,17 +26257,17 @@
+@@ -24628,17 +26259,17 @@
fi
@@ -27705,7 +27611,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'
-@@ -24669,24 +26296,36 @@
+@@ -24667,24 +26298,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27750,7 +27656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24698,8 +26337,10 @@
+@@ -24696,8 +26339,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27762,7 +27668,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -24710,8 +26351,8 @@
+@@ -24708,8 +26353,8 @@
fi
@@ -27773,7 +27679,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -24724,8 +26365,8 @@
+@@ -24722,8 +26367,8 @@
_ACEOF
@@ -27784,7 +27690,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24738,40 +26379,52 @@
+@@ -24736,40 +26381,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27849,7 +27755,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24780,21 +26433,22 @@
+@@ -24778,21 +26435,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27858,7 +27764,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
@@ -27878,7 +27784,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24807,40 +26461,52 @@
+@@ -24805,40 +26463,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27943,7 +27849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24849,21 +26515,22 @@
+@@ -24847,21 +26517,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27952,7 +27858,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
@@ -27972,7 +27878,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24890,53 +26557,59 @@
+@@ -24888,53 +26559,59 @@
#undef inet_ntoa
@@ -28051,7 +27957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24945,17 +26618,18 @@
+@@ -24943,17 +26620,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28060,7 +27966,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
@@ -28076,7 +27982,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24968,40 +26642,52 @@
+@@ -24966,40 +26644,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28141,7 +28047,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25010,21 +26696,22 @@
+@@ -25008,21 +26698,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28150,7 +28056,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
@@ -28170,7 +28076,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25051,53 +26738,59 @@
+@@ -25049,53 +26740,59 @@
#undef connect
@@ -28249,7 +28155,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25106,17 +26799,18 @@
+@@ -25104,17 +26801,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28258,7 +28164,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
@@ -28274,7 +28180,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25129,40 +26823,52 @@
+@@ -25127,40 +26825,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28339,7 +28245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25171,22 +26877,23 @@
+@@ -25169,22 +26879,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28348,7 +28254,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
@@ -28369,7 +28275,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25213,53 +26920,59 @@
+@@ -25211,53 +26922,59 @@
#undef remove
@@ -28448,7 +28354,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25268,17 +26981,18 @@
+@@ -25266,17 +26983,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28457,7 +28363,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
@@ -28473,7 +28379,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25291,40 +27005,52 @@
+@@ -25289,40 +27007,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28538,7 +28444,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25333,14 +27059,15 @@
+@@ -25331,14 +27061,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28547,7 +28453,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
@@ -28558,7 +28464,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -25348,8 +27075,8 @@
+@@ -25346,8 +27077,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28569,7 +28475,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25376,53 +27103,59 @@
+@@ -25374,53 +27105,59 @@
#undef shmat
@@ -28648,7 +28554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25431,18 +27164,19 @@
+@@ -25429,18 +27166,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28657,7 +28563,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
@@ -28674,7 +28580,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25455,40 +27189,52 @@
+@@ -25453,40 +27191,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28739,7 +28645,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25497,14 +27243,15 @@
+@@ -25495,14 +27245,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28748,7 +28654,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
@@ -28759,7 +28665,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -25518,18 +27265,19 @@
+@@ -25516,18 +27267,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28787,7 +28693,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25540,24 +27288,36 @@
+@@ -25538,24 +27290,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28832,7 +28738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25566,15 +27326,16 @@
+@@ -25564,15 +27328,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28855,7 +28761,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25583,8 +27344,13 @@
+@@ -25581,8 +27346,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28871,7 +28777,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25608,9 +27374,10 @@
+@@ -25606,9 +27376,10 @@
ac_header_preproc=no
fi
@@ -28884,7 +28790,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25634,25 +27401,19 @@
+@@ -25632,25 +27403,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;}
@@ -28917,7 +28823,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -25670,18 +27431,19 @@
+@@ -25668,18 +27433,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28945,7 +28851,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25692,24 +27454,36 @@
+@@ -25690,24 +27456,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28990,7 +28896,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25718,15 +27492,16 @@
+@@ -25716,15 +27494,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29013,7 +28919,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25735,8 +27510,13 @@
+@@ -25733,8 +27512,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29029,7 +28935,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25760,9 +27540,10 @@
+@@ -25758,9 +27542,10 @@
ac_header_preproc=no
fi
@@ -29042,7 +28948,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25786,25 +27567,19 @@
+@@ -25784,25 +27569,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;}
@@ -29075,7 +28981,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -25818,8 +27593,8 @@
+@@ -25816,8 +27595,8 @@
# darwin requires a poll emulation library
@@ -29086,7 +28992,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25832,40 +27607,52 @@
+@@ -25830,40 +27609,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29151,7 +29057,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25874,14 +27661,15 @@
+@@ -25872,14 +27663,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29160,7 +29066,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
@@ -29171,7 +29077,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -25892,18 +27680,19 @@
+@@ -25890,18 +27682,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29199,7 +29105,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25914,24 +27703,36 @@
+@@ -25912,24 +27705,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29244,7 +29150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25940,15 +27741,16 @@
+@@ -25938,15 +27743,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29267,7 +29173,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25957,8 +27759,13 @@
+@@ -25955,8 +27761,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29283,7 +29189,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25982,9 +27789,10 @@
+@@ -25980,9 +27791,10 @@
ac_header_preproc=no
fi
@@ -29296,7 +29202,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -26008,25 +27816,19 @@
+@@ -26006,25 +27818,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;}
@@ -29329,7 +29235,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -26041,17 +27843,17 @@
+@@ -26039,17 +27845,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -29353,7 +29259,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26062,24 +27864,36 @@
+@@ -26060,24 +27866,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -29398,7 +29304,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26088,15 +27902,16 @@
+@@ -26086,15 +27904,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29421,7 +29327,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26105,8 +27920,13 @@
+@@ -26103,8 +27922,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -29437,7 +29343,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -26130,9 +27950,10 @@
+@@ -26128,9 +27952,10 @@
ac_header_preproc=no
fi
@@ -29450,7 +29356,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -26156,25 +27977,18 @@
+@@ -26154,25 +27979,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;}
@@ -29481,7 +29387,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -26191,8 +28005,8 @@
+@@ -26189,8 +28007,8 @@
@@ -29492,7 +29398,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -26218,31 +28032,43 @@
+@@ -26216,31 +28034,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29546,7 +29452,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -26253,25 +28079,25 @@
+@@ -26251,25 +28081,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29558,7 +29464,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
@@ -29579,7 +29485,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'
-@@ -26283,9 +28109,6 @@
+@@ -26281,9 +28111,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29589,7 +29495,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26311,24 +28134,36 @@
+@@ -26309,24 +28136,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29634,7 +29540,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26337,9 +28172,10 @@
+@@ -26335,9 +28174,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29647,7 +29553,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -26352,11 +28188,11 @@
+@@ -26350,11 +28190,11 @@
fi
@@ -29663,7 +29569,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26377,8 +28213,7 @@
+@@ -26375,8 +28215,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -29673,7 +29579,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'
-@@ -26416,24 +28251,36 @@
+@@ -26414,24 +28253,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29718,7 +29624,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26443,10 +28290,11 @@
+@@ -26441,10 +28292,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29728,11 +29634,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
-@@ -26459,8 +28307,8 @@
+@@ -26457,8 +28309,8 @@
fi
@@ -29743,7 +29649,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -26487,8 +28335,8 @@
+@@ -26485,8 +28337,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -29754,7 +29660,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26501,40 +28349,52 @@
+@@ -26499,40 +28351,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29819,7 +29725,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26543,27 +28403,28 @@
+@@ -26541,27 +28405,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29828,7 +29734,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
@@ -29858,7 +29764,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26576,40 +28437,52 @@
+@@ -26574,40 +28439,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29923,7 +29829,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26618,22 +28491,23 @@
+@@ -26616,22 +28493,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29932,7 +29838,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
@@ -29953,7 +29859,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26644,36 +28518,49 @@
+@@ -26642,36 +28520,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30013,7 +29919,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26682,20 +28569,21 @@
+@@ -26680,23 +28571,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30031,22 +29937,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.
-@@ -26708,10 +28596,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
+@@ -26706,10 +28597,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30055,7 +29968,7 @@
test_array [0] = 0
;
-@@ -26719,24 +28608,36 @@
+@@ -26717,24 +28610,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30100,11 +30013,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26749,10 +28650,11 @@
+@@ -26747,10 +28652,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30113,7 +30027,7 @@
test_array [0] = 0
;
-@@ -26760,24 +28662,36 @@
+@@ -26758,24 +28665,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30158,7 +30072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26786,30 +28700,32 @@
+@@ -26784,30 +28703,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30191,7 +30105,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30200,7 +30115,7 @@
test_array [0] = 0
;
-@@ -26817,24 +28733,36 @@
+@@ -26815,24 +28737,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30245,11 +30160,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26847,10 +28775,11 @@
+@@ -26845,10 +28779,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30258,7 +30174,7 @@
test_array [0] = 0
;
-@@ -26858,24 +28787,36 @@
+@@ -26856,24 +28792,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30303,7 +30219,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26884,24 +28825,27 @@
+@@ -26882,24 +28830,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30341,11 +30257,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`
-@@ -26912,10 +28856,11 @@
+@@ -26910,10 +28861,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30354,7 +30271,7 @@
test_array [0] = 0
;
-@@ -26923,24 +28868,36 @@
+@@ -26921,24 +28874,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30399,7 +30316,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26949,26 +28906,20 @@
+@@ -26947,26 +28912,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30413,13 +30330,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
@@ -30432,19 +30353,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26976,8 +28927,9 @@
+@@ -26974,8 +28937,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
-@@ -26986,35 +28938,44 @@
+@@ -26984,35 +28949,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30502,12 +30424,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27025,28 +28986,27 @@
+@@ -27023,28 +28997,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)
@@ -30516,18 +30439,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
@@ -30539,7 +30468,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27057,36 +29017,49 @@
+@@ -27055,36 +29032,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30599,7 +30528,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27095,20 +29068,21 @@
+@@ -27093,23 +29083,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30617,22 +30546,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.
-@@ -27121,10 +29095,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
+@@ -27119,10 +29109,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30641,7 +30577,7 @@
test_array [0] = 0
;
-@@ -27132,24 +29107,36 @@
+@@ -27130,24 +29122,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30686,11 +30622,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27162,10 +29149,11 @@
+@@ -27160,10 +29164,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30699,7 +30636,7 @@
test_array [0] = 0
;
-@@ -27173,24 +29161,36 @@
+@@ -27171,24 +29177,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30744,7 +30681,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27199,30 +29199,32 @@
+@@ -27197,30 +29215,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30777,7 +30714,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30786,7 +30724,7 @@
test_array [0] = 0
;
-@@ -27230,24 +29232,36 @@
+@@ -27228,24 +29249,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30831,11 +30769,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27260,10 +29274,11 @@
+@@ -27258,10 +29291,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30844,7 +30783,7 @@
test_array [0] = 0
;
-@@ -27271,24 +29286,36 @@
+@@ -27269,24 +29304,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30889,7 +30828,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27297,24 +29324,27 @@
+@@ -27295,24 +29342,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30927,11 +30866,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`
-@@ -27325,10 +29355,11 @@
+@@ -27323,10 +29373,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30940,7 +30880,7 @@
test_array [0] = 0
;
-@@ -27336,24 +29367,36 @@
+@@ -27334,24 +29386,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30985,7 +30925,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27362,26 +29405,20 @@
+@@ -27360,26 +29424,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30999,13 +30939,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
@@ -31018,19 +30962,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27389,8 +29426,9 @@
+@@ -27387,8 +29449,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
-@@ -27399,35 +29437,44 @@
+@@ -27397,35 +29461,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31088,12 +31033,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27438,28 +29485,27 @@
+@@ -27436,28 +29509,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)
@@ -31102,18 +31048,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
@@ -31125,7 +31077,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27470,36 +29516,49 @@
+@@ -27468,36 +29544,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31185,7 +31137,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27508,20 +29567,21 @@
+@@ -27506,23 +29595,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31203,22 +31155,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.
-@@ -27534,10 +29594,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
+@@ -27532,10 +29621,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31227,7 +31186,7 @@
test_array [0] = 0
;
-@@ -27545,24 +29606,36 @@
+@@ -27543,24 +29634,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31272,11 +31231,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27575,10 +29648,11 @@
+@@ -27573,10 +29676,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31285,7 +31245,7 @@
test_array [0] = 0
;
-@@ -27586,24 +29660,36 @@
+@@ -27584,24 +29689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31330,7 +31290,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27612,30 +29698,32 @@
+@@ -27610,30 +29727,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31363,7 +31323,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31372,7 +31333,7 @@
test_array [0] = 0
;
-@@ -27643,24 +29731,36 @@
+@@ -27641,24 +29761,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31417,11 +31378,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27673,10 +29773,11 @@
+@@ -27671,10 +29803,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31430,7 +31392,7 @@
test_array [0] = 0
;
-@@ -27684,24 +29785,36 @@
+@@ -27682,24 +29816,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31475,7 +31437,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27710,24 +29823,27 @@
+@@ -27708,24 +29854,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31513,11 +31475,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`
-@@ -27738,10 +29854,11 @@
+@@ -27736,10 +29885,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31526,7 +31489,7 @@
test_array [0] = 0
;
-@@ -27749,24 +29866,36 @@
+@@ -27747,24 +29898,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31571,7 +31534,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27775,26 +29904,20 @@
+@@ -27773,26 +29936,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31585,13 +31548,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
@@ -31604,19 +31571,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27802,8 +29925,9 @@
+@@ -27800,8 +29961,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
-@@ -27812,35 +29936,44 @@
+@@ -27810,35 +29973,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31674,12 +31642,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27851,28 +29984,27 @@
+@@ -27849,28 +30021,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)
@@ -31688,18 +31657,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
@@ -31711,7 +31686,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27883,36 +30015,49 @@
+@@ -27881,36 +30056,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31771,7 +31746,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27921,20 +30066,21 @@
+@@ -27919,23 +30107,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31789,22 +31764,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.
-@@ -27947,10 +30093,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
+@@ -27945,10 +30133,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31813,7 +31795,7 @@
test_array [0] = 0
;
-@@ -27958,24 +30105,36 @@
+@@ -27956,24 +30146,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31858,11 +31840,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27988,10 +30147,11 @@
+@@ -27986,10 +30188,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31871,7 +31854,7 @@
test_array [0] = 0
;
-@@ -27999,24 +30159,36 @@
+@@ -27997,24 +30201,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31916,7 +31899,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28025,30 +30197,32 @@
+@@ -28023,30 +30239,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31949,7 +31932,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31958,7 +31942,7 @@
test_array [0] = 0
;
-@@ -28056,24 +30230,36 @@
+@@ -28054,24 +30273,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32003,11 +31987,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28086,10 +30272,11 @@
+@@ -28084,10 +30315,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -32016,7 +32001,7 @@
test_array [0] = 0
;
-@@ -28097,24 +30284,36 @@
+@@ -28095,24 +30328,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32061,7 +32046,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28123,24 +30322,27 @@
+@@ -28121,24 +30366,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32099,11 +32084,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`
-@@ -28151,10 +30353,11 @@
+@@ -28149,10 +30397,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -32112,7 +32098,7 @@
test_array [0] = 0
;
-@@ -28162,24 +30365,36 @@
+@@ -28160,24 +30410,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32157,7 +32143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28188,26 +30403,20 @@
+@@ -28186,26 +30448,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32171,13 +32157,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
@@ -32190,19 +32180,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28215,8 +30424,9 @@
+@@ -28213,8 +30473,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
-@@ -28225,35 +30435,44 @@
+@@ -28223,35 +30485,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32260,12 +32251,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28264,30 +30483,29 @@
+@@ -28262,30 +30533,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 *)
@@ -32274,18 +32266,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
@@ -32299,7 +32297,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28300,40 +30518,52 @@
+@@ -28298,40 +30572,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32364,7 +32362,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28342,14 +30572,15 @@
+@@ -28340,14 +30626,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32373,7 +32371,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
@@ -32384,7 +32382,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -28358,8 +30589,8 @@
+@@ -28356,8 +30643,8 @@
fi
@@ -32395,7 +32393,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28372,40 +30603,52 @@
+@@ -28370,40 +30657,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32460,7 +32458,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28414,14 +30657,15 @@
+@@ -28412,14 +30711,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32469,7 +32467,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
@@ -32480,7 +32478,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -28435,8 +30679,8 @@
+@@ -28433,8 +30733,8 @@
@@ -32491,7 +32489,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28447,36 +30691,49 @@
+@@ -28445,36 +30745,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32551,7 +32549,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28485,20 +30742,21 @@
+@@ -28483,23 +30796,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32569,22 +32567,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.
-@@ -28511,10 +30769,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
+@@ -28509,10 +30822,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 ()
{
@@ -32593,7 +32598,7 @@
test_array [0] = 0
;
-@@ -28522,24 +30781,36 @@
+@@ -28520,24 +30835,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32638,11 +32643,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28552,10 +30823,11 @@
+@@ -28550,10 +30877,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 ()
{
@@ -32651,7 +32657,7 @@
test_array [0] = 0
;
-@@ -28563,24 +30835,36 @@
+@@ -28561,24 +30890,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32696,7 +32702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28589,30 +30873,32 @@
+@@ -28587,30 +30928,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32729,7 +32735,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 ()
{
@@ -32738,7 +32745,7 @@
test_array [0] = 0
;
-@@ -28620,24 +30906,36 @@
+@@ -28618,24 +30962,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32783,11 +32790,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28650,10 +30948,11 @@
+@@ -28648,10 +31004,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 ()
{
@@ -32796,7 +32804,7 @@
test_array [0] = 0
;
-@@ -28661,24 +30960,36 @@
+@@ -28659,24 +31017,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32841,7 +32849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28687,24 +30998,27 @@
+@@ -28685,24 +31055,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32879,11 +32887,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`
-@@ -28715,10 +31029,11 @@
+@@ -28713,10 +31086,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 ()
{
@@ -32892,7 +32901,7 @@
test_array [0] = 0
;
-@@ -28726,24 +31041,36 @@
+@@ -28724,24 +31099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32937,7 +32946,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28752,26 +31079,20 @@
+@@ -28750,26 +31137,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32951,13 +32960,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
@@ -32970,19 +32983,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28779,8 +31100,9 @@
+@@ -28777,8 +31162,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
-@@ -28789,35 +31111,44 @@
+@@ -28787,35 +31174,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33040,12 +33054,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28828,29 +31159,28 @@
+@@ -28826,29 +31222,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)
@@ -33054,18 +33069,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
@@ -33078,7 +33099,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28861,36 +31191,49 @@
+@@ -28859,36 +31258,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -33138,7 +33159,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28899,20 +31242,21 @@
+@@ -28897,23 +31309,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33156,22 +33177,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.
-@@ -28925,10 +31269,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
+@@ -28923,10 +31335,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 ()
{
@@ -33180,7 +33208,7 @@
test_array [0] = 0
;
-@@ -28936,24 +31281,36 @@
+@@ -28934,24 +31348,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33225,11 +33253,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28966,10 +31323,11 @@
+@@ -28964,10 +31390,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 ()
{
@@ -33238,7 +33267,7 @@
test_array [0] = 0
;
-@@ -28977,24 +31335,36 @@
+@@ -28975,24 +31403,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33283,7 +33312,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29003,30 +31373,32 @@
+@@ -29001,30 +31441,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33316,7 +33345,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 ()
{
@@ -33325,7 +33355,7 @@
test_array [0] = 0
;
-@@ -29034,24 +31406,36 @@
+@@ -29032,24 +31475,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33370,11 +33400,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29064,10 +31448,11 @@
+@@ -29062,10 +31517,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 ()
{
@@ -33383,7 +33414,7 @@
test_array [0] = 0
;
-@@ -29075,24 +31460,36 @@
+@@ -29073,24 +31530,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33428,7 +33459,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29101,24 +31498,27 @@
+@@ -29099,24 +31568,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33466,11 +33497,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`
-@@ -29129,10 +31529,11 @@
+@@ -29127,10 +31599,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 ()
{
@@ -33479,7 +33511,7 @@
test_array [0] = 0
;
-@@ -29140,24 +31541,36 @@
+@@ -29138,24 +31612,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33524,7 +33556,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29166,26 +31579,20 @@
+@@ -29164,26 +31650,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33538,13 +33570,17 @@
case $ac_lo in
?*) 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)
++'') 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)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -33557,19 +33593,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29193,8 +31600,9 @@
+@@ -29191,8 +31675,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
-@@ -29203,35 +31611,44 @@
+@@ -29201,35 +31687,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33627,12 +33664,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29242,30 +31659,29 @@
+@@ -29240,30 +31735,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)
@@ -33641,18 +33679,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
@@ -33666,7 +33710,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29286,36 +31702,48 @@
+@@ -29284,36 +31782,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33727,17 +33771,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!
-@@ -29327,18 +31755,18 @@
+@@ -29325,18 +31835,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
@@ -33751,7 +33795,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'
-@@ -29368,24 +31796,36 @@
+@@ -29366,24 +31876,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33796,7 +33840,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29394,9 +31834,10 @@
+@@ -29392,9 +31914,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33805,11 +33849,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
-@@ -29409,26 +31850,26 @@
+@@ -29407,26 +31930,26 @@
fi
@@ -33846,7 +33890,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -29447,18 +31888,19 @@
+@@ -29445,18 +31968,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33874,7 +33918,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29469,24 +31911,36 @@
+@@ -29467,24 +31991,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -33919,7 +33963,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29495,15 +31949,16 @@
+@@ -29493,15 +32029,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33942,7 +33986,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29512,8 +31967,13 @@
+@@ -29510,8 +32047,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33958,7 +34002,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -29537,9 +31997,10 @@
+@@ -29535,9 +32077,10 @@
ac_header_preproc=no
fi
@@ -33971,7 +34015,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -29563,25 +32024,19 @@
+@@ -29561,25 +32104,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;}
@@ -34004,7 +34048,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -29593,8 +32048,8 @@
+@@ -29591,8 +32128,8 @@
done
@@ -34015,7 +34059,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29621,53 +32076,59 @@
+@@ -29619,53 +32156,59 @@
#undef _NSGetEnviron
@@ -34094,7 +34138,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29676,13 +32137,14 @@
+@@ -29674,13 +32217,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34103,7 +34147,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
@@ -34113,7 +34157,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -29703,9 +32165,9 @@
+@@ -29701,9 +32245,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34126,7 +34170,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29731,53 +32193,59 @@
+@@ -29729,53 +32273,59 @@
#undef $ac_func
@@ -34205,7 +34249,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29786,13 +32254,15 @@
+@@ -29784,13 +32334,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34214,7 +34258,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
@@ -34225,7 +34269,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -29892,15 +32362,14 @@
+@@ -29890,15 +32442,14 @@
@@ -34244,7 +34288,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'
-@@ -30021,12 +32490,12 @@
+@@ -30019,12 +32570,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34261,7 +34305,7 @@
fi
-@@ -30034,13 +32503,12 @@
+@@ -30032,13 +32583,12 @@
@@ -34278,7 +34322,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'
-@@ -30061,13 +32529,13 @@
+@@ -30059,13 +32609,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -34296,7 +34340,7 @@
{ echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
visibility support. Disabling -fvisibility=hidden" >&5
echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -30087,16 +32555,15 @@
+@@ -30085,16 +32635,15 @@
kde_have_gcc_visibility=no
@@ -34317,7 +34361,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'
-@@ -30123,24 +32590,36 @@
+@@ -30121,24 +32670,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34362,7 +34406,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30149,8 +32628,10 @@
+@@ -30147,8 +32708,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34370,11 +34414,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
-@@ -30163,28 +32644,27 @@
+@@ -30161,28 +32724,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34395,10 +34439,10 @@
kde_have_gcc_visibility=no
-fi;
+fi
++
- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
-+
+ { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
@@ -34412,7 +34456,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'
-@@ -30219,24 +32699,36 @@
+@@ -30217,24 +32779,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34457,7 +34501,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30245,9 +32737,10 @@
+@@ -30243,9 +32817,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34470,7 +34514,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -30259,21 +32752,20 @@
+@@ -30257,21 +32832,20 @@
fi
@@ -34497,7 +34541,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'
-@@ -30313,24 +32805,36 @@
+@@ -30311,24 +32885,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34542,7 +34586,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30339,9 +32843,10 @@
+@@ -30337,9 +32923,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34551,11 +34595,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
-@@ -30355,8 +32860,8 @@
+@@ -30353,8 +32940,8 @@
fi
@@ -34566,7 +34610,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -30372,8 +32877,8 @@
+@@ -30370,8 +32957,8 @@
fi
else
@@ -34577,7 +34621,7 @@
:
fi
-@@ -30384,8 +32889,7 @@
+@@ -30382,8 +32969,7 @@
@@ -34587,7 +34631,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'
-@@ -30397,8 +32901,8 @@
+@@ -30395,8 +32981,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -34598,7 +34642,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30426,24 +32930,36 @@
+@@ -30424,24 +33010,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34643,7 +34687,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30452,15 +32968,16 @@
+@@ -30450,15 +33048,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34664,7 +34708,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -30495,9 +33012,9 @@
+@@ -30493,9 +33092,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`
@@ -34677,7 +34721,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30519,24 +33036,36 @@
+@@ -30517,24 +33116,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34722,7 +34766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30545,12 +33074,14 @@
+@@ -30543,12 +33154,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34741,7 +34785,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -30562,13 +33093,12 @@
+@@ -30560,13 +33173,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -34757,7 +34801,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30576,126 +33106,99 @@
+@@ -30574,126 +33186,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34893,7 +34937,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
@@ -34935,7 +34979,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30703,122 +33206,96 @@
+@@ -30701,122 +33286,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35071,7 +35115,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
@@ -35109,7 +35153,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30842,24 +33319,36 @@
+@@ -30840,24 +33399,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35154,7 +35198,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30868,9 +33357,10 @@
+@@ -30866,9 +33437,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35167,7 +35211,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -30926,6 +33416,7 @@
+@@ -30924,6 +33496,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -35175,7 +35219,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -30945,18 +33436,27 @@
+@@ -30943,18 +33516,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -35209,7 +35253,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30969,12 +33469,14 @@
+@@ -30967,12 +33549,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -35227,7 +35271,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -31007,18 +33509,19 @@
+@@ -31005,18 +33589,19 @@
for ac_header in fcntl.h sys/time.h unistd.h sys/cdefs.h fnmatch.h sysent.h strings.h sys/stat.h sys/select.h sys/socket.h linux/socket.h socketbits.h sigaction.h paths.h malloc.h monetary.h sys/param.h limits.h sys/mnttab.h mntent.h fstab.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35255,7 +35299,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31029,24 +33532,36 @@
+@@ -31027,24 +33612,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35300,7 +35344,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31055,15 +33570,16 @@
+@@ -31053,15 +33650,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35323,7 +35367,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31072,8 +33588,13 @@
+@@ -31070,8 +33668,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35339,7 +35383,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31097,9 +33618,10 @@
+@@ -31095,9 +33698,10 @@
ac_header_preproc=no
fi
@@ -35352,7 +35396,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31123,25 +33645,19 @@
+@@ -31121,25 +33725,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;}
@@ -35385,7 +35429,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -31158,10 +33674,9 @@
+@@ -31156,10 +33754,9 @@
@@ -35397,7 +35441,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'
-@@ -31174,18 +33689,19 @@
+@@ -31172,18 +33769,19 @@
for ac_header in sys/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35425,7 +35469,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31196,24 +33712,36 @@
+@@ -31194,24 +33792,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35470,7 +35514,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31222,15 +33750,16 @@
+@@ -31220,15 +33830,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35493,7 +35537,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31239,8 +33768,13 @@
+@@ -31237,8 +33848,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35509,7 +35553,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31264,9 +33798,10 @@
+@@ -31262,9 +33878,10 @@
ac_header_preproc=no
fi
@@ -35522,7 +35566,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -31290,25 +33825,19 @@
+@@ -31288,25 +33905,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;}
@@ -35555,7 +35599,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -31332,32 +33861,32 @@
+@@ -31330,32 +33941,32 @@
@@ -35570,9 +35614,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"
@@ -35583,9 +35627,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"
@@ -35600,7 +35644,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -31373,8 +33902,8 @@
+@@ -31371,8 +33982,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -35611,7 +35655,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -31411,8 +33940,13 @@
+@@ -31409,8 +34020,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -35627,7 +35671,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31479,6 +34013,7 @@
+@@ -31477,6 +34093,7 @@
fi
done
fi
@@ -35635,7 +35679,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -31508,24 +34043,36 @@
+@@ -31506,24 +34123,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35680,7 +35724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31536,7 +34083,7 @@
+@@ -31534,7 +34163,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35689,17 +35733,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}/` \
-@@ -31584,7 +34131,8 @@
+@@ -31582,7 +34211,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
-@@ -31594,21 +34142,26 @@
+@@ -31592,21 +34222,26 @@
*-*-solaris*)
;;
*)
@@ -35734,7 +35778,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -31616,7 +34169,7 @@
+@@ -31614,7 +34249,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
@@ -35743,7 +35787,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -31625,7 +34178,7 @@
+@@ -31623,7 +34258,7 @@
esac
fi
cd ..
@@ -35752,7 +35796,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -31669,12 +34222,12 @@
+@@ -31667,12 +34302,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -35769,7 +35813,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -31702,8 +34255,8 @@
+@@ -31700,8 +34335,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.
@@ -35780,7 +35824,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31716,40 +34269,52 @@
+@@ -31714,40 +34349,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35845,7 +35889,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31758,14 +34323,15 @@
+@@ -31756,14 +34403,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35854,7 +35898,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
@@ -35865,7 +35909,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -31774,8 +34340,8 @@
+@@ -31772,8 +34420,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -35876,7 +35920,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31809,24 +34375,36 @@
+@@ -31807,24 +34455,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35921,7 +35965,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31835,10 +34413,11 @@
+@@ -31833,10 +34493,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35931,11 +35975,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
-@@ -31847,8 +34426,8 @@
+@@ -31845,8 +34506,8 @@
fi
@@ -35946,7 +35990,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -31910,8 +34489,8 @@
+@@ -31908,8 +34569,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -35957,7 +36001,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -31922,9 +34501,9 @@
+@@ -31920,9 +34581,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -35970,7 +36014,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -31936,40 +34515,52 @@
+@@ -31934,40 +34595,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36035,7 +36079,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31978,14 +34569,16 @@
+@@ -31976,14 +34649,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36044,7 +36088,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
@@ -36056,7 +36100,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -31998,8 +34591,8 @@
+@@ -31996,8 +34671,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -36067,7 +36111,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32012,40 +34605,52 @@
+@@ -32010,40 +34685,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36132,7 +36176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32054,14 +34659,15 @@
+@@ -32052,14 +34739,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36141,7 +36185,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
@@ -36152,7 +36196,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -32069,8 +34675,8 @@
+@@ -32067,8 +34755,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -36163,7 +36207,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -32089,40 +34695,53 @@
+@@ -32087,40 +34775,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36226,11 +36270,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
-@@ -32137,16 +34756,15 @@
+@@ -32135,16 +34836,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -36251,7 +36295,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'
-@@ -32173,24 +34791,36 @@
+@@ -32171,24 +34871,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36296,7 +36340,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32199,8 +34829,10 @@
+@@ -32197,8 +34909,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36304,11 +36348,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
-@@ -32213,13 +34845,13 @@
+@@ -32211,13 +34925,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36326,7 +36370,7 @@
:
fi
-@@ -32231,16 +34863,15 @@
+@@ -32229,16 +34943,15 @@
case $host_os in
solaris*)
@@ -36347,7 +36391,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'
-@@ -32267,24 +34898,36 @@
+@@ -32265,24 +34978,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36392,7 +36436,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32293,8 +34936,10 @@
+@@ -32291,8 +35016,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36400,11 +36444,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
-@@ -32307,13 +34952,13 @@
+@@ -32305,13 +35032,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36422,7 +36466,7 @@
:
fi
-@@ -32341,8 +34986,8 @@
+@@ -32339,8 +35066,8 @@
@@ -36433,7 +36477,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32376,24 +35021,36 @@
+@@ -32374,24 +35101,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36478,7 +36522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32402,9 +35059,10 @@
+@@ -32400,9 +35139,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36487,11 +36531,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"
-@@ -32417,8 +35075,8 @@
+@@ -32415,8 +35155,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -36502,7 +36546,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -32438,8 +35096,8 @@
+@@ -32436,8 +35176,8 @@
@@ -36513,7 +36557,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32475,24 +35133,36 @@
+@@ -32473,24 +35213,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36558,7 +36602,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32501,10 +35171,11 @@
+@@ -32499,10 +35251,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36568,11 +36612,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"
-@@ -32518,19 +35189,19 @@
+@@ -32516,19 +35269,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -36598,7 +36642,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32563,24 +35234,36 @@
+@@ -32561,24 +35314,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36643,7 +36687,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32589,9 +35272,10 @@
+@@ -32587,9 +35352,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36652,11 +36696,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"
-@@ -32601,14 +35285,14 @@
+@@ -32599,14 +35365,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -36677,7 +36721,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32641,24 +35325,36 @@
+@@ -32639,24 +35405,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36722,7 +36766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32667,9 +35363,10 @@
+@@ -32665,9 +35443,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36731,11 +36775,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"
-@@ -32679,11 +35376,11 @@
+@@ -32677,11 +35456,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -36751,16 +36795,16 @@
LIBJPEG=
-@@ -32703,7 +35400,7 @@
+@@ -32701,7 +35480,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 32706: $i/$j" >&5
-+ echo "configure: 35403: $i/$j" >&5
+- echo "configure: 32704: $i/$j" >&5
++ echo "configure: 35483: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -32750,14 +35447,14 @@
+@@ -32748,14 +35527,14 @@
@@ -36778,7 +36822,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32800,8 +35497,8 @@
+@@ -32798,8 +35577,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36789,7 +36833,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -32810,8 +35507,8 @@
+@@ -32808,8 +35587,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36800,7 +36844,7 @@
PERL=$kde_cv_path
fi
-@@ -32825,10 +35522,9 @@
+@@ -32823,10 +35602,9 @@
@@ -36813,7 +36857,7 @@
else
if test $kde_qtver = 3; then
-@@ -32838,7 +35534,8 @@
+@@ -32836,7 +35614,8 @@
fi
@@ -36823,7 +36867,7 @@
USING_QT_MT=""
-@@ -32858,13 +35555,13 @@
+@@ -32856,13 +35635,13 @@
else
kde_check_threading_default=yes
fi
@@ -36841,7 +36885,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -32936,8 +35633,8 @@
+@@ -32934,8 +35713,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -36852,7 +36896,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"
-@@ -32946,34 +35643,34 @@
+@@ -32944,34 +35723,34 @@
qt_libraries=""
qt_includes=""
@@ -36899,16 +36943,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33001,7 +35698,7 @@
+@@ -32999,7 +35778,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 33004: $i/$j" >&5
-+ echo "configure: 35701: $i/$j" >&5
+- echo "configure: 33002: $i/$j" >&5
++ echo "configure: 35781: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -33038,8 +35735,7 @@
+@@ -33036,8 +35815,7 @@
ac_qt_libraries="$qt_libdir"
@@ -36918,7 +36962,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'
-@@ -33176,13 +35872,13 @@
+@@ -33174,13 +35952,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -36936,7 +36980,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -33191,15 +35887,14 @@
+@@ -33189,15 +35967,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -36955,7 +36999,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'
-@@ -33320,12 +36015,12 @@
+@@ -33318,12 +36095,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -36972,7 +37016,7 @@
fi
-@@ -33363,14 +36058,14 @@
+@@ -33361,14 +36138,14 @@
fi
@@ -36990,7 +37034,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33413,8 +36108,8 @@
+@@ -33411,8 +36188,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37001,7 +37045,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -33435,22 +36130,22 @@
+@@ -33433,22 +36210,22 @@
{ (exit 1); exit 1; }; }
else
@@ -37029,7 +37073,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33493,12 +36188,12 @@
+@@ -33491,12 +36268,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37046,7 +37090,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -33528,10 +36223,10 @@
+@@ -33526,10 +36303,10 @@
if test $kde_qtver = 3; then
@@ -37060,7 +37104,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33554,22 +36249,22 @@
+@@ -33552,22 +36329,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -37090,7 +37134,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33592,13 +36287,13 @@
+@@ -33590,13 +36367,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -37108,7 +37152,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -33629,15 +36324,14 @@
+@@ -33627,15 +36404,14 @@
if test -n "$LIBJPEG"; then
@@ -37127,7 +37171,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'
-@@ -33670,24 +36364,36 @@
+@@ -33668,24 +36444,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37172,7 +37216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33696,9 +36402,10 @@
+@@ -33694,9 +36482,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37181,11 +37225,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"
-@@ -33714,12 +36421,12 @@
+@@ -33712,12 +36501,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -37202,7 +37246,7 @@
LIBJPEG_QT=
fi
-@@ -33749,15 +36456,15 @@
+@@ -33747,15 +36536,15 @@
@@ -37224,7 +37268,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -33781,11 +36488,11 @@
+@@ -33779,11 +36568,11 @@
@@ -37240,34 +37284,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -33837,7 +36544,7 @@
+@@ -33835,7 +36624,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 33840: $i/$j" >&5
-+ echo "configure: 36547: $i/$j" >&5
+- echo "configure: 33838: $i/$j" >&5
++ echo "configure: 36627: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -33867,7 +36574,7 @@
+@@ -33865,7 +36654,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 33870: $i/$j" >&5
-+ echo "configure: 36577: $i/$j" >&5
+- echo "configure: 33868: $i/$j" >&5
++ echo "configure: 36657: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -33885,7 +36592,7 @@
+@@ -33883,7 +36672,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 33888: $i/$j" >&5
-+ echo "configure: 36595: $i/$j" >&5
+- echo "configure: 33886: $i/$j" >&5
++ echo "configure: 36675: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -33944,12 +36651,12 @@
+@@ -33942,12 +36731,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -37284,7 +37328,7 @@
fi
kde_libraries="${libdir}"
-@@ -33958,8 +36665,8 @@
+@@ -33956,8 +36745,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -37295,7 +37339,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -33997,8 +36704,8 @@
+@@ -33995,8 +36784,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -37306,7 +37350,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34041,8 +36748,8 @@
+@@ -34039,8 +36828,8 @@
fi
@@ -37317,7 +37361,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -34073,8 +36780,8 @@
+@@ -34071,8 +36860,8 @@
@@ -37328,7 +37372,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34091,30 +36798,42 @@
+@@ -34089,30 +36878,42 @@
int
main ()
{
@@ -37380,7 +37424,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34123,19 +36842,20 @@
+@@ -34121,19 +36922,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37389,7 +37433,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
@@ -37407,7 +37451,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34152,30 +36872,42 @@
+@@ -34150,30 +36952,42 @@
int
main ()
{
@@ -37459,7 +37503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34184,19 +36916,20 @@
+@@ -34182,19 +36996,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37468,7 +37512,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
@@ -37486,7 +37530,7 @@
if test "${ac_cv_func_sem_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34223,53 +36956,59 @@
+@@ -34221,53 +37036,59 @@
#undef sem_init
@@ -37565,7 +37609,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34278,18 +37017,19 @@
+@@ -34276,18 +37097,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37574,7 +37618,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_sem_init" >&5
@@ -37591,7 +37635,7 @@
if test "${ac_cv_lib_rt_sem_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34302,40 +37042,52 @@
+@@ -34300,40 +37122,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37656,7 +37700,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34344,14 +37096,15 @@
+@@ -34342,14 +37176,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37665,7 +37709,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
@@ -37676,7 +37720,7 @@
if test $ac_cv_lib_rt_sem_init = yes; then
LIBSEM="-lrt"
fi
-@@ -34405,10 +37158,9 @@
+@@ -34403,10 +37238,9 @@
@@ -37688,7 +37732,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'
-@@ -34421,18 +37173,19 @@
+@@ -34419,18 +37253,19 @@
for ac_header in X11/ICE/ICElib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37716,7 +37760,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34443,24 +37196,36 @@
+@@ -34441,24 +37276,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37761,7 +37805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34469,15 +37234,16 @@
+@@ -34467,15 +37314,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37784,7 +37828,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34486,8 +37252,13 @@
+@@ -34484,8 +37332,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37800,7 +37844,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34511,9 +37282,10 @@
+@@ -34509,9 +37362,10 @@
ac_header_preproc=no
fi
@@ -37813,7 +37857,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34537,25 +37309,19 @@
+@@ -34535,25 +37389,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;}
@@ -37846,7 +37890,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34577,8 +37343,8 @@
+@@ -34575,8 +37423,8 @@
ac_cpp=$ac_cpp_safe
@@ -37857,7 +37901,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34602,24 +37368,36 @@
+@@ -34600,24 +37448,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37902,7 +37946,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34628,12 +37406,13 @@
+@@ -34626,12 +37486,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37920,7 +37964,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34642,8 +37421,8 @@
+@@ -34640,8 +37501,8 @@
fi
@@ -37931,7 +37975,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34669,24 +37448,36 @@
+@@ -34658,7 +37519,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
+
+@@ -34667,24 +37529,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37976,7 +38030,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34712,24 +37503,36 @@
+@@ -34710,24 +37584,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38021,7 +38075,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34738,14 +37541,15 @@
+@@ -34736,14 +37622,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38040,7 +38094,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -34755,11 +37559,11 @@
+@@ -34753,11 +37640,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38056,7 +38110,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -34770,24 +37574,36 @@
+@@ -34768,24 +37655,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38101,7 +38155,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34806,8 +37622,10 @@
+@@ -34804,8 +37703,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38113,7 +38167,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -34815,27 +37633,41 @@
+@@ -34813,27 +37714,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38162,7 +38216,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34848,13 +37680,16 @@
+@@ -34846,13 +37761,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -38183,7 +38237,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -34896,9 +37731,9 @@
+@@ -34894,9 +37812,9 @@
for ac_func in socket snprintf vsnprintf seteuid setegid random strfmon stpcpy mkstemp setmntent gettimeofday vasprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38196,7 +38250,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34924,53 +37759,59 @@
+@@ -34922,53 +37840,59 @@
#undef $ac_func
@@ -38275,7 +38329,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34979,13 +37820,15 @@
+@@ -34977,13 +37901,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38284,7 +38338,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
@@ -38295,7 +38349,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34994,8 +37837,8 @@
+@@ -34992,8 +37918,8 @@
fi
done
@@ -38306,7 +38360,7 @@
if test "${ac_cv_type_pid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35006,36 +37849,49 @@
+@@ -35004,36 +37930,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -38366,7 +38420,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35044,12 +37900,13 @@
+@@ -35042,12 +37981,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38384,7 +38438,7 @@
if test $ac_cv_type_pid_t = yes; then
:
else
-@@ -35061,22 +37918,22 @@
+@@ -35059,22 +37999,22 @@
fi
@@ -38417,7 +38471,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35087,24 +37944,36 @@
+@@ -35085,24 +38025,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38462,7 +38516,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35113,15 +37982,16 @@
+@@ -35111,15 +38063,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38485,7 +38539,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35130,8 +38000,13 @@
+@@ -35128,8 +38081,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38501,7 +38555,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -35155,9 +38030,10 @@
+@@ -35153,9 +38111,10 @@
ac_header_preproc=no
fi
@@ -38514,7 +38568,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35181,25 +38057,19 @@
+@@ -35179,25 +38138,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;}
@@ -38547,7 +38601,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35216,9 +38086,9 @@
+@@ -35214,9 +38167,9 @@
for ac_func in fork vfork
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38560,7 +38614,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35244,53 +38114,59 @@
+@@ -35242,53 +38195,59 @@
#undef $ac_func
@@ -38639,7 +38693,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35299,13 +38175,15 @@
+@@ -35297,13 +38256,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38648,7 +38702,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
@@ -38659,7 +38713,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -35315,8 +38193,8 @@
+@@ -35313,8 +38274,8 @@
done
if test "x$ac_cv_func_fork" = xyes; then
@@ -38670,7 +38724,7 @@
if test "${ac_cv_func_fork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35324,27 +38202,40 @@
+@@ -35322,27 +38283,40 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
@@ -38727,7 +38781,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35357,11 +38248,13 @@
+@@ -35355,11 +38329,13 @@
( exit $ac_status )
ac_cv_func_fork_works=no
fi
@@ -38744,7 +38798,7 @@
else
ac_cv_func_fork_works=$ac_cv_func_fork
-@@ -35381,8 +38274,8 @@
+@@ -35379,8 +38355,8 @@
fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
if test "x$ac_cv_func_vfork" = xyes; then
@@ -38755,7 +38809,7 @@
if test "${ac_cv_func_vfork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35396,14 +38289,8 @@
+@@ -35394,15 +38370,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Thanks to Paul Eggert for this test. */
@@ -38768,10 +38822,12 @@
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
- #if HAVE_VFORK_H
+-#if HAVE_VFORK_H
++#ifdef HAVE_VFORK_H
# include <vfork.h>
#endif
-@@ -35475,7 +38362,7 @@
+ /* On some sparc systems, changes by the child to local and incoming
+@@ -35473,7 +38443,7 @@
while (wait(&status) != child)
;
@@ -38780,7 +38836,7 @@
/* Was there some problem with vforking? */
child < 0
-@@ -35492,13 +38379,22 @@
+@@ -35490,13 +38460,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -38807,7 +38863,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35511,11 +38407,13 @@
+@@ -35509,11 +38488,13 @@
( exit $ac_status )
ac_cv_func_vfork_works=no
fi
@@ -38824,7 +38880,7 @@
fi;
if test "x$ac_cv_func_fork_works" = xcross; then
-@@ -35547,15 +38445,14 @@
+@@ -35545,15 +38526,14 @@
@@ -38843,7 +38899,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'
-@@ -35567,9 +38464,6 @@
+@@ -35565,9 +38545,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38853,7 +38909,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35594,24 +38488,36 @@
+@@ -35592,24 +38569,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38898,7 +38954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35620,9 +38526,10 @@
+@@ -35618,9 +38607,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38911,7 +38967,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -35635,11 +38542,11 @@
+@@ -35633,11 +38623,11 @@
fi
@@ -38927,7 +38983,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35660,8 +38567,7 @@
+@@ -35658,8 +38648,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -38937,7 +38993,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'
-@@ -35698,24 +38604,36 @@
+@@ -35696,24 +38685,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38982,7 +39038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35725,10 +38643,11 @@
+@@ -35723,10 +38724,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38992,11 +39048,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
-@@ -35741,8 +38660,8 @@
+@@ -35739,8 +38741,8 @@
fi
@@ -39007,7 +39063,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -35766,15 +38685,14 @@
+@@ -35764,15 +38766,14 @@
@@ -39026,7 +39082,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'
-@@ -35786,9 +38704,6 @@
+@@ -35784,9 +38785,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -39036,7 +39092,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35811,24 +38726,36 @@
+@@ -35809,24 +38807,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39081,7 +39137,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35837,9 +38764,10 @@
+@@ -35835,9 +38845,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39094,7 +39150,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -35852,11 +38780,11 @@
+@@ -35850,11 +38861,11 @@
fi
@@ -39110,7 +39166,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35877,8 +38805,7 @@
+@@ -35875,8 +38886,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -39120,7 +39176,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'
-@@ -35913,24 +38840,36 @@
+@@ -35911,24 +38921,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -39165,7 +39221,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35940,10 +38879,11 @@
+@@ -35938,10 +38960,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39175,11 +39231,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
-@@ -35956,8 +38896,8 @@
+@@ -35954,8 +38977,8 @@
fi
@@ -39190,7 +39246,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -35981,15 +38921,14 @@
+@@ -35979,15 +39002,14 @@
@@ -39209,7 +39265,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'
-@@ -36001,9 +38940,6 @@
+@@ -35999,9 +39021,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -39219,7 +39275,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36030,24 +38966,36 @@
+@@ -36028,24 +39047,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39264,7 +39320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36056,9 +39004,10 @@
+@@ -36054,9 +39085,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39277,7 +39333,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -36071,11 +39020,11 @@
+@@ -36069,11 +39101,11 @@
fi
@@ -39293,7 +39349,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36096,8 +39045,7 @@
+@@ -36094,8 +39126,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -39303,7 +39359,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'
-@@ -36136,24 +39084,36 @@
+@@ -36134,24 +39165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -39348,7 +39404,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36163,10 +39123,11 @@
+@@ -36161,10 +39204,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39358,11 +39414,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
-@@ -36179,8 +39140,8 @@
+@@ -36177,8 +39221,8 @@
fi
@@ -39373,7 +39429,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -36204,15 +39165,14 @@
+@@ -36202,15 +39246,14 @@
@@ -39392,7 +39448,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'
-@@ -36224,9 +39184,6 @@
+@@ -36222,9 +39265,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -39402,7 +39458,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36251,24 +39208,36 @@
+@@ -36249,24 +39289,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39447,7 +39503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36277,9 +39246,10 @@
+@@ -36275,9 +39327,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39460,7 +39516,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -36292,11 +39262,11 @@
+@@ -36290,11 +39343,11 @@
fi
@@ -39476,7 +39532,7 @@
if test "${kde_cv_proto_random+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36317,8 +39287,7 @@
+@@ -36315,8 +39368,7 @@
if test "x$kde_cv_proto_random" = xunknown; then
@@ -39486,7 +39542,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'
-@@ -36355,24 +39324,36 @@
+@@ -36353,24 +39405,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -39531,7 +39587,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36382,10 +39363,11 @@
+@@ -36380,10 +39444,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39541,11 +39597,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
-@@ -36398,8 +39380,8 @@
+@@ -36396,8 +39461,8 @@
fi
@@ -39556,7 +39612,7 @@
if test "x$kde_cv_func_random" = xyes; then
-@@ -36422,15 +39404,14 @@
+@@ -36420,15 +39485,14 @@
@@ -39575,7 +39631,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'
-@@ -36442,9 +39423,6 @@
+@@ -36440,9 +39504,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -39585,7 +39641,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36469,24 +39447,36 @@
+@@ -36467,24 +39528,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39630,7 +39686,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36495,9 +39485,10 @@
+@@ -36493,9 +39566,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39643,7 +39699,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -36510,11 +39501,11 @@
+@@ -36508,11 +39582,11 @@
fi
@@ -39659,7 +39715,7 @@
if test "${kde_cv_proto_srandom+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36535,8 +39526,7 @@
+@@ -36533,8 +39607,7 @@
if test "x$kde_cv_proto_srandom" = xunknown; then
@@ -39669,7 +39725,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'
-@@ -36573,24 +39563,36 @@
+@@ -36571,24 +39644,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -39714,7 +39770,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36600,10 +39602,11 @@
+@@ -36598,10 +39683,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39724,11 +39780,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
-@@ -36616,8 +39619,8 @@
+@@ -36614,8 +39700,8 @@
fi
@@ -39739,7 +39795,7 @@
if test "x$kde_cv_func_srandom" = xyes; then
-@@ -36641,8 +39644,8 @@
+@@ -36639,8 +39725,8 @@
@@ -39750,7 +39806,7 @@
if test "${ac_cv_have_s_issock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36668,24 +39671,36 @@
+@@ -36666,24 +39752,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -39795,7 +39851,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36694,15 +39709,16 @@
+@@ -36692,15 +39790,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39804,7 +39860,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
@@ -39816,7 +39872,7 @@
if test "$ac_cv_have_s_issock" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -36716,13 +39732,13 @@
+@@ -36714,13 +39813,13 @@
@@ -39833,7 +39889,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'
-@@ -36751,24 +39767,36 @@
+@@ -36749,24 +39848,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39878,7 +39934,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36780,8 +39808,10 @@
+@@ -36778,8 +39889,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39890,7 +39946,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -36791,17 +39821,17 @@
+@@ -36789,17 +39902,17 @@
fi
@@ -39913,7 +39969,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'
-@@ -36830,24 +39860,36 @@
+@@ -36828,24 +39941,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39958,7 +40014,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36859,8 +39901,10 @@
+@@ -36857,8 +39982,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39970,7 +40026,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -36871,8 +39915,8 @@
+@@ -36869,8 +39996,8 @@
fi
@@ -39981,7 +40037,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -36934,13 +39978,13 @@
+@@ -36932,13 +40059,13 @@
@@ -39999,7 +40055,7 @@
if test "x$with_libaudioio" != xno; then
-@@ -36950,7 +39994,6 @@
+@@ -36948,7 +40075,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
arts_libaudioio_found=no
@@ -40007,7 +40063,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -36959,17 +40002,17 @@
+@@ -36957,17 +40083,17 @@
kde_have_libaudioio=no
if test "${ac_cv_header_libaudioio_h+set}" = set; then
@@ -40031,7 +40087,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36980,24 +40023,36 @@
+@@ -36978,24 +40104,36 @@
#include <libaudioio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40076,7 +40132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37006,15 +40061,16 @@
+@@ -37004,15 +40142,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40099,7 +40155,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37023,8 +40079,13 @@
+@@ -37021,8 +40160,13 @@
/* end confdefs.h. */
#include <libaudioio.h>
_ACEOF
@@ -40115,7 +40171,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37048,9 +40109,10 @@
+@@ -37046,9 +40190,10 @@
ac_header_preproc=no
fi
@@ -40128,7 +40184,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37074,25 +40136,18 @@
+@@ -37072,25 +40217,18 @@
echo "$as_me: WARNING: libaudioio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libaudioio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libaudioio.h: in the future, the compiler will take precedence" >&2;}
@@ -40159,7 +40215,7 @@
fi
if test $ac_cv_header_libaudioio_h = yes; then
-@@ -37103,8 +40158,8 @@
+@@ -37101,8 +40239,8 @@
if test "x$kde_have_libaudioio" = "xyes"; then
@@ -40170,7 +40226,7 @@
if test "${ac_cv_lib_audioio_AudioIOGetVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37117,40 +40172,52 @@
+@@ -37115,40 +40253,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40235,7 +40291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37159,14 +40226,15 @@
+@@ -37157,14 +40307,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40244,7 +40300,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
@@ -40255,7 +40311,7 @@
if test $ac_cv_lib_audioio_AudioIOGetVersion = yes; then
LIBAUDIOIO="$LDFLAGS -laudioio"
-@@ -37201,13 +40269,13 @@
+@@ -37199,13 +40350,13 @@
fi
@@ -40273,7 +40329,7 @@
if test "x$with_nas" != xno; then
-@@ -37217,7 +40285,6 @@
+@@ -37215,7 +40366,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40281,7 +40337,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -37226,17 +40293,17 @@
+@@ -37224,17 +40374,17 @@
arts_libaudionas_include=no
if test "${ac_cv_header_audio_audiolib_h+set}" = set; then
@@ -40305,7 +40361,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37247,24 +40314,36 @@
+@@ -37245,24 +40395,36 @@
#include <audio/audiolib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40350,7 +40406,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37273,15 +40352,16 @@
+@@ -37271,15 +40433,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40373,7 +40429,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37290,8 +40370,13 @@
+@@ -37288,8 +40451,13 @@
/* end confdefs.h. */
#include <audio/audiolib.h>
_ACEOF
@@ -40389,7 +40445,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37315,9 +40400,10 @@
+@@ -37313,9 +40481,10 @@
ac_header_preproc=no
fi
@@ -40402,7 +40458,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37341,25 +40427,18 @@
+@@ -37339,25 +40508,18 @@
echo "$as_me: WARNING: audio/audiolib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: audio/audiolib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: audio/audiolib.h: in the future, the compiler will take precedence" >&2;}
@@ -40433,7 +40489,7 @@
fi
if test $ac_cv_header_audio_audiolib_h = yes; then
-@@ -37370,8 +40449,8 @@
+@@ -37368,8 +40530,8 @@
if test "x$arts_libaudionas_include" = "xyes"; then
@@ -40444,7 +40500,7 @@
if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37384,40 +40463,52 @@
+@@ -37382,40 +40544,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40509,7 +40565,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37426,14 +40517,15 @@
+@@ -37424,14 +40598,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40518,7 +40574,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
@@ -40529,7 +40585,7 @@
if test $ac_cv_lib_audio_AuOpenServer = yes; then
LIBAUDIONAS="-laudio -lXt"
-@@ -37469,13 +40561,13 @@
+@@ -37467,13 +40642,13 @@
fi
@@ -40547,7 +40603,7 @@
if test "x$with_esd" != xno; then
-@@ -37485,7 +40577,6 @@
+@@ -37483,7 +40658,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -40555,7 +40611,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -37494,17 +40585,17 @@
+@@ -37492,17 +40666,17 @@
arts_libaudionas_include=no
if test "${ac_cv_header_esd_h+set}" = set; then
@@ -40579,7 +40635,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37515,24 +40606,36 @@
+@@ -37513,24 +40687,36 @@
#include <esd.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40624,7 +40680,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37541,15 +40644,16 @@
+@@ -37539,15 +40725,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40647,7 +40703,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37558,8 +40662,13 @@
+@@ -37556,8 +40743,13 @@
/* end confdefs.h. */
#include <esd.h>
_ACEOF
@@ -40663,7 +40719,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37583,9 +40692,10 @@
+@@ -37581,9 +40773,10 @@
ac_header_preproc=no
fi
@@ -40676,7 +40732,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37609,25 +40719,18 @@
+@@ -37607,25 +40800,18 @@
echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: esd.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: esd.h: in the future, the compiler will take precedence" >&2;}
@@ -40707,7 +40763,7 @@
fi
if test $ac_cv_header_esd_h = yes; then
-@@ -37638,8 +40741,8 @@
+@@ -37636,8 +40822,8 @@
if test "x$arts_libesd_include" = "xyes"; then
@@ -40718,7 +40774,7 @@
if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37652,40 +40755,52 @@
+@@ -37650,40 +40836,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40783,7 +40839,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37694,14 +40809,15 @@
+@@ -37692,14 +40890,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40792,7 +40848,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
@@ -40803,7 +40859,7 @@
if test $ac_cv_lib_esd_esd_open_sound = yes; then
LIBESD="-lesd"
-@@ -37737,13 +40853,13 @@
+@@ -37735,13 +40934,13 @@
fi
@@ -40821,7 +40877,7 @@
if test "x$with_audiofile" != xno; then
-@@ -37753,7 +40869,6 @@
+@@ -37751,7 +40950,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
arts_audiolib_found=no
@@ -40829,7 +40885,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -37762,17 +40877,17 @@
+@@ -37760,17 +40958,17 @@
kde_has_audio_lib=no
if test "${ac_cv_header_audiofile_h+set}" = set; then
@@ -40853,7 +40909,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37783,24 +40898,36 @@
+@@ -37781,24 +40979,36 @@
#include <audiofile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -40898,7 +40954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37809,15 +40936,16 @@
+@@ -37807,15 +41017,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40921,7 +40977,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37826,8 +40954,13 @@
+@@ -37824,8 +41035,13 @@
/* end confdefs.h. */
#include <audiofile.h>
_ACEOF
@@ -40937,7 +40993,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -37851,9 +40984,10 @@
+@@ -37849,9 +41065,10 @@
ac_header_preproc=no
fi
@@ -40950,7 +41006,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37877,25 +41011,18 @@
+@@ -37875,25 +41092,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;}
@@ -40981,7 +41037,7 @@
fi
if test $ac_cv_header_audiofile_h = yes; then
-@@ -37915,8 +41042,8 @@
+@@ -37913,8 +41123,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -40992,7 +41048,7 @@
if test "${ac_cv_lib_audiofile_afOpenFile+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37929,40 +41056,52 @@
+@@ -37927,40 +41137,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41057,7 +41113,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37971,14 +41110,15 @@
+@@ -37969,14 +41191,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41066,7 +41122,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
@@ -41077,7 +41133,7 @@
if test $ac_cv_lib_audiofile_afOpenFile = yes; then
LIBAUDIOFILE="-laudiofile"
LIBAUDIOFILE_LDFLAGS="$LDFLAGS"
-@@ -38027,13 +41167,13 @@
+@@ -38025,13 +41248,13 @@
@@ -41095,7 +41151,7 @@
if test "x$with_sgilibaudio" != xno; then
-@@ -38043,7 +41183,6 @@
+@@ -38041,7 +41264,6 @@
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -41103,7 +41159,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38052,17 +41191,17 @@
+@@ -38050,17 +41272,17 @@
arts_dmedia_include=no
if test "${ac_cv_header_dmedia_audio_h+set}" = set; then
@@ -41127,7 +41183,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38073,24 +41212,36 @@
+@@ -38071,24 +41293,36 @@
#include <dmedia/audio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41172,7 +41228,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38099,15 +41250,16 @@
+@@ -38097,15 +41331,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41195,7 +41251,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38116,8 +41268,13 @@
+@@ -38114,8 +41349,13 @@
/* end confdefs.h. */
#include <dmedia/audio.h>
_ACEOF
@@ -41211,7 +41267,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -38141,9 +41298,10 @@
+@@ -38139,9 +41379,10 @@
ac_header_preproc=no
fi
@@ -41224,7 +41280,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -38167,25 +41325,18 @@
+@@ -38165,25 +41406,18 @@
echo "$as_me: WARNING: dmedia/audio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: dmedia/audio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: dmedia/audio.h: in the future, the compiler will take precedence" >&2;}
@@ -41255,7 +41311,7 @@
fi
if test $ac_cv_header_dmedia_audio_h = yes; then
-@@ -38205,8 +41356,8 @@
+@@ -38203,8 +41437,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41266,7 +41322,7 @@
if test "${ac_cv_lib_audio_alOpenPort+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38219,40 +41370,52 @@
+@@ -38217,40 +41451,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41331,7 +41387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38261,14 +41424,15 @@
+@@ -38259,14 +41505,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41340,7 +41396,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
@@ -41351,7 +41407,7 @@
if test $ac_cv_lib_audio_alOpenPort = yes; then
SGILIBAUDIO="-laudio"
-@@ -38304,20 +41468,20 @@
+@@ -38302,20 +41549,20 @@
fi
@@ -41378,7 +41434,7 @@
if test "${ac_cv_path_MAS_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38332,29 +41496,30 @@
+@@ -38330,29 +41577,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -41415,7 +41471,7 @@
if test "$MAS_CONFIG" != "no"; then
cat >>confdefs.h <<\_ACEOF
-@@ -38384,8 +41549,8 @@
+@@ -38382,8 +41630,8 @@
fi
@@ -41426,7 +41482,7 @@
save_LIBS="$LIBS"
LIBPOSIX4=""
-@@ -38409,24 +41574,36 @@
+@@ -38407,24 +41655,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41471,7 +41527,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38435,9 +41612,10 @@
+@@ -38433,9 +41693,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41480,11 +41536,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 "x$arts_realtime_sched" = "xno"; then
-@@ -38463,24 +41641,36 @@
+@@ -38461,24 +41722,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41529,7 +41585,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38489,9 +41679,10 @@
+@@ -38487,9 +41760,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41538,11 +41594,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 "x$arts_realtime_sched" = "xyes"; then
-@@ -38500,8 +41691,8 @@
+@@ -38498,8 +41772,8 @@
fi
LIBS="$save_LIBS"
@@ -41553,7 +41609,7 @@
if test "x$arts_realtime_sched" = "xyes"; then
-@@ -38513,15 +41704,14 @@
+@@ -38511,15 +41785,14 @@
@@ -41572,7 +41628,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'
-@@ -38533,9 +41723,6 @@
+@@ -38531,9 +41804,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41582,7 +41638,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38563,24 +41750,36 @@
+@@ -38561,24 +41831,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41627,7 +41683,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38589,9 +41788,10 @@
+@@ -38587,9 +41869,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41640,7 +41696,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38604,11 +41804,11 @@
+@@ -38602,11 +41885,11 @@
fi
@@ -41656,7 +41712,7 @@
if test "${kde_cv_proto_getdomainname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38629,8 +41829,7 @@
+@@ -38627,8 +41910,7 @@
if test "x$kde_cv_proto_getdomainname" = xunknown; then
@@ -41666,7 +41722,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'
-@@ -38671,24 +41870,36 @@
+@@ -38669,24 +41951,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41711,7 +41767,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38698,10 +41909,11 @@
+@@ -38696,10 +41990,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41721,11 +41777,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
-@@ -38714,8 +41926,8 @@
+@@ -38712,8 +42007,8 @@
fi
@@ -41736,7 +41792,7 @@
if test "x$kde_cv_func_getdomainname" = xyes; then
-@@ -38738,14 +41950,13 @@
+@@ -38736,14 +42031,13 @@
@@ -41753,7 +41809,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38774,24 +41985,36 @@
+@@ -38772,24 +42066,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41798,7 +41854,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38800,8 +42023,10 @@
+@@ -38798,8 +42104,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41810,7 +41866,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38823,24 +42048,36 @@
+@@ -38821,24 +42129,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41855,7 +41911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38849,8 +42086,10 @@
+@@ -38847,8 +42167,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41867,7 +41923,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38872,24 +42111,36 @@
+@@ -38870,24 +42192,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41912,7 +41968,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38898,8 +42149,10 @@
+@@ -38896,8 +42230,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41924,7 +41980,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -38909,8 +42162,8 @@
+@@ -38907,8 +42243,8 @@
fi
@@ -41935,7 +41991,7 @@
if test "$ac_cv_ioctl_type" = "1"; then
-@@ -38936,15 +42189,14 @@
+@@ -38934,15 +42270,14 @@
fi
@@ -41954,7 +42010,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'
-@@ -38982,24 +42234,36 @@
+@@ -38980,24 +42315,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41999,7 +42055,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39008,9 +42272,10 @@
+@@ -39006,9 +42353,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42008,11 +42064,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'
-@@ -39021,8 +42286,8 @@
+@@ -39019,8 +42367,8 @@
fi
@@ -42023,7 +42079,7 @@
if test "x$ac_cv_x86_float_int" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -39032,8 +42297,8 @@
+@@ -39030,8 +42378,8 @@
fi
@@ -42034,7 +42090,7 @@
if test "${ac_cv_x86_sse+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39061,24 +42326,36 @@
+@@ -39059,24 +42407,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42079,7 +42135,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39087,14 +42364,15 @@
+@@ -39085,14 +42445,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42099,7 +42155,7 @@
if test "x$ac_cv_x86_sse" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -39104,14 +42382,13 @@
+@@ -39102,14 +42463,13 @@
fi
@@ -42116,7 +42172,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -39142,24 +42419,36 @@
+@@ -39140,24 +42500,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42161,7 +42217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39168,9 +42457,10 @@
+@@ -39166,9 +42538,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42170,11 +42226,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
fi
-@@ -39181,8 +42471,8 @@
+@@ -39179,8 +42552,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -42185,7 +42241,7 @@
if test "x$ac_cv_artsdsp_stdio_emu" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -39203,13 +42493,13 @@
+@@ -39201,13 +42574,13 @@
else
kde_check_threading_default=yes
fi
@@ -42203,7 +42259,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -39221,16 +42511,15 @@
+@@ -39219,16 +42592,15 @@
if test "$GXX" = "yes"; then
@@ -42224,7 +42280,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'
-@@ -39257,24 +42546,36 @@
+@@ -39255,24 +42627,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42269,7 +42325,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39283,8 +42584,10 @@
+@@ -39281,8 +42665,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42277,11 +42333,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
-@@ -39297,15 +42600,15 @@
+@@ -39295,15 +42681,15 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -42301,7 +42357,7 @@
:
fi
-@@ -39314,11 +42617,11 @@
+@@ -39312,11 +42698,11 @@
arts_with_alsa=yes
@@ -42317,7 +42373,7 @@
if test "$arts_with_alsa" = "yes"; then
-@@ -39332,18 +42635,19 @@
+@@ -39330,18 +42716,19 @@
for ac_header in sys/asoundlib.h alsa/asoundlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -42345,7 +42401,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39354,24 +42658,36 @@
+@@ -39352,24 +42739,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -42390,7 +42446,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39380,15 +42696,16 @@
+@@ -39378,15 +42777,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42413,7 +42469,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39397,8 +42714,13 @@
+@@ -39395,8 +42795,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -42429,7 +42485,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39422,9 +42744,10 @@
+@@ -39420,9 +42825,10 @@
ac_header_preproc=no
fi
@@ -42442,7 +42498,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39448,25 +42771,19 @@
+@@ -39446,25 +42852,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;}
@@ -42475,7 +42531,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39482,7 +42799,6 @@
+@@ -39480,7 +42880,6 @@
@@ -42483,7 +42539,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -39520,24 +42836,36 @@
+@@ -39518,24 +42917,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42528,7 +42584,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39546,9 +42874,10 @@
+@@ -39544,9 +42955,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42541,7 +42597,7 @@
fi
if test "x$kde_has_asoundlib" = "xyes"; then
-@@ -39582,24 +42911,36 @@
+@@ -39580,24 +42992,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42586,7 +42642,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39608,9 +42949,10 @@
+@@ -39606,9 +43030,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42599,7 +42655,7 @@
fi
if test "x$kde_has_asoundlib" = "xyes"; then
-@@ -39644,24 +42986,36 @@
+@@ -39642,24 +43067,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42644,7 +42700,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39670,9 +43024,10 @@
+@@ -39668,9 +43105,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42657,7 +42713,7 @@
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -39682,8 +43037,8 @@
+@@ -39680,8 +43118,8 @@
if test "x$kde_has_asoundlib" = "xyes"; then
@@ -42668,7 +42724,7 @@
if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39696,40 +43051,52 @@
+@@ -39694,40 +43132,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42733,7 +42789,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39738,14 +43105,15 @@
+@@ -39736,14 +43186,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42742,7 +42798,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
@@ -42753,7 +42809,7 @@
if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
if test "x$kde_has_alsa_0_5" = "xyes"; then
-@@ -39763,8 +43131,8 @@
+@@ -39761,8 +43212,8 @@
#define HAVE_LIBASOUND2 1
_ACEOF
@@ -42764,7 +42820,7 @@
if test "${ac_cv_lib_asound_snd_pcm_resume+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39777,40 +43145,52 @@
+@@ -39775,40 +43226,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42829,7 +42885,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39819,14 +43199,15 @@
+@@ -39817,14 +43280,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42838,7 +42894,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
@@ -42849,7 +42905,7 @@
if test $ac_cv_lib_asound_snd_pcm_resume = yes; then
-@@ -39854,8 +43235,8 @@
+@@ -39852,8 +43316,8 @@
#define ALSA_PCM_OLD_HW_PARAMS_API 1
_ACEOF
@@ -42860,7 +42916,7 @@
if test "${ac_cv_lib_asound_snd_pcm_resume+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39868,40 +43249,52 @@
+@@ -39866,40 +43330,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42925,7 +42981,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39910,14 +43303,15 @@
+@@ -39908,14 +43384,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42934,7 +42990,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
@@ -42945,7 +43001,7 @@
if test $ac_cv_lib_asound_snd_pcm_resume = yes; then
-@@ -39939,28 +43333,28 @@
+@@ -39937,28 +43414,28 @@
@@ -42984,7 +43040,7 @@
if test "$arts_want_csl" = "yes"; then
LIBCSL="-lcsl"
-@@ -39976,8 +43370,8 @@
+@@ -39974,8 +43451,8 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -42995,7 +43051,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39992,29 +43386,30 @@
+@@ -39990,29 +43467,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43032,7 +43088,7 @@
if test "$PKG_CONFIG" = "no"; then
{ { echo "$as_me:$LINENO: error:
This package requires pkg-config.
-@@ -40031,32 +43426,32 @@
+@@ -40029,32 +43507,32 @@
GLIB_PACKAGES="gmodule-2.0 gthread-2.0"
GLIB_VERSION="1.3.3"
@@ -43073,7 +43129,7 @@
{ { echo "$as_me:$LINENO: error:
Please install glib-2.0 (see http://www.gtk.org).
" >&5
-@@ -40075,31 +43470,31 @@
+@@ -40073,31 +43551,31 @@
@@ -43115,7 +43171,7 @@
fi
-@@ -40118,18 +43513,19 @@
+@@ -40116,18 +43594,19 @@
for ac_header in soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -43143,7 +43199,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40140,24 +43536,36 @@
+@@ -40138,24 +43617,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -43188,7 +43244,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40166,15 +43574,16 @@
+@@ -40164,15 +43655,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43211,7 +43267,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40183,8 +43592,13 @@
+@@ -40181,8 +43673,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -43227,7 +43283,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40208,9 +43622,10 @@
+@@ -40206,9 +43703,10 @@
ac_header_preproc=no
fi
@@ -43240,7 +43296,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -40234,25 +43649,19 @@
+@@ -40232,25 +43730,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;}
@@ -43273,7 +43329,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -40264,8 +43673,8 @@
+@@ -40262,8 +43754,8 @@
done
@@ -43284,7 +43340,7 @@
if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40278,40 +43687,52 @@
+@@ -40276,40 +43768,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43349,7 +43405,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40320,23 +43741,24 @@
+@@ -40318,23 +43822,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43358,7 +43414,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
@@ -43380,7 +43436,7 @@
-@@ -40364,18 +43786,18 @@
+@@ -40362,18 +43867,18 @@
@@ -43405,7 +43461,7 @@
if test "${ac_cv_lib_vorbisfile_ov_read_float+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40388,40 +43810,52 @@
+@@ -40386,40 +43891,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43470,7 +43526,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40430,21 +43864,21 @@
+@@ -40428,21 +43945,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43479,7 +43535,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
@@ -43498,7 +43554,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'
-@@ -40454,17 +43888,17 @@
+@@ -40452,17 +43969,17 @@
if test "${ac_cv_header_ogg_ogg_h+set}" = set; then
@@ -43522,7 +43578,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40475,24 +43909,36 @@
+@@ -40473,24 +43990,36 @@
#include <ogg/ogg.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43567,7 +43623,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40501,15 +43947,16 @@
+@@ -40499,15 +44028,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43590,7 +43646,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40518,8 +43965,13 @@
+@@ -40516,8 +44046,13 @@
/* end confdefs.h. */
#include <ogg/ogg.h>
_ACEOF
@@ -43606,7 +43662,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40543,9 +43995,10 @@
+@@ -40541,9 +44076,10 @@
ac_header_preproc=no
fi
@@ -43619,7 +43675,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40569,25 +44022,18 @@
+@@ -40567,25 +44103,18 @@
echo "$as_me: WARNING: ogg/ogg.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ogg/ogg.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ogg/ogg.h: in the future, the compiler will take precedence" >&2;}
@@ -43650,7 +43706,7 @@
fi
if test $ac_cv_header_ogg_ogg_h = yes; then
-@@ -40607,8 +44053,7 @@
+@@ -40605,8 +44134,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43660,7 +43716,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'
-@@ -40618,17 +44063,17 @@
+@@ -40616,17 +44144,17 @@
if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
@@ -43684,7 +43740,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40639,24 +44084,36 @@
+@@ -40637,24 +44165,36 @@
#include <vorbis/vorbisfile.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43729,7 +43785,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40665,15 +44122,16 @@
+@@ -40663,15 +44203,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43752,7 +43808,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40682,8 +44140,13 @@
+@@ -40680,8 +44221,13 @@
/* end confdefs.h. */
#include <vorbis/vorbisfile.h>
_ACEOF
@@ -43768,7 +43824,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40707,9 +44170,10 @@
+@@ -40705,9 +44251,10 @@
ac_header_preproc=no
fi
@@ -43781,7 +43837,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40733,25 +44197,18 @@
+@@ -40731,25 +44278,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;}
@@ -43812,7 +43868,7 @@
fi
if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
-@@ -40771,8 +44228,7 @@
+@@ -40769,8 +44309,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43822,7 +43878,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'
-@@ -40782,17 +44238,17 @@
+@@ -40780,17 +44319,17 @@
if test "${ac_cv_header_vorbis_vorbisenc_h+set}" = set; then
@@ -43846,7 +43902,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40803,24 +44259,36 @@
+@@ -40801,24 +44340,36 @@
#include <vorbis/vorbisenc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43891,7 +43947,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40829,15 +44297,16 @@
+@@ -40827,15 +44378,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43914,7 +43970,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40846,8 +44315,13 @@
+@@ -40844,8 +44396,13 @@
/* end confdefs.h. */
#include <vorbis/vorbisenc.h>
_ACEOF
@@ -43930,7 +43986,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40871,9 +44345,10 @@
+@@ -40869,9 +44426,10 @@
ac_header_preproc=no
fi
@@ -43943,7 +43999,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40897,25 +44372,18 @@
+@@ -40895,25 +44453,18 @@
echo "$as_me: WARNING: vorbis/vorbisenc.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: vorbis/vorbisenc.h: in the future, the compiler will take precedence" >&2;}
@@ -43974,7 +44030,7 @@
fi
if test $ac_cv_header_vorbis_vorbisenc_h = yes; then
-@@ -40948,8 +44416,8 @@
+@@ -40946,8 +44497,8 @@
if test $GSL_HAVE_OGGVORBIS = 1; then
@@ -43985,7 +44041,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40970,31 +44438,43 @@
+@@ -40968,31 +44519,43 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44039,7 +44095,7 @@
else
echo "$as_me: failed program was:" >&5
-@@ -41002,26 +44482,27 @@
+@@ -41000,26 +44563,27 @@
GSL_HAVE_OGGVORBIS_RC3=0
@@ -44076,7 +44132,7 @@
if test "${ac_cv_lib_mad_mad_synth_frame+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41034,40 +44515,52 @@
+@@ -41032,40 +44596,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44141,7 +44197,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41076,27 +44569,28 @@
+@@ -41074,27 +44650,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44150,7 +44206,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
@@ -44180,7 +44236,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41107,24 +44601,36 @@
+@@ -41105,24 +44682,36 @@
#include <mad.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44225,7 +44281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41133,15 +44639,16 @@
+@@ -41131,15 +44720,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44248,7 +44304,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41150,8 +44657,13 @@
+@@ -41148,8 +44738,13 @@
/* end confdefs.h. */
#include <mad.h>
_ACEOF
@@ -44264,7 +44320,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -41175,9 +44687,10 @@
+@@ -41173,9 +44768,10 @@
ac_header_preproc=no
fi
@@ -44277,7 +44333,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -41201,25 +44714,18 @@
+@@ -41199,25 +44795,18 @@
echo "$as_me: WARNING: mad.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: mad.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: mad.h: in the future, the compiler will take precedence" >&2;}
@@ -44308,7 +44364,7 @@
fi
if test $ac_cv_header_mad_h = yes; then
-@@ -41243,21 +44749,21 @@
+@@ -41241,21 +44830,21 @@
fi
@@ -44338,7 +44394,7 @@
if test "${glib_cv_sizeof_pth_mutex_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41289,13 +44795,22 @@
+@@ -41287,13 +44876,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -44365,7 +44421,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41308,11 +44823,13 @@
+@@ -41306,11 +44904,13 @@
( exit $ac_status )
glib_cv_sizeof_pth_mutex_t=0
fi
@@ -44382,7 +44438,7 @@
cat >>confdefs.h <<_ACEOF
#define GLIB_SIZEOF_PTH_MUTEX_T $glib_cv_sizeof_pth_mutex_t
-@@ -41321,8 +44838,8 @@
+@@ -41319,8 +44919,8 @@
GSL_SIZEOF_PTH_MUTEX_T="$glib_cv_sizeof_pth_mutex_t"
@@ -44393,7 +44449,7 @@
if test "${glib_cv_sizeof_pth_cond_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41354,13 +44871,22 @@
+@@ -41352,13 +44952,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -44420,7 +44476,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41373,11 +44899,13 @@
+@@ -41371,11 +44980,13 @@
( exit $ac_status )
glib_cv_sizeof_pth_cond_t=0
fi
@@ -44437,7 +44493,7 @@
cat >>confdefs.h <<_ACEOF
#define GLIB_SIZEOF_PTH_COND_T $glib_cv_sizeof_pth_cond_t
-@@ -41386,8 +44914,8 @@
+@@ -41384,8 +44995,8 @@
GSL_SIZEOF_PTH_COND_T="$glib_cv_sizeof_pth_cond_t"
@@ -44448,7 +44504,7 @@
if test "${glib_cv_sizeof_std_intmax_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41419,13 +44947,22 @@
+@@ -41417,13 +45028,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -44475,7 +44531,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41438,11 +44975,13 @@
+@@ -41436,11 +45056,13 @@
( exit $ac_status )
glib_cv_sizeof_std_intmax_t=0
fi
@@ -44492,7 +44548,7 @@
cat >>confdefs.h <<_ACEOF
#define GLIB_SIZEOF_STD_INTMAX_T $glib_cv_sizeof_std_intmax_t
-@@ -41452,8 +44991,8 @@
+@@ -41450,8 +45072,8 @@
GSL_SIZEOF_STD_INTMAX_T="$glib_cv_sizeof_std_intmax_t"
@@ -44503,7 +44559,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41477,41 +45016,54 @@
+@@ -41475,41 +45097,54 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44572,7 +44628,7 @@
-@@ -41519,9 +45071,9 @@
+@@ -41517,9 +45152,9 @@
for ac_func in getcwd
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44585,7 +44641,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41547,53 +45099,59 @@
+@@ -41545,53 +45180,59 @@
#undef $ac_func
@@ -44664,7 +44720,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41602,13 +45160,15 @@
+@@ -41600,13 +45241,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44673,7 +44729,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
@@ -44684,7 +44740,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -41619,8 +45179,8 @@
+@@ -41617,8 +45260,8 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
@@ -44695,7 +44751,7 @@
if test "${ac_cv_working_alloca_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41635,29 +45195,42 @@
+@@ -41633,29 +45276,42 @@
main ()
{
char *p = (char *) alloca (2 * sizeof (int));
@@ -44746,7 +44802,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41666,13 +45239,14 @@
+@@ -41664,13 +45320,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44755,7 +44811,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_working_alloca_h" >&5
@@ -44765,7 +44821,7 @@
if test $ac_cv_working_alloca_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41681,8 +45255,8 @@
+@@ -41679,8 +45336,8 @@
fi
@@ -44776,7 +44832,16 @@
if test "${ac_cv_func_alloca_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41717,29 +45291,42 @@
+@@ -41697,7 +45354,7 @@
+ # include <malloc.h>
+ # define alloca _alloca
+ # else
+-# if HAVE_ALLOCA_H
++# ifdef HAVE_ALLOCA_H
+ # include <alloca.h>
+ # else
+ # ifdef _AIX
+@@ -41715,29 +45372,42 @@
main ()
{
char *p = (char *) alloca (1);
@@ -44827,7 +44892,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41748,13 +45335,14 @@
+@@ -41746,13 +45416,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44836,7 +44901,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_alloca_works" >&5
@@ -44846,7 +44911,7 @@
if test $ac_cv_func_alloca_works = yes; then
-@@ -41768,15 +45356,15 @@
+@@ -41766,15 +45437,15 @@
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
@@ -44865,7 +44930,7 @@
if test "${ac_cv_os_cray+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41786,7 +45374,7 @@
+@@ -41784,7 +45455,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44874,7 +44939,7 @@
webecray
#else
wenotbecray
-@@ -41802,14 +45390,14 @@
+@@ -41800,14 +45471,14 @@
rm -f conftest*
fi
@@ -44894,7 +44959,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41835,53 +45423,59 @@
+@@ -41833,53 +45504,59 @@
#undef $ac_func
@@ -44973,7 +45038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41890,13 +45484,15 @@
+@@ -41888,13 +45565,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44982,7 +45047,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
@@ -44993,7 +45058,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -41909,8 +45505,8 @@
+@@ -41907,8 +45586,8 @@
done
fi
@@ -45004,7 +45069,7 @@
if test "${ac_cv_c_stack_direction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41923,6 +45519,7 @@
+@@ -41921,6 +45600,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45012,7 +45077,7 @@
int
find_stack_direction ()
{
-@@ -41940,17 +45537,26 @@
+@@ -41938,17 +45618,26 @@
int
main ()
{
@@ -45044,7 +45109,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41963,11 +45569,13 @@
+@@ -41961,11 +45650,13 @@
( exit $ac_status )
ac_cv_c_stack_direction=-1
fi
@@ -45061,7 +45126,7 @@
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -41990,8 +45598,8 @@
+@@ -41988,8 +45679,8 @@
fi
@@ -45072,7 +45137,7 @@
if test "${glib_cv_va_copy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42025,13 +45633,22 @@
+@@ -42023,13 +45714,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -45099,7 +45164,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42044,14 +45661,16 @@
+@@ -42042,14 +45742,16 @@
( exit $ac_status )
glib_cv_va_copy=no
fi
@@ -45121,7 +45186,7 @@
if test "${glib_cv___va_copy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42085,13 +45704,22 @@
+@@ -42083,13 +45785,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -45148,7 +45213,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42104,12 +45732,14 @@
+@@ -42102,12 +45813,14 @@
( exit $ac_status )
glib_cv___va_copy=no
fi
@@ -45166,7 +45231,7 @@
if test "x$glib_cv_va_copy" = "xyes"; then
g_va_copy_func=va_copy
-@@ -42153,8 +45783,8 @@
+@@ -42151,8 +45864,8 @@
fi
for i in $ac_topsubdirs; do
@@ -45177,7 +45242,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -42165,8 +45795,8 @@
+@@ -42163,8 +45876,8 @@
else
install_it="no"
fi
@@ -45188,7 +45253,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -42308,47 +45938,47 @@
+@@ -42306,47 +46019,47 @@
x11_SUBDIR_included_FALSE=
fi
@@ -45257,7 +45322,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -42368,39 +45998,58 @@
+@@ -42366,39 +46079,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -45332,7 +45397,7 @@
fi
fi
rm -f confcache
-@@ -42409,38 +46058,31 @@
+@@ -42407,38 +46139,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -45384,7 +45449,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
-@@ -42640,11 +46282,35 @@
+@@ -42638,11 +46363,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -45422,7 +45487,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -42653,8 +46319,43 @@
+@@ -42651,8 +46400,43 @@
fi
@@ -45467,7 +45532,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -42668,18 +46369,19 @@
+@@ -42666,18 +46450,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -45490,7 +45555,7 @@
as_basename=basename
else
as_basename=false
-@@ -42687,159 +46389,120 @@
+@@ -42685,159 +46470,120 @@
# Name of the executable.
@@ -45721,7 +45786,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -42848,7 +46511,19 @@
+@@ -42846,7 +46592,19 @@
as_mkdir_p=false
fi
@@ -45742,7 +45807,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'"
-@@ -42857,31 +46532,14 @@
+@@ -42855,31 +46613,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -45774,11 +45839,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
-@@ -42889,30 +46547,20 @@
+@@ -42887,30 +46628,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -45817,7 +45882,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -42939,19 +46587,21 @@
+@@ -42918,7 +46649,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
+@@ -42937,19 +46668,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -45829,7 +45903,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.
@@ -45845,7 +45919,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -42962,39 +46612,24 @@
+@@ -42960,39 +46693,24 @@
do
case $1 in
--*=*)
@@ -45891,7 +45965,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -43004,18 +46639,24 @@
+@@ -43002,18 +46720,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -45921,7 +45995,7 @@
esac
shift
-@@ -43031,59 +46672,71 @@
+@@ -43029,59 +46753,71 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -46026,7 +46100,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
-@@ -43095,515 +46748,666 @@
+@@ -43093,515 +46829,666 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -47147,7 +47221,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -43611,248 +47415,130 @@
+@@ -43609,248 +47496,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -47497,7 +47571,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -43863,135 +47549,39 @@
+@@ -43861,135 +47630,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -47659,7 +47733,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.
-@@ -44001,18 +47591,29 @@
+@@ -43999,18 +47672,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
@@ -47697,7 +47771,7 @@
else
continue
fi
-@@ -44034,53 +47635,79 @@
+@@ -44032,53 +47716,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
More information about the pkg-kde-commits
mailing list