r13175 - in /desktop/unstable/glib2.0/debian: changelog patches/70_relibtoolize.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Oct 17 15:16:13 UTC 2007
Author: lool
Date: Wed Oct 17 15:16:13 2007
New Revision: 13175
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13175
Log:
* New upstream stable release; no API change.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/70_relibtoolize.patch
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=13175&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Wed Oct 17 15:16:13 2007
@@ -1,8 +1,9 @@
-glib2.0 (2.14.1-6) UNRELEASED; urgency=low
+glib2.0 (2.14.2-1) unstable; urgency=low
* Add GNOME bug id to 70_relibtoolize.
-
- -- Loic Minier <lool at dooz.org> Sun, 07 Oct 2007 17:11:01 +0200
+ * New upstream stable release; no API change.
+
+ -- Loic Minier <lool at dooz.org> Wed, 17 Oct 2007 17:11:12 +0200
glib2.0 (2.14.1-5) unstable; urgency=low
Modified: desktop/unstable/glib2.0/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/70_relibtoolize.patch?rev=13175&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/glib2.0/debian/patches/70_relibtoolize.patch Wed Oct 17 15:16:13 2007
@@ -6,9 +6,10 @@
rm -rf autom4te.cache
diff -x config.guess -x config.sub
---- glib2.0-2.14.1.orig/aclocal.m4 2007-09-16 18:29:31.000000000 +0200
-+++ glib2.0-2.14.1/aclocal.m4 2007-10-07 16:57:48.000000000 +0200
-@@ -1457,7 +1457,7 @@
+diff -uprN -x config.guess -x config.sub glib2.0-2.14.2.orig/aclocal.m4 glib2.0-2.14.2/aclocal.m4
+--- glib2.0-2.14.2.orig/aclocal.m4 2007-10-16 07:45:30.000000000 +0200
++++ glib2.0-2.14.2/aclocal.m4 2007-10-17 17:14:02.000000000 +0200
+@@ -1457,7 +1457,7 @@ AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -17,7 +18,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1620,7 +1620,7 @@
+@@ -1620,7 +1620,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -26,7 +27,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -1707,8 +1707,9 @@
+@@ -1707,8 +1707,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -38,7 +39,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -1720,8 +1721,9 @@
+@@ -1720,8 +1721,9 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -50,7 +51,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -1737,12 +1739,20 @@
+@@ -1737,12 +1739,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -76,7 +77,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1973,13 +1983,17 @@
+@@ -1973,13 +1983,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -95,7 +96,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1996,6 +2010,9 @@
+@@ -1996,6 +2010,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -105,7 +106,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -2067,7 +2084,7 @@
+@@ -2067,7 +2084,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -114,7 +115,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -2108,11 +2125,12 @@
+@@ -2108,11 +2125,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -129,7 +130,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -2226,24 +2244,27 @@
+@@ -2226,24 +2244,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
fi
;;
*)
@@ -174,7 +175,7 @@
;;
esac
])
-@@ -2470,7 +2491,8 @@
+@@ -2470,7 +2491,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -184,7 +185,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -2478,7 +2500,7 @@
+@@ -2478,7 +2500,7 @@ AC_CACHE_CHECK([if $compiler supports -c
mkdir conftest
cd conftest
mkdir out
@@ -193,7 +194,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -2618,6 +2640,7 @@
+@@ -2618,6 +2640,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -201,7 +202,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -2635,7 +2658,8 @@
+@@ -2635,7 +2658,8 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -211,7 +212,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -2649,20 +2673,58 @@
+@@ -2649,20 +2673,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -275,7 +276,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -2819,12 +2881,8 @@
+@@ -2819,12 +2881,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -290,7 +291,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -2841,18 +2899,6 @@
+@@ -2841,18 +2899,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -309,7 +310,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2890,7 +2936,7 @@
+@@ -2890,7 +2936,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -318,7 +319,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -2953,7 +2999,7 @@
+@@ -2953,7 +2999,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -327,7 +328,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3008,7 +3054,7 @@
+@@ -3008,7 +3054,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -336,7 +337,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3022,27 +3068,10 @@
+@@ -3022,27 +3068,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -366,7 +367,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3054,7 +3083,7 @@
+@@ -3054,7 +3083,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -375,7 +376,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3063,7 +3092,7 @@
+@@ -3063,7 +3092,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -384,7 +385,7 @@
;;
netbsd*)
-@@ -3147,6 +3176,10 @@
+@@ -3147,6 +3176,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -395,7 +396,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -3252,7 +3285,8 @@
+@@ -3252,7 +3285,8 @@ fi
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -405,7 +406,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -3513,7 +3547,7 @@
+@@ -3513,7 +3547,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -414,7 +415,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -3576,7 +3610,7 @@
+@@ -3576,7 +3610,7 @@ fi
# AC_PATH_MAGIC
# -------------
@@ -423,7 +424,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -3723,7 +3757,7 @@
+@@ -3723,7 +3757,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -432,7 +433,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -3762,16 +3796,22 @@
+@@ -3762,16 +3796,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -459,7 +460,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3809,7 +3849,7 @@
+@@ -3809,7 +3849,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -468,7 +469,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
-@@ -3825,11 +3865,11 @@
+@@ -3825,11 +3865,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -482,7 +483,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
-@@ -3859,6 +3899,10 @@
+@@ -3859,6 +3899,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -493,7 +494,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3911,7 +3955,7 @@
+@@ -3911,7 +3955,7 @@ AC_DEFUN([AC_PROG_NM],
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -502,7 +503,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -4127,10 +4171,10 @@
+@@ -4127,10 +4171,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -515,7 +516,7 @@
_LT_AC_SYS_COMPILER
-@@ -4232,10 +4276,10 @@
+@@ -4232,10 +4276,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -528,7 +529,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4381,7 +4425,7 @@
+@@ -4381,7 +4425,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -537,7 +538,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -4540,10 +4584,10 @@
+@@ -4540,10 +4584,10 @@ case $host_os in
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -550,7 +551,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -4577,7 +4621,7 @@
+@@ -4577,7 +4621,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -559,7 +560,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4626,9 +4670,7 @@
+@@ -4626,9 +4670,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -570,7 +571,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -4696,7 +4738,7 @@
+@@ -4696,7 +4738,7 @@ case $host_os in
;;
esac
;;
@@ -579,7 +580,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -4736,7 +4778,7 @@
+@@ -4736,7 +4778,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -588,7 +589,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -4816,6 +4858,29 @@
+@@ -4816,6 +4858,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -618,7 +619,7 @@
esac
;;
lynxos*)
-@@ -4838,7 +4903,7 @@
+@@ -4838,7 +4903,7 @@ case $host_os in
;;
esac
;;
@@ -627,7 +628,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=
-@@ -4854,16 +4919,20 @@
+@@ -4854,16 +4919,20 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -657,7 +658,7 @@
;;
osf3*)
case $cc_basename in
-@@ -5025,15 +5094,10 @@
+@@ -5025,15 +5094,10 @@ case $host_os in
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -676,7 +677,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5080,6 +5144,12 @@
+@@ -5080,6 +5144,12 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -689,7 +690,7 @@
fi
;;
esac
-@@ -5323,7 +5393,7 @@
+@@ -5323,7 +5393,7 @@ $rm -f confest.$objext
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -698,7 +699,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
-@@ -5331,13 +5401,46 @@
+@@ -5331,13 +5401,46 @@ interix3*)
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -746,7 +747,7 @@
;;
esac
;;
-@@ -5386,10 +5489,17 @@
+@@ -5386,10 +5489,17 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -766,7 +767,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -5468,10 +5578,10 @@
+@@ -5468,10 +5578,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -779,7 +780,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -5524,7 +5634,7 @@
+@@ -5524,7 +5634,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -788,7 +789,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -5613,6 +5723,7 @@
+@@ -5613,6 +5723,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -796,7 +797,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -5659,7 +5770,7 @@
+@@ -5659,7 +5770,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -805,7 +806,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5984,7 +6095,7 @@
+@@ -5984,7 +6095,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -814,7 +815,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -6067,6 +6178,7 @@
+@@ -6067,6 +6178,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -822,7 +823,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -6103,7 +6215,7 @@
+@@ -6103,7 +6215,7 @@ hpux*) # Its linker distinguishes data f
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'"
;;
@@ -831,7 +832,7 @@
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -6293,12 +6405,14 @@
+@@ -6293,12 +6405,14 @@ AC_MSG_CHECKING([for $compiler option to
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -848,7 +849,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -6310,7 +6424,7 @@
+@@ -6310,7 +6424,7 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -857,7 +858,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -6376,7 +6490,7 @@
+@@ -6376,7 +6490,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -866,7 +867,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -6419,7 +6533,7 @@
+@@ -6419,7 +6533,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -875,7 +876,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -6446,6 +6560,14 @@
+@@ -6446,6 +6560,14 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -890,7 +891,7 @@
;;
esac
;;
-@@ -6462,7 +6584,7 @@
+@@ -6462,7 +6584,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -899,7 +900,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6566,13 +6688,15 @@
+@@ -6566,13 +6688,15 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -917,7 +918,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
-@@ -6582,7 +6706,7 @@
+@@ -6582,7 +6706,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -926,7 +927,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -6640,7 +6764,7 @@
+@@ -6640,7 +6764,7 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -935,7 +936,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -6673,7 +6797,7 @@
+@@ -6673,7 +6797,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -944,7 +945,7 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -6692,6 +6816,22 @@
+@@ -6692,6 +6816,22 @@ AC_MSG_CHECKING([for $compiler option to
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -967,7 +968,7 @@
esac
;;
-@@ -6701,6 +6841,10 @@
+@@ -6701,6 +6841,10 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -978,7 +979,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6795,7 +6939,8 @@
+@@ -6795,7 +6939,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -988,7 +989,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -6812,7 +6957,10 @@
+@@ -6812,7 +6957,10 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1000,7 +1001,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -6951,7 +7099,7 @@
+@@ -6951,7 +7099,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -1009,7 +1010,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6969,7 +7117,7 @@
+@@ -6969,7 +7117,7 @@ EOF
fi
;;
@@ -1018,7 +1019,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6984,7 +7132,7 @@
+@@ -6984,7 +7132,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1027,7 +1028,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -7002,20 +7150,30 @@
+@@ -7002,20 +7150,30 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1061,7 +1062,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -7048,7 +7206,7 @@
+@@ -7048,7 +7206,7 @@ EOF
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -1070,7 +1071,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -7167,7 +7325,7 @@
+@@ -7167,7 +7325,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1079,7 +1080,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -7260,7 +7418,7 @@
+@@ -7260,7 +7418,7 @@ _LT_EOF
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -1088,7 +1089,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -7302,10 +7460,10 @@
+@@ -7302,10 +7460,10 @@ _LT_EOF
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -1101,7 +1102,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -7345,7 +7503,7 @@
+@@ -7345,7 +7503,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1110,7 +1111,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -7447,7 +7605,7 @@
+@@ -7447,7 +7605,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1119,7 +1120,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
-@@ -7467,24 +7625,28 @@
+@@ -7467,24 +7625,28 @@ _LT_EOF
;;
openbsd*)
@@ -1165,7 +1166,7 @@
fi
;;
-@@ -7543,17 +7705,16 @@
+@@ -7543,17 +7705,16 @@ _LT_EOF
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1192,7 +1193,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -7610,7 +7771,7 @@
+@@ -7610,7 +7771,7 @@ _LT_EOF
fi
;;
@@ -1201,7 +1202,7 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -7685,7 +7846,7 @@
+@@ -7685,7 +7846,7 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1210,7 +1211,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -7788,6 +7949,30 @@
+@@ -7788,6 +7949,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1241,7 +1242,7 @@
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
-@@ -7808,12 +7993,13 @@
+@@ -7808,12 +7993,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1256,7 +1257,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7846,6 +8032,7 @@
+@@ -7846,6 +8032,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
done
])
SED=$lt_cv_path_SED
@@ -1264,7 +1265,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -7987,7 +8174,8 @@
+@@ -7987,7 +8174,8 @@ installed software in a non-standard pre
_PKG_TEXT
])],
@@ -1274,7 +1275,7 @@
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
-@@ -7996,7 +8184,7 @@
+@@ -7996,7 +8184,7 @@ path to pkg-config.
_PKG_TEXT
@@ -1283,13 +1284,14 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
---- glib2.0-2.14.1.orig/configure 2007-09-16 18:29:44.000000000 +0200
-+++ glib2.0-2.14.1/configure 2007-10-07 16:57:48.000000000 +0200
+diff -uprN -x config.guess -x config.sub glib2.0-2.14.2.orig/configure glib2.0-2.14.2/configure
+--- glib2.0-2.14.2.orig/configure 2007-10-16 07:45:59.000000000 +0200
++++ glib2.0-2.14.2/configure 2007-10-17 17:14:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for glib 2.14.1.
-+# Generated by GNU Autoconf 2.61 for glib 2.14.1.
+-# Generated by GNU Autoconf 2.60 for glib 2.14.2.
++# Generated by GNU Autoconf 2.61 for glib 2.14.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glib>.
#
@@ -1303,7 +1305,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -21,10 +22,13 @@
+@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1320,7 +1322,7 @@
# PATH needs CR
-@@ -217,7 +221,7 @@
+@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1329,7 +1331,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
-@@ -235,7 +239,6 @@
+@@ -235,7 +239,6 @@ IFS=$as_save_IFS
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
@@ -1337,7 +1339,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -244,10 +247,12 @@
+@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1353,7 +1355,7 @@
:
_ASEOF
-@@ -255,7 +260,6 @@
+@@ -255,7 +260,6 @@ _ASEOF
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
@@ -1361,7 +1363,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -264,10 +268,12 @@
+@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1377,7 +1379,7 @@
:
(as_func_return () {
-@@ -514,19 +520,28 @@
+@@ -514,19 +520,28 @@ else
as_mkdir_p=false
fi
@@ -1417,7 +1419,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'"
-@@ -721,36 +736,36 @@
+@@ -721,36 +736,36 @@ ac_unique_file="glib/glib.h"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1464,7 +1466,7 @@
# include <unistd.h>
#endif"
-@@ -903,6 +918,7 @@
+@@ -903,6 +918,7 @@ POSUB
MKINSTALLDIRS
GETTEXT_PACKAGE
ICONV_LIBS
@@ -1472,7 +1474,7 @@
LN_S
ECHO
AR
-@@ -975,6 +991,7 @@
+@@ -975,6 +991,7 @@ target_alias
CC
CFLAGS
LDFLAGS
@@ -1480,7 +1482,7 @@
CPPFLAGS
CPP
CXX
-@@ -1091,10 +1108,10 @@
+@@ -1091,10 +1108,10 @@ do
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -1493,7 +1495,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1110,10 +1127,10 @@
+@@ -1110,10 +1127,10 @@ do
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1506,7 +1508,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1307,19 +1324,19 @@
+@@ -1307,19 +1324,19 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1530,7 +1532,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1614,6 +1631,7 @@
+@@ -1614,6 +1631,7 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -1538,25 +1540,25 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1691,7 +1709,7 @@
+@@ -1691,7 +1709,7 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- glib configure 2.14.1
+ glib configure 2.14.2
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1705,7 +1723,7 @@
+@@ -1705,7 +1723,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by glib $as_me 2.14.1, which was
+ It was created by glib $as_me 2.14.2, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2131,7 +2149,7 @@
+@@ -2131,7 +2149,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1565,7 +1567,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2265,7 +2283,7 @@
+@@ -2265,7 +2283,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1574,7 +1576,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2394,7 +2412,7 @@
+@@ -2394,7 +2412,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1583,7 +1585,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2434,7 +2452,7 @@
+@@ -2434,7 +2452,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1592,7 +1594,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2783,7 +2801,7 @@
+@@ -2783,7 +2801,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1601,7 +1603,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2823,7 +2841,7 @@
+@@ -2823,7 +2841,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1610,7 +1612,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2880,7 +2898,7 @@
+@@ -2880,7 +2898,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1619,7 +1621,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2921,7 +2939,7 @@
+@@ -2921,7 +2939,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1628,7 +1630,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2979,7 +2997,7 @@
+@@ -2979,7 +2997,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1637,7 +1639,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3023,7 +3041,7 @@
+@@ -3023,7 +3041,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1646,7 +1648,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3164,7 +3182,7 @@
+@@ -3164,7 +3182,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# 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.
@@ -1655,7 +1657,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3192,6 +3210,12 @@
+@@ -3192,6 +3210,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -1668,7 +1670,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3203,8 +3227,6 @@
+@@ -3203,8 +3227,6 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
@@ -1677,7 +1679,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3382,27 +3404,10 @@
+@@ -3382,27 +3404,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1709,7 +1711,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3457,27 +3462,10 @@
+@@ -3457,27 +3462,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1741,7 +1743,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3512,27 +3500,10 @@
+@@ -3512,27 +3500,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1773,7 +1775,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3568,27 +3539,10 @@
+@@ -3568,27 +3539,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1805,7 +1807,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3704,27 +3658,10 @@
+@@ -3704,27 +3658,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1837,7 +1839,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3916,17 +3853,10 @@
+@@ -3916,17 +3853,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1859,7 +1861,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3960,17 +3890,10 @@
+@@ -3960,17 +3890,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1881,7 +1883,7 @@
# Broken: success on invalid input.
continue
else
-@@ -4035,17 +3958,10 @@
+@@ -4035,17 +3958,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1903,7 +1905,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4079,17 +3995,10 @@
+@@ -4079,17 +3995,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1925,7 +1927,7 @@
# Broken: success on invalid input.
continue
else
-@@ -4146,17 +4055,10 @@
+@@ -4146,17 +4055,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1947,7 +1949,7 @@
glib_have_carbon=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4234,7 +4136,7 @@
+@@ -4234,7 +4136,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1956,7 +1958,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4274,7 +4176,7 @@
+@@ -4274,7 +4176,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1965,7 +1967,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4335,7 +4237,7 @@
+@@ -4335,7 +4237,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1974,7 +1976,7 @@
ac_cv_prog_NM="${ac_tool_prefix}nm"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4375,7 +4277,7 @@
+@@ -4375,7 +4277,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1983,7 +1985,7 @@
ac_cv_prog_ac_ct_NM="nm"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4436,7 +4338,7 @@
+@@ -4436,7 +4338,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1992,7 +1994,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4476,7 +4378,7 @@
+@@ -4476,7 +4378,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2001,7 +2003,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4531,7 +4433,7 @@
+@@ -4531,7 +4433,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2010,7 +2012,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4699,7 +4601,7 @@
+@@ -4699,7 +4601,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2019,7 +2021,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4739,7 +4641,7 @@
+@@ -4739,7 +4641,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2028,7 +2030,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4796,7 +4698,7 @@
+@@ -4796,7 +4698,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2037,7 +2039,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4837,7 +4739,7 @@
+@@ -4837,7 +4739,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2046,7 +2048,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -4895,7 +4797,7 @@
+@@ -4895,7 +4797,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2055,7 +2057,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4939,7 +4841,7 @@
+@@ -4939,7 +4841,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2064,7 +2066,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5059,27 +4961,10 @@
+@@ -5059,27 +4961,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2096,7 +2098,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5134,27 +5019,10 @@
+@@ -5134,27 +5019,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2128,7 +2130,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5189,27 +5057,10 @@
+@@ -5189,27 +5057,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2160,7 +2162,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5245,27 +5096,10 @@
+@@ -5245,27 +5096,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2192,7 +2194,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5381,27 +5215,10 @@
+@@ -5381,27 +5215,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2224,7 +2226,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -5559,7 +5376,7 @@
+@@ -5559,7 +5376,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2233,7 +2235,7 @@
ac_cv_prog_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5619,7 +5436,7 @@
+@@ -5619,7 +5436,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2242,7 +2244,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5663,7 +5480,7 @@
+@@ -5663,7 +5480,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2251,7 +2253,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5776,27 +5593,10 @@
+@@ -5776,27 +5593,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2283,7 +2285,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5851,27 +5651,10 @@
+@@ -5851,27 +5651,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2315,7 +2317,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5906,27 +5689,10 @@
+@@ -5906,27 +5689,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2347,7 +2349,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5962,27 +5728,10 @@
+@@ -5962,27 +5728,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2379,7 +2381,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6154,27 +5903,10 @@
+@@ -6154,27 +5903,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2411,7 +2413,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6279,27 +6011,10 @@
+@@ -6279,27 +6011,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2443,7 +2445,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -6362,7 +6077,7 @@
+@@ -6362,7 +6077,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2452,7 +2454,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -6461,27 +6176,10 @@
+@@ -6461,27 +6176,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2484,7 +2486,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -6505,27 +6203,10 @@
+@@ -6505,27 +6203,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2516,7 +2518,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -6553,7 +6234,6 @@
+@@ -6553,7 +6234,6 @@ if test "${ac_cv_sys_file_offset_bits+se
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -2524,7 +2526,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6590,28 +6270,11 @@
+@@ -6590,28 +6270,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2558,7 +2560,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6657,27 +6320,10 @@
+@@ -6657,27 +6320,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2590,7 +2592,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -6687,26 +6333,28 @@
+@@ -6687,26 +6333,28 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -2625,7 +2627,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6743,28 +6391,11 @@
+@@ -6743,28 +6391,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2659,7 +2661,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6810,27 +6441,10 @@
+@@ -6810,27 +6441,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2691,7 +2693,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -6840,19 +6454,22 @@
+@@ -6840,19 +6454,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -2718,7 +2720,7 @@
fi
-@@ -6877,7 +6494,7 @@
+@@ -6877,7 +6494,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2727,7 +2729,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6996,7 +6613,7 @@
+@@ -6996,7 +6613,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2736,7 +2738,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7038,7 +6655,7 @@
+@@ -7038,7 +6655,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2745,7 +2747,7 @@
ac_cv_prog_PERL="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7079,7 +6696,7 @@
+@@ -7079,7 +6696,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2754,7 +2756,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7130,7 +6747,7 @@
+@@ -7130,7 +6747,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2763,7 +2765,7 @@
ac_cv_path_PERL_PATH="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7235,27 +6852,11 @@
+@@ -7235,27 +6852,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2796,7 +2798,7 @@
ac_cv_func_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7264,7 +6865,7 @@
+@@ -7264,7 +6865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_iconv_open=no
fi
@@ -2805,7 +2807,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv_open" >&5
-@@ -7317,27 +6918,11 @@
+@@ -7317,27 +6918,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2838,7 +2840,7 @@
ac_cv_lib_iconv_libiconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7346,7 +6931,7 @@
+@@ -7346,7 +6931,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iconv_libiconv_open=no
fi
@@ -2847,7 +2849,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -7401,27 +6986,11 @@
+@@ -7401,27 +6986,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2880,7 +2882,7 @@
ac_cv_lib_iconv_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7430,7 +6999,7 @@
+@@ -7430,7 +6999,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iconv_iconv_open=no
fi
@@ -2889,7 +2891,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -7506,27 +7075,11 @@
+@@ -7506,27 +7075,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2922,7 +2924,7 @@
ac_cv_func_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7535,7 +7088,7 @@
+@@ -7535,7 +7088,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_iconv_open=no
fi
@@ -2931,7 +2933,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv_open" >&5
-@@ -7588,27 +7141,11 @@
+@@ -7588,27 +7141,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2964,7 +2966,7 @@
ac_cv_lib_iconv_libiconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7617,7 +7154,7 @@
+@@ -7617,7 +7154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iconv_libiconv_open=no
fi
@@ -2973,7 +2975,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -7671,27 +7208,11 @@
+@@ -7671,27 +7208,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3006,7 +3008,7 @@
ac_cv_lib_iconv_iconv_open=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7700,7 +7221,7 @@
+@@ -7700,7 +7221,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iconv_iconv_open=no
fi
@@ -3015,7 +3017,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -7740,7 +7261,7 @@
+@@ -7740,7 +7261,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -3024,7 +3026,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -7822,7 +7343,7 @@
+@@ -7822,7 +7343,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -3033,7 +3035,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -7996,27 +7517,10 @@
+@@ -7996,27 +7517,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3065,7 +3067,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8192,27 +7696,10 @@
+@@ -8192,27 +7696,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3097,7 +3099,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -8276,27 +7763,10 @@
+@@ -8276,27 +7763,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3129,7 +3131,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8332,17 +7802,10 @@
+@@ -8332,17 +7802,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3151,7 +3153,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8440,27 +7903,11 @@
+@@ -8440,27 +7903,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3184,7 +3186,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8469,7 +7916,7 @@
+@@ -8469,7 +7916,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
am_cv_val_LC_MESSAGES=no
fi
@@ -3193,7 +3195,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -8525,27 +7972,10 @@
+@@ -8525,27 +7972,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3225,7 +3227,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8581,17 +8011,10 @@
+@@ -8581,17 +8011,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3247,7 +3249,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8687,27 +8110,11 @@
+@@ -8687,27 +8110,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3280,7 +3282,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8716,7 +8123,7 @@
+@@ -8716,7 +8123,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_ngettext_libc=no
fi
@@ -3289,7 +3291,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -8759,27 +8166,11 @@
+@@ -8759,27 +8166,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3322,7 +3324,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8788,7 +8179,7 @@
+@@ -8788,7 +8179,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_dgettext_libc=no
fi
@@ -3331,7 +3333,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -8864,27 +8255,11 @@
+@@ -8864,27 +8255,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3364,7 +3366,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -8893,7 +8268,7 @@
+@@ -8893,7 +8268,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3373,7 +3375,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -8958,27 +8333,11 @@
+@@ -8958,27 +8333,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3406,7 +3408,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8987,7 +8346,7 @@
+@@ -8987,7 +8346,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -3415,7 +3417,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -9036,27 +8395,11 @@
+@@ -9036,27 +8395,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3448,7 +3450,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9065,7 +8408,7 @@
+@@ -9065,7 +8408,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -3457,7 +3459,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -9114,27 +8457,11 @@
+@@ -9114,27 +8457,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3490,7 +3492,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9143,7 +8470,7 @@
+@@ -9143,7 +8470,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dgettext=no
fi
@@ -3499,7 +3501,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -9205,27 +8532,11 @@
+@@ -9205,27 +8532,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3532,7 +3534,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9234,7 +8545,7 @@
+@@ -9234,7 +8545,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -3541,7 +3543,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -9283,27 +8594,11 @@
+@@ -9283,27 +8594,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3574,7 +3576,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9312,7 +8607,7 @@
+@@ -9312,7 +8607,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dcgettext=no
fi
@@ -3583,7 +3585,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -9407,27 +8702,11 @@
+@@ -9407,27 +8702,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3616,7 +3618,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -9436,7 +8715,7 @@
+@@ -9436,7 +8715,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3625,7 +3627,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -9583,27 +8862,11 @@
+@@ -9583,27 +8862,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3658,7 +3660,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -9612,7 +8875,7 @@
+@@ -9612,7 +8875,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3667,7 +3669,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -9673,7 +8936,7 @@
+@@ -9673,7 +8936,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3676,7 +3678,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -9761,27 +9024,11 @@
+@@ -9761,27 +9024,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3709,7 +3711,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -9853,27 +9100,11 @@
+@@ -9853,27 +9100,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3742,7 +3744,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9882,7 +9113,7 @@
+@@ -9882,7 +9113,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -3751,7 +3753,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -9903,7 +9134,7 @@
+@@ -9903,7 +9134,7 @@ fi
esac
fi
@@ -3760,7 +3762,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -10177,12 +9408,13 @@
+@@ -10177,12 +9408,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3775,7 +3777,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -10217,6 +9449,7 @@
+@@ -10217,6 +9449,7 @@ done
fi
SED=$lt_cv_path_SED
@@ -3783,7 +3785,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -10416,8 +9649,8 @@
+@@ -10416,8 +9649,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -3794,7 +3796,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10458,16 +9691,22 @@
+@@ -10458,16 +9691,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -3821,7 +3823,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -10505,7 +9744,7 @@
+@@ -10505,7 +9744,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -3830,7 +3832,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -10521,11 +9760,11 @@
+@@ -10521,11 +9760,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -3844,7 +3846,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
-@@ -10555,6 +9794,10 @@
+@@ -10555,6 +9794,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3855,7 +3857,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -10640,7 +9883,7 @@
+@@ -10640,7 +9883,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -3864,7 +3866,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -10675,7 +9918,8 @@
+@@ -10675,7 +9918,8 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -3874,7 +3876,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -10686,6 +9930,9 @@
+@@ -10686,6 +9930,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -3884,7 +3886,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -10702,6 +9949,9 @@
+@@ -10702,6 +9949,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -3894,7 +3896,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -10764,27 +10014,11 @@
+@@ -10764,27 +10014,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3927,7 +3929,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10793,7 +10027,7 @@
+@@ -10793,7 +10027,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
fi
@@ -3936,7 +3938,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -10847,7 +10081,7 @@
+@@ -10847,7 +10081,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3945,7 +3947,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -10887,7 +10121,7 @@
+@@ -10887,7 +10121,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3954,7 +3956,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -10943,7 +10177,7 @@
+@@ -10943,7 +10177,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3963,7 +3965,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -10983,7 +10217,7 @@
+@@ -10983,7 +10217,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3972,7 +3974,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -11039,7 +10273,7 @@
+@@ -11039,7 +10273,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3981,7 +3983,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -11079,7 +10313,7 @@
+@@ -11079,7 +10313,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3990,7 +3992,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -11164,27 +10398,10 @@
+@@ -11164,27 +10398,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4022,7 +4024,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11220,17 +10437,10 @@
+@@ -11220,17 +10437,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4044,7 +4046,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11347,17 +10557,10 @@
+@@ -11347,17 +10557,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4066,7 +4068,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -11391,17 +10594,10 @@
+@@ -11391,17 +10594,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4088,7 +4090,7 @@
# Broken: success on invalid input.
continue
else
-@@ -11466,17 +10662,10 @@
+@@ -11466,17 +10662,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4110,7 +4112,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -11510,17 +10699,10 @@
+@@ -11510,17 +10699,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4132,7 +4134,7 @@
# Broken: success on invalid input.
continue
else
-@@ -11560,7 +10742,7 @@
+@@ -11560,7 +10742,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
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
@@ -4141,7 +4143,7 @@
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
-@@ -11578,7 +10760,7 @@
+@@ -11578,7 +10760,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4150,7 +4152,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -11604,7 +10786,7 @@
+@@ -11604,7 +10786,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -4159,7 +4161,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -11622,7 +10804,7 @@
+@@ -11622,7 +10804,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4168,7 +4170,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -11729,27 +10911,10 @@
+@@ -11729,27 +10911,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4200,7 +4202,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11792,27 +10957,10 @@
+@@ -11792,27 +10957,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4232,7 +4234,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11939,24 +11087,27 @@
+@@ -11939,24 +11087,27 @@ else
fi
;;
*)
@@ -4277,7 +4279,7 @@
;;
esac
-@@ -11973,6 +11124,7 @@
+@@ -11973,6 +11124,7 @@ fi
@@ -4285,7 +4287,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -12010,7 +11162,7 @@
+@@ -12010,7 +11162,7 @@ hpux*) # Its linker distinguishes data f
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'"
;;
@@ -4294,7 +4296,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -12267,7 +11419,7 @@
+@@ -12267,7 +11419,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4303,7 +4305,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12307,7 +11459,7 @@
+@@ -12307,7 +11459,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4312,7 +4314,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12363,7 +11515,7 @@
+@@ -12363,7 +11515,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4321,7 +4323,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12403,7 +11555,7 @@
+@@ -12403,7 +11555,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4330,7 +4332,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12459,7 +11611,7 @@
+@@ -12459,7 +11611,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4339,7 +4341,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12499,7 +11651,7 @@
+@@ -12499,7 +11651,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4348,7 +4350,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -12561,7 +11713,7 @@
+@@ -12561,7 +11713,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -4357,7 +4359,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -12761,10 +11913,10 @@
+@@ -12761,10 +11913,10 @@ objext=o
objext=$objext
# Code to be used in simple compile tests
@@ -4370,7 +4372,7 @@
# If no C compiler was specified, use CC.
-@@ -12779,13 +11931,13 @@
+@@ -12779,13 +11931,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4386,7 +4388,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12805,7 +11957,7 @@
+@@ -12805,7 +11957,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -4395,7 +4397,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12816,11 +11968,11 @@
+@@ -12816,11 +11968,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4409,7 +4411,7 @@
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 other than the usual output.
-@@ -12871,13 +12023,15 @@
+@@ -12871,13 +12023,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -4427,7 +4429,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -12887,7 +12041,7 @@
+@@ -12887,7 +12041,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-fno-common'
;;
@@ -4436,7 +4438,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12945,7 +12099,7 @@
+@@ -12945,7 +12099,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -4445,7 +4447,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -12978,7 +12132,7 @@
+@@ -12978,7 +12132,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-Bstatic'
;;
@@ -4454,7 +4456,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -12997,6 +12151,22 @@
+@@ -12997,6 +12151,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -4477,7 +4479,7 @@
esac
;;
-@@ -13006,6 +12176,10 @@
+@@ -13006,6 +12176,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-non_shared'
;;
@@ -4488,7 +4490,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -13073,7 +12247,7 @@
+@@ -13073,7 +12247,7 @@ if test "${lt_prog_compiler_pic_works+se
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -4497,7 +4499,7 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13084,11 +12258,11 @@
+@@ -13084,11 +12258,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4511,7 +4513,7 @@
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 other than the usual output.
-@@ -13137,7 +12311,7 @@
+@@ -13137,7 +12311,7 @@ else
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -4520,7 +4522,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13177,7 +12351,7 @@
+@@ -13177,7 +12351,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -4529,7 +4531,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -13188,11 +12362,11 @@
+@@ -13188,11 +12362,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4543,7 +4545,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13384,7 +12558,7 @@
+@@ -13384,7 +12558,7 @@ EOF
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -4552,7 +4554,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -13402,7 +12576,7 @@
+@@ -13402,7 +12576,7 @@ EOF
fi
;;
@@ -4561,7 +4563,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -13417,7 +12591,7 @@
+@@ -13417,7 +12591,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -4570,7 +4572,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -13435,20 +12609,30 @@
+@@ -13435,20 +12609,30 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -4604,7 +4606,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -13600,7 +12784,7 @@
+@@ -13600,7 +12784,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4613,7 +4615,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -13668,33 +12852,24 @@
+@@ -13668,33 +12852,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4664,7 +4666,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13702,7 +12877,7 @@
+@@ -13702,7 +12877,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -4673,7 +4675,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13743,33 +12918,24 @@
+@@ -13743,33 +12918,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4724,7 +4726,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13777,7 +12943,7 @@
+@@ -13777,7 +12943,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -4733,7 +4735,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13823,7 +12989,7 @@
+@@ -13823,7 +12989,7 @@ if test -z "$aix_libpath"; then aix_libp
# 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.
@@ -4742,7 +4744,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -13865,10 +13031,10 @@
+@@ -13865,10 +13031,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -4755,7 +4757,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -13908,7 +13074,7 @@
+@@ -13908,7 +13074,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4764,7 +4766,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -14010,7 +13176,7 @@
+@@ -14010,7 +13176,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs=yes
;;
@@ -4773,7 +4775,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -14030,24 +13196,28 @@
+@@ -14030,24 +13196,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -4819,7 +4821,7 @@
fi
;;
-@@ -14106,17 +13276,16 @@
+@@ -14106,17 +13276,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -4846,7 +4848,7 @@
esac
link_all_deplibs=yes
;;
-@@ -14173,7 +13342,7 @@
+@@ -14173,7 +13342,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -4855,7 +4857,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -14250,7 +13419,7 @@
+@@ -14250,7 +13419,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -4864,7 +4866,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14308,17 +13477,55 @@
+@@ -14308,17 +13477,55 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4924,7 +4926,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -14478,12 +13685,8 @@
+@@ -14478,12 +13685,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -4939,7 +4941,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14500,18 +13703,6 @@
+@@ -14500,18 +13703,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -4958,7 +4960,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14549,7 +13740,7 @@
+@@ -14549,7 +13740,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -4967,7 +4969,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14612,7 +13803,7 @@
+@@ -14612,7 +13803,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -4976,7 +4978,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14667,7 +13858,7 @@
+@@ -14667,7 +13858,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -4985,7 +4987,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14681,31 +13872,10 @@
+@@ -14681,31 +13872,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -5019,7 +5021,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14717,7 +13887,7 @@
+@@ -14717,7 +13887,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5028,7 +5030,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14726,7 +13896,7 @@
+@@ -14726,7 +13896,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -5037,7 +5039,7 @@
;;
netbsd*)
-@@ -14810,6 +13980,10 @@
+@@ -14810,6 +13980,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5048,7 +5050,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14963,6 +14137,7 @@
+@@ -14963,6 +14137,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -5056,7 +5058,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -15046,27 +14221,11 @@
+@@ -15046,27 +14221,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5089,7 +5091,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15075,7 +14234,7 @@
+@@ -15075,7 +14234,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -5098,7 +5100,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -15157,27 +14316,11 @@
+@@ -15157,27 +14316,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5131,7 +5133,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15186,7 +14329,7 @@
+@@ -15186,7 +14329,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
fi
@@ -5140,7 +5142,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -15236,27 +14379,11 @@
+@@ -15236,27 +14379,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5173,7 +5175,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15265,7 +14392,7 @@
+@@ -15265,7 +14392,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
@@ -5182,7 +5184,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -15337,27 +14464,11 @@
+@@ -15337,27 +14464,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5215,7 +5217,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15366,7 +14477,7 @@
+@@ -15366,7 +14477,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
@@ -5224,7 +5226,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -15416,27 +14527,11 @@
+@@ -15416,27 +14527,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5257,7 +5259,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15445,7 +14540,7 @@
+@@ -15445,7 +14540,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -5266,7 +5268,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -15496,27 +14591,11 @@
+@@ -15496,27 +14591,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5299,7 +5301,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15525,7 +14604,7 @@
+@@ -15525,7 +14604,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
fi
@@ -5308,7 +5310,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -15576,27 +14655,11 @@
+@@ -15576,27 +14655,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5341,7 +5343,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -15605,7 +14668,7 @@
+@@ -15605,7 +14668,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
fi
@@ -5350,7 +5352,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -15661,7 +14724,7 @@
+@@ -15661,7 +14724,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -5359,7 +5361,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15761,7 +14824,7 @@
+@@ -15761,7 +14824,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -5368,7 +5370,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15959,6 +15022,7 @@
+@@ -15959,6 +15022,7 @@ if test -f "$ltmain"; then
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -5376,7 +5378,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -16003,7 +15067,7 @@
+@@ -16003,7 +15067,7 @@ echo "$as_me: creating $ofile" >&6;}
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -5385,7 +5387,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -16327,7 +15391,7 @@
+@@ -16327,7 +15391,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5394,7 +5396,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -16496,10 +15560,10 @@
+@@ -16496,10 +15560,10 @@ objext=o
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -5407,7 +5409,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16515,13 +15579,13 @@
+@@ -16515,13 +15579,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5423,7 +5425,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -16780,7 +15844,7 @@
+@@ -16780,7 +15844,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5432,7 +5434,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -16848,33 +15912,24 @@
+@@ -16848,33 +15912,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5483,7 +5485,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16882,7 +15937,7 @@
+@@ -16882,7 +15937,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -5492,7 +5494,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16924,33 +15979,24 @@
+@@ -16924,33 +15979,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5543,7 +5545,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16958,7 +16004,7 @@
+@@ -16958,7 +16004,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -5552,7 +5554,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17069,10 +16115,10 @@
+@@ -17069,10 +16115,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -5565,7 +5567,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -17106,7 +16152,7 @@
+@@ -17106,7 +16152,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -5574,7 +5576,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -17155,9 +16201,7 @@
+@@ -17155,9 +16201,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -5585,7 +5587,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -17225,7 +16269,7 @@
+@@ -17225,7 +16269,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -5594,7 +5596,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -17265,7 +16309,7 @@
+@@ -17265,7 +16309,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -5603,7 +5605,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -17345,6 +16389,29 @@
+@@ -17345,6 +16389,29 @@ if test -z "$aix_libpath"; then aix_libp
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -5633,7 +5635,7 @@
esac
;;
lynxos*)
-@@ -17367,7 +16434,7 @@
+@@ -17367,7 +16434,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -5642,7 +5644,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=
-@@ -17383,16 +16450,20 @@
+@@ -17383,16 +16450,20 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
openbsd*)
@@ -5672,7 +5674,7 @@
;;
osf3*)
case $cc_basename in
-@@ -17554,15 +16625,10 @@
+@@ -17554,15 +16625,10 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5691,7 +5693,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -17609,6 +16675,12 @@
+@@ -17609,6 +16675,12 @@ if test -z "$aix_libpath"; then aix_libp
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -5704,7 +5706,7 @@
fi
;;
esac
-@@ -17800,7 +16872,7 @@
+@@ -17800,7 +16872,7 @@ $rm -f confest.$objext
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -5713,7 +5715,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -17808,13 +16880,46 @@
+@@ -17808,13 +16880,46 @@ interix3*)
postdeps_CXX=
;;
@@ -5761,7 +5763,7 @@
;;
esac
;;
-@@ -17851,12 +16956,14 @@
+@@ -17851,12 +16956,14 @@ echo $ECHO_N "checking for $compiler opt
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5778,7 +5780,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -17868,7 +16975,7 @@
+@@ -17868,7 +16975,7 @@ echo $ECHO_N "checking for $compiler opt
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -5787,7 +5789,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -17934,7 +17041,7 @@
+@@ -17934,7 +17041,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -5796,7 +5798,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -17977,7 +17084,7 @@
+@@ -17977,7 +17084,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -5805,7 +5807,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -18004,6 +17111,14 @@
+@@ -18004,6 +17111,14 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -5820,7 +5822,7 @@
;;
esac
;;
-@@ -18020,7 +17135,7 @@
+@@ -18020,7 +17135,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -5829,7 +5831,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -18118,7 +17233,7 @@
+@@ -18118,7 +17233,7 @@ if test "${lt_prog_compiler_pic_works_CX
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -5838,7 +5840,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18129,11 +17244,11 @@
+@@ -18129,11 +17244,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -5852,7 +5854,7 @@
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 other than the usual output.
-@@ -18182,7 +17297,7 @@
+@@ -18182,7 +17297,7 @@ else
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -5861,7 +5863,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18222,7 +17337,7 @@
+@@ -18222,7 +17337,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -5870,7 +5872,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18233,11 +17348,11 @@
+@@ -18233,11 +17348,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -5884,7 +5886,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18303,7 +17418,10 @@
+@@ -18303,7 +17418,10 @@ echo $ECHO_N "checking whether the $comp
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -5896,7 +5898,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -18334,7 +17452,7 @@
+@@ -18334,7 +17452,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -5905,7 +5907,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18392,20 +17510,7 @@
+@@ -18392,20 +17510,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5927,7 +5929,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18562,12 +17667,7 @@
+@@ -18562,12 +17667,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5941,7 +5943,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18584,18 +17684,6 @@
+@@ -18584,18 +17684,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -5960,7 +5962,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -18633,7 +17721,7 @@
+@@ -18633,7 +17721,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5969,7 +5971,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18696,7 +17784,7 @@
+@@ -18696,7 +17784,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -5978,7 +5980,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18751,7 +17839,7 @@
+@@ -18751,7 +17839,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -5987,7 +5989,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18765,31 +17853,10 @@
+@@ -18765,31 +17853,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -6021,7 +6023,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18801,7 +17868,7 @@
+@@ -18801,7 +17868,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6030,7 +6032,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18810,7 +17877,7 @@
+@@ -18810,7 +17877,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -6039,7 +6041,7 @@
;;
netbsd*)
-@@ -18894,6 +17961,10 @@
+@@ -18894,6 +17961,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6050,7 +6052,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -19088,6 +18159,7 @@
+@@ -19088,6 +18159,7 @@ if test -f "$ltmain"; then
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -6058,7 +6060,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -19408,7 +18480,7 @@
+@@ -19408,7 +18480,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6067,7 +6069,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -19499,10 +18571,17 @@
+@@ -19499,10 +18571,17 @@ objext=o
objext_F77=$objext
# Code to be used in simple compile tests
@@ -6087,7 +6089,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -19518,13 +18597,13 @@
+@@ -19518,13 +18597,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6103,7 +6105,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -19611,13 +18690,15 @@
+@@ -19611,13 +18690,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -6121,7 +6123,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -19627,7 +18708,7 @@
+@@ -19627,7 +18708,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -6130,7 +6132,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -19685,7 +18766,7 @@
+@@ -19685,7 +18766,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -6139,7 +6141,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -19718,7 +18799,7 @@
+@@ -19718,7 +18799,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -6148,7 +6150,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -19737,6 +18818,22 @@
+@@ -19737,6 +18818,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -6171,7 +6173,7 @@
esac
;;
-@@ -19746,6 +18843,10 @@
+@@ -19746,6 +18843,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -6182,7 +6184,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -19813,7 +18914,7 @@
+@@ -19813,7 +18914,7 @@ if test "${lt_prog_compiler_pic_works_F7
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -6191,7 +6193,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -19824,11 +18925,11 @@
+@@ -19824,11 +18925,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6205,7 +6207,7 @@
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 other than the usual output.
-@@ -19877,7 +18978,7 @@
+@@ -19877,7 +18978,7 @@ else
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -6214,7 +6216,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -19917,7 +19018,7 @@
+@@ -19917,7 +19018,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -6223,7 +6225,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -19928,11 +19029,11 @@
+@@ -19928,11 +19029,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6237,7 +6239,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -20124,7 +19225,7 @@
+@@ -20124,7 +19225,7 @@ EOF
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -6246,7 +6248,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -20142,7 +19243,7 @@
+@@ -20142,7 +19243,7 @@ EOF
fi
;;
@@ -6255,7 +6257,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -20157,7 +19258,7 @@
+@@ -20157,7 +19258,7 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -6264,7 +6266,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -20175,20 +19276,30 @@
+@@ -20175,20 +19276,30 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -6298,7 +6300,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -20340,7 +19451,7 @@
+@@ -20340,7 +19451,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6307,7 +6309,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -20398,33 +19509,24 @@
+@@ -20398,33 +19509,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6358,7 +6360,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20432,7 +19534,7 @@
+@@ -20432,7 +19534,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -6367,7 +6369,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20463,33 +19565,24 @@
+@@ -20463,33 +19565,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6418,7 +6420,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20497,7 +19590,7 @@
+@@ -20497,7 +19590,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -6427,7 +6429,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20543,7 +19636,7 @@
+@@ -20543,7 +19636,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -6436,7 +6438,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -20585,10 +19678,10 @@
+@@ -20585,10 +19678,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -6449,7 +6451,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -20628,7 +19721,7 @@
+@@ -20628,7 +19721,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6458,7 +6460,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -20730,7 +19823,7 @@
+@@ -20730,7 +19823,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_F77=yes
;;
@@ -6467,7 +6469,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
-@@ -20750,24 +19843,28 @@
+@@ -20750,24 +19843,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -6513,7 +6515,7 @@
fi
;;
-@@ -20826,17 +19923,16 @@
+@@ -20826,17 +19923,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -6540,7 +6542,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -20893,7 +19989,7 @@
+@@ -20893,7 +19989,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -6549,7 +6551,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -20970,7 +20066,7 @@
+@@ -20970,7 +20066,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -6558,7 +6560,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -21028,20 +20124,7 @@
+@@ -21028,20 +20124,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6580,7 +6582,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -21198,12 +20281,7 @@
+@@ -21198,12 +20281,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -6594,7 +6596,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -21220,18 +20298,6 @@
+@@ -21220,18 +20298,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -6613,7 +6615,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -21269,7 +20335,7 @@
+@@ -21269,7 +20335,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -6622,7 +6624,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -21332,7 +20398,7 @@
+@@ -21332,7 +20398,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -6631,7 +6633,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -21387,7 +20453,7 @@
+@@ -21387,7 +20453,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -6640,7 +6642,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -21401,31 +20467,10 @@
+@@ -21401,31 +20467,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -6674,7 +6676,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -21437,7 +20482,7 @@
+@@ -21437,7 +20482,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6683,7 +6685,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -21446,7 +20491,7 @@
+@@ -21446,7 +20491,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -6692,7 +6694,7 @@
;;
netbsd*)
-@@ -21530,6 +20575,10 @@
+@@ -21530,6 +20575,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6703,7 +6705,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -21724,6 +20773,7 @@
+@@ -21724,6 +20773,7 @@ if test -f "$ltmain"; then
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -6711,7 +6713,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -22044,7 +21094,7 @@
+@@ -22044,7 +21094,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6720,7 +6722,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -22102,10 +21152,10 @@
+@@ -22102,10 +21152,10 @@ objext=o
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -6733,7 +6735,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -22121,13 +21171,13 @@
+@@ -22121,13 +21171,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6749,7 +6751,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -22168,7 +21218,7 @@
+@@ -22168,7 +21218,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -6758,7 +6760,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -22179,11 +21229,11 @@
+@@ -22179,11 +21229,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6772,7 +6774,7 @@
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 other than the usual output.
-@@ -22234,13 +21284,15 @@
+@@ -22234,13 +21284,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -6790,7 +6792,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -22250,7 +21302,7 @@
+@@ -22250,7 +21302,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -6799,7 +6801,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -22308,7 +21360,7 @@
+@@ -22308,7 +21360,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -6808,7 +6810,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -22341,7 +21393,7 @@
+@@ -22341,7 +21393,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -6817,7 +6819,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -22360,6 +21412,22 @@
+@@ -22360,6 +21412,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6840,7 +6842,7 @@
esac
;;
-@@ -22369,6 +21437,10 @@
+@@ -22369,6 +21437,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6851,7 +6853,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -22436,7 +21508,7 @@
+@@ -22436,7 +21508,7 @@ if test "${lt_prog_compiler_pic_works_GC
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -6860,7 +6862,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -22447,11 +21519,11 @@
+@@ -22447,11 +21519,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6874,7 +6876,7 @@
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 other than the usual output.
-@@ -22500,7 +21572,7 @@
+@@ -22500,7 +21572,7 @@ else
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -6883,7 +6885,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -22540,7 +21612,7 @@
+@@ -22540,7 +21612,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -6892,7 +6894,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -22551,11 +21623,11 @@
+@@ -22551,11 +21623,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -6906,7 +6908,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -22747,7 +21819,7 @@
+@@ -22747,7 +21819,7 @@ EOF
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -6915,7 +6917,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -22765,7 +21837,7 @@
+@@ -22765,7 +21837,7 @@ EOF
fi
;;
@@ -6924,7 +6926,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -22780,7 +21852,7 @@
+@@ -22780,7 +21852,7 @@ EOF
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -6933,7 +6935,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -22798,20 +21870,30 @@
+@@ -22798,20 +21870,30 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -6967,7 +6969,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -22963,7 +22045,7 @@
+@@ -22963,7 +22045,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6976,7 +6978,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -23031,33 +22113,24 @@
+@@ -23031,33 +22113,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7027,7 +7029,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23065,7 +22138,7 @@
+@@ -23065,7 +22138,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -7036,7 +7038,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -23106,33 +22179,24 @@
+@@ -23106,33 +22179,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7087,7 +7089,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23140,7 +22204,7 @@
+@@ -23140,7 +22204,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -7096,7 +7098,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -23186,7 +22250,7 @@
+@@ -23186,7 +22250,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -7105,7 +7107,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -23228,10 +22292,10 @@
+@@ -23228,10 +22292,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -7118,7 +7120,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -23271,7 +22335,7 @@
+@@ -23271,7 +22335,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7127,7 +7129,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -23373,7 +22437,7 @@
+@@ -23373,7 +22437,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_GCJ=yes
;;
@@ -7136,7 +7138,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
-@@ -23393,24 +22457,28 @@
+@@ -23393,24 +22457,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -7182,7 +7184,7 @@
fi
;;
-@@ -23469,17 +22537,16 @@
+@@ -23469,17 +22537,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -7209,7 +7211,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -23536,7 +22603,7 @@
+@@ -23536,7 +22603,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -7218,7 +7220,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -23613,7 +22680,7 @@
+@@ -23613,7 +22680,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -7227,7 +7229,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -23671,20 +22738,7 @@
+@@ -23671,20 +22738,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7249,7 +7251,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -23841,12 +22895,7 @@
+@@ -23841,12 +22895,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -7263,7 +7265,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -23863,18 +22912,6 @@
+@@ -23863,18 +22912,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -7282,7 +7284,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -23912,7 +22949,7 @@
+@@ -23912,7 +22949,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -7291,7 +7293,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -23975,7 +23012,7 @@
+@@ -23975,7 +23012,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -7300,7 +7302,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -24030,7 +23067,7 @@
+@@ -24030,7 +23067,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -7309,7 +7311,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -24044,31 +23081,10 @@
+@@ -24044,31 +23081,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -7343,7 +7345,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -24080,7 +23096,7 @@
+@@ -24080,7 +23096,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7352,7 +7354,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -24089,7 +23105,7 @@
+@@ -24089,7 +23105,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -7361,7 +7363,7 @@
;;
netbsd*)
-@@ -24173,6 +23189,10 @@
+@@ -24173,6 +23189,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7372,7 +7374,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -24367,6 +23387,7 @@
+@@ -24367,6 +23387,7 @@ if test -f "$ltmain"; then
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -7380,7 +7382,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -24687,7 +23708,7 @@
+@@ -24687,7 +23708,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7389,7 +7391,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -24744,7 +23765,7 @@
+@@ -24744,7 +23765,7 @@ objext=o
objext_RC=$objext
# Code to be used in simple compile tests
@@ -7398,7 +7400,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -24763,13 +23784,13 @@
+@@ -24763,13 +23784,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -7414,7 +7416,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -24847,6 +23868,7 @@
+@@ -24847,6 +23868,7 @@ if test -f "$ltmain"; then
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -7422,7 +7424,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -25167,7 +24189,7 @@
+@@ -25167,7 +24189,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7431,7 +7433,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -25419,27 +24441,10 @@
+@@ -25419,27 +24441,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7463,7 +7465,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -25476,27 +24481,10 @@
+@@ -25476,27 +24481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7495,7 +7497,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -25553,27 +24541,10 @@
+@@ -25553,27 +24541,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7527,7 +7529,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25776,27 +24747,11 @@
+@@ -25776,27 +24747,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7560,7 +7562,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25805,7 +24760,7 @@
+@@ -25805,7 +24760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7569,7 +7571,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25879,27 +24834,11 @@
+@@ -25879,27 +24834,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7602,7 +7604,7 @@
ac_cv_func__doprnt=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25908,7 +24847,7 @@
+@@ -25908,7 +24847,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func__doprnt=no
fi
@@ -7611,7 +7613,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-@@ -25965,27 +24904,10 @@
+@@ -25965,27 +24904,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7643,7 +7645,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26021,17 +24943,10 @@
+@@ -26021,17 +24943,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7665,7 +7667,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26162,27 +25077,11 @@
+@@ -26162,27 +25077,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7698,7 +7700,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26191,7 +25090,7 @@
+@@ -26191,7 +25090,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7707,7 +7709,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26248,21 +25147,21 @@
+@@ -26248,21 +25147,21 @@ $ac_includes_default
#include <fcntl.h>
#include <sys/mman.h>
@@ -7733,7 +7735,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -26427,27 +25326,11 @@
+@@ -26427,27 +25326,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7766,7 +7768,7 @@
ac_cv_working_alloca_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26456,7 +25339,7 @@
+@@ -26456,7 +25339,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_working_alloca_h=no
fi
@@ -7775,7 +7777,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-@@ -26487,7 +25370,7 @@
+@@ -26487,7 +25370,7 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <malloc.h>
# define alloca _alloca
# else
@@ -7784,7 +7786,7 @@
# include <alloca.h>
# else
# ifdef _AIX
-@@ -26523,27 +25406,11 @@
+@@ -26523,27 +25406,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7817,7 +7819,7 @@
ac_cv_func_alloca_works=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26552,7 +25419,7 @@
+@@ -26552,7 +25419,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_alloca_works=no
fi
@@ -7826,7 +7828,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-@@ -26672,27 +25539,11 @@
+@@ -26672,27 +25539,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7859,7 +7861,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26701,7 +25552,7 @@
+@@ -26701,7 +25552,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7868,7 +7870,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26865,27 +25716,11 @@
+@@ -26865,27 +25716,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7901,7 +7903,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26894,7 +25729,7 @@
+@@ -26894,7 +25729,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7910,7 +7912,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26975,27 +25810,11 @@
+@@ -26975,27 +25810,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7943,7 +7945,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27004,7 +25823,7 @@
+@@ -27004,7 +25823,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7952,7 +7954,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27085,27 +25904,11 @@
+@@ -27085,27 +25904,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7985,7 +7987,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27114,7 +25917,7 @@
+@@ -27114,7 +25917,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7994,7 +7996,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27197,27 +26000,11 @@
+@@ -27197,27 +26000,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8027,7 +8029,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27226,7 +26013,7 @@
+@@ -27226,7 +26013,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -8036,7 +8038,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27308,27 +26095,11 @@
+@@ -27308,27 +26095,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8069,7 +8071,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27337,7 +26108,7 @@
+@@ -27337,7 +26108,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -8078,7 +8080,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27389,27 +26160,10 @@
+@@ -27389,27 +26160,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8110,7 +8112,7 @@
ac_cv_type_char=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27423,16 +26177,15 @@
+@@ -27423,16 +26177,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
echo "${ECHO_T}$ac_cv_type_char" >&6; }
@@ -8131,7 +8133,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -27442,7 +26195,7 @@
+@@ -27442,7 +26195,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8140,7 +8142,7 @@
int
main ()
{
-@@ -27466,27 +26219,10 @@
+@@ -27466,27 +26219,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8172,7 +8174,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -27496,7 +26232,7 @@
+@@ -27496,7 +26232,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8181,7 +8183,7 @@
int
main ()
{
-@@ -27520,27 +26256,10 @@
+@@ -27520,27 +26256,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8213,7 +8215,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -27567,7 +26286,7 @@
+@@ -27567,7 +26286,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8222,7 +8224,7 @@
int
main ()
{
-@@ -27591,27 +26310,10 @@
+@@ -27591,27 +26310,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8254,7 +8256,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -27621,7 +26323,7 @@
+@@ -27621,7 +26323,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8263,7 +8265,7 @@
int
main ()
{
-@@ -27645,27 +26347,10 @@
+@@ -27645,27 +26347,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8295,7 +8297,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -27702,7 +26387,7 @@
+@@ -27702,7 +26387,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8304,7 +8306,7 @@
int
main ()
{
-@@ -27726,27 +26411,10 @@
+@@ -27726,27 +26411,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8336,7 +8338,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -27759,11 +26427,15 @@
+@@ -27759,11 +26427,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_char=$ac_lo;;
@@ -8354,7 +8356,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27773,7 +26445,7 @@
+@@ -27773,7 +26445,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8363,7 +8365,7 @@
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>
-@@ -27832,21 +26504,25 @@
+@@ -27832,21 +26504,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -8393,7 +8395,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR $ac_cv_sizeof_char
_ACEOF
-@@ -27889,27 +26565,10 @@
+@@ -27889,27 +26565,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8425,7 +8427,7 @@
ac_cv_type_short=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27923,16 +26582,15 @@
+@@ -27923,16 +26582,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
echo "${ECHO_T}$ac_cv_type_short" >&6; }
@@ -8446,7 +8448,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -27942,7 +26600,7 @@
+@@ -27942,7 +26600,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8455,7 +8457,7 @@
int
main ()
{
-@@ -27966,27 +26624,10 @@
+@@ -27966,27 +26624,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8487,7 +8489,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -27996,7 +26637,7 @@
+@@ -27996,7 +26637,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8496,7 +8498,7 @@
int
main ()
{
-@@ -28020,27 +26661,10 @@
+@@ -28020,27 +26661,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8528,7 +8530,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -28067,7 +26691,7 @@
+@@ -28067,7 +26691,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8537,7 +8539,7 @@
int
main ()
{
-@@ -28091,27 +26715,10 @@
+@@ -28091,27 +26715,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8569,7 +8571,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -28121,7 +26728,7 @@
+@@ -28121,7 +26728,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8578,7 +8580,7 @@
int
main ()
{
-@@ -28145,27 +26752,10 @@
+@@ -28145,27 +26752,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8610,7 +8612,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -28202,7 +26792,7 @@
+@@ -28202,7 +26792,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8619,7 +8621,7 @@
int
main ()
{
-@@ -28226,27 +26816,10 @@
+@@ -28226,27 +26816,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8651,7 +8653,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -28259,11 +26832,15 @@
+@@ -28259,11 +26832,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
@@ -8669,7 +8671,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28273,7 +26850,7 @@
+@@ -28273,7 +26850,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8678,7 +8680,7 @@
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>
-@@ -28332,21 +26909,25 @@
+@@ -28332,21 +26909,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -8708,7 +8710,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
-@@ -28389,27 +26970,10 @@
+@@ -28389,27 +26970,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8740,7 +8742,7 @@
ac_cv_type_long=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28423,16 +26987,15 @@
+@@ -28423,16 +26987,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
echo "${ECHO_T}$ac_cv_type_long" >&6; }
@@ -8761,7 +8763,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -28442,7 +27005,7 @@
+@@ -28442,7 +27005,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8770,7 +8772,7 @@
int
main ()
{
-@@ -28466,27 +27029,10 @@
+@@ -28466,27 +27029,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8802,7 +8804,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -28496,7 +27042,7 @@
+@@ -28496,7 +27042,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8811,7 +8813,7 @@
int
main ()
{
-@@ -28520,27 +27066,10 @@
+@@ -28520,27 +27066,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8843,7 +8845,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -28567,7 +27096,7 @@
+@@ -28567,7 +27096,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8852,7 +8854,7 @@
int
main ()
{
-@@ -28591,27 +27120,10 @@
+@@ -28591,27 +27120,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8884,7 +8886,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -28621,7 +27133,7 @@
+@@ -28621,7 +27133,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8893,7 +8895,7 @@
int
main ()
{
-@@ -28645,27 +27157,10 @@
+@@ -28645,27 +27157,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8925,7 +8927,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -28702,7 +27197,7 @@
+@@ -28702,7 +27197,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8934,7 +8936,7 @@
int
main ()
{
-@@ -28726,27 +27221,10 @@
+@@ -28726,27 +27221,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8966,7 +8968,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -28759,11 +27237,15 @@
+@@ -28759,11 +27237,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
@@ -8984,7 +8986,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28773,7 +27255,7 @@
+@@ -28773,7 +27255,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8993,7 +8995,7 @@
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>
-@@ -28832,21 +27314,25 @@
+@@ -28832,21 +27314,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -9023,7 +9025,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
-@@ -28889,27 +27375,10 @@
+@@ -28889,27 +27375,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9055,7 +9057,7 @@
ac_cv_type_int=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28923,16 +27392,15 @@
+@@ -28923,16 +27392,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
echo "${ECHO_T}$ac_cv_type_int" >&6; }
@@ -9076,7 +9078,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -28942,7 +27410,7 @@
+@@ -28942,7 +27410,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9085,7 +9087,7 @@
int
main ()
{
-@@ -28966,27 +27434,10 @@
+@@ -28966,27 +27434,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9117,7 +9119,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -28996,7 +27447,7 @@
+@@ -28996,7 +27447,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9126,7 +9128,7 @@
int
main ()
{
-@@ -29020,27 +27471,10 @@
+@@ -29020,27 +27471,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9158,7 +9160,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -29067,7 +27501,7 @@
+@@ -29067,7 +27501,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9167,7 +9169,7 @@
int
main ()
{
-@@ -29091,27 +27525,10 @@
+@@ -29091,27 +27525,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9199,7 +9201,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -29121,7 +27538,7 @@
+@@ -29121,7 +27538,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9208,7 +9210,7 @@
int
main ()
{
-@@ -29145,27 +27562,10 @@
+@@ -29145,27 +27562,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9240,7 +9242,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -29202,7 +27602,7 @@
+@@ -29202,7 +27602,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9249,7 +9251,7 @@
int
main ()
{
-@@ -29226,27 +27626,10 @@
+@@ -29226,27 +27626,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9281,7 +9283,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -29259,11 +27642,15 @@
+@@ -29259,11 +27642,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
@@ -9299,7 +9301,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29273,7 +27660,7 @@
+@@ -29273,7 +27660,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9308,7 +9310,7 @@
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>
-@@ -29332,21 +27719,25 @@
+@@ -29332,21 +27719,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -9338,7 +9340,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
-@@ -29389,27 +27780,10 @@
+@@ -29389,27 +27780,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9370,7 +9372,7 @@
ac_cv_type_void_p=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29423,16 +27797,15 @@
+@@ -29423,16 +27797,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
@@ -9391,7 +9393,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -29442,7 +27815,7 @@
+@@ -29442,7 +27815,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9400,7 +9402,7 @@
int
main ()
{
-@@ -29466,27 +27839,10 @@
+@@ -29466,27 +27839,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9432,7 +9434,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -29496,7 +27852,7 @@
+@@ -29496,7 +27852,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9441,7 +9443,7 @@
int
main ()
{
-@@ -29520,27 +27876,10 @@
+@@ -29520,27 +27876,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9473,7 +9475,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -29567,7 +27906,7 @@
+@@ -29567,7 +27906,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9482,7 +9484,7 @@
int
main ()
{
-@@ -29591,27 +27930,10 @@
+@@ -29591,27 +27930,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9514,7 +9516,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -29621,7 +27943,7 @@
+@@ -29621,7 +27943,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9523,7 +9525,7 @@
int
main ()
{
-@@ -29645,27 +27967,10 @@
+@@ -29645,27 +27967,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9555,7 +9557,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -29702,7 +28007,7 @@
+@@ -29702,7 +28007,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9564,7 +9566,7 @@
int
main ()
{
-@@ -29726,27 +28031,10 @@
+@@ -29726,27 +28031,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9596,7 +9598,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -29759,11 +28047,15 @@
+@@ -29759,11 +28047,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_void_p=$ac_lo;;
@@ -9614,7 +9616,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29773,7 +28065,7 @@
+@@ -29773,7 +28065,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9623,7 +9625,7 @@
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>
-@@ -29832,21 +28124,25 @@
+@@ -29832,21 +28124,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -9653,7 +9655,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
_ACEOF
-@@ -29889,27 +28185,10 @@
+@@ -29889,27 +28185,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9685,7 +9687,7 @@
ac_cv_type_long_long=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29923,16 +28202,15 @@
+@@ -29923,16 +28202,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
@@ -9706,7 +9708,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -29942,7 +28220,7 @@
+@@ -29942,7 +28220,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9715,7 +9717,7 @@
int
main ()
{
-@@ -29966,27 +28244,10 @@
+@@ -29966,27 +28244,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9747,7 +9749,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -29996,7 +28257,7 @@
+@@ -29996,7 +28257,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9756,7 +9758,7 @@
int
main ()
{
-@@ -30020,27 +28281,10 @@
+@@ -30020,27 +28281,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9788,7 +9790,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -30067,7 +28311,7 @@
+@@ -30067,7 +28311,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9797,7 +9799,7 @@
int
main ()
{
-@@ -30091,27 +28335,10 @@
+@@ -30091,27 +28335,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9829,7 +9831,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -30121,7 +28348,7 @@
+@@ -30121,7 +28348,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9838,7 +9840,7 @@
int
main ()
{
-@@ -30145,27 +28372,10 @@
+@@ -30145,27 +28372,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9870,7 +9872,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -30202,7 +28412,7 @@
+@@ -30202,7 +28412,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9879,7 +9881,7 @@
int
main ()
{
-@@ -30226,27 +28436,10 @@
+@@ -30226,27 +28436,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9911,7 +9913,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -30259,11 +28452,15 @@
+@@ -30259,11 +28452,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_long_long=$ac_lo;;
@@ -9929,7 +9931,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30273,7 +28470,7 @@
+@@ -30273,7 +28470,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -9938,7 +9940,7 @@
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>
-@@ -30332,21 +28529,25 @@
+@@ -30332,21 +28529,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -9968,7 +9970,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-@@ -30389,27 +28590,10 @@
+@@ -30389,27 +28590,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10000,7 +10002,7 @@
ac_cv_type___int64=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30423,16 +28607,15 @@
+@@ -30423,16 +28607,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
echo "${ECHO_T}$ac_cv_type___int64" >&6; }
@@ -10021,7 +10023,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -30442,7 +28625,7 @@
+@@ -30442,7 +28625,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10030,7 +10032,7 @@
int
main ()
{
-@@ -30466,27 +28649,10 @@
+@@ -30466,27 +28649,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10062,7 +10064,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -30496,7 +28662,7 @@
+@@ -30496,7 +28662,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10071,7 +10073,7 @@
int
main ()
{
-@@ -30520,27 +28686,10 @@
+@@ -30520,27 +28686,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10103,7 +10105,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -30567,7 +28716,7 @@
+@@ -30567,7 +28716,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10112,7 +10114,7 @@
int
main ()
{
-@@ -30591,27 +28740,10 @@
+@@ -30591,27 +28740,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10144,7 +10146,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -30621,7 +28753,7 @@
+@@ -30621,7 +28753,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10153,7 +10155,7 @@
int
main ()
{
-@@ -30645,27 +28777,10 @@
+@@ -30645,27 +28777,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10185,7 +10187,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -30702,7 +28817,7 @@
+@@ -30702,7 +28817,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10194,7 +10196,7 @@
int
main ()
{
-@@ -30726,27 +28841,10 @@
+@@ -30726,27 +28841,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10226,7 +10228,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -30759,11 +28857,15 @@
+@@ -30759,11 +28857,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof___int64=$ac_lo;;
@@ -10244,7 +10246,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30773,7 +28875,7 @@
+@@ -30773,7 +28875,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -10253,7 +10255,7 @@
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>
-@@ -30832,21 +28934,25 @@
+@@ -30832,21 +28934,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -10283,7 +10285,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF___INT64 $ac_cv_sizeof___int64
_ACEOF
-@@ -30989,10 +29095,10 @@
+@@ -30989,10 +29095,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -10297,7 +10299,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -31001,11 +29107,11 @@
+@@ -31001,11 +29107,11 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -10313,7 +10315,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -31032,7 +29138,7 @@
+@@ -31032,7 +29138,7 @@ main ()
const int foo = 10;
if (!foo) return 0;
}
@@ -10322,7 +10324,7 @@
#endif
;
-@@ -31052,27 +29158,10 @@
+@@ -31052,27 +29158,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10354,7 +10356,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31137,27 +29226,10 @@
+@@ -31137,27 +29226,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10386,7 +10388,7 @@
cat >>confdefs.h <<\_ACEOF
#define SANE_MALLOC_PROTOS 1
-@@ -31268,27 +29340,10 @@
+@@ -31268,27 +29340,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10418,7 +10420,7 @@
glib_cv_has__inline=yes
else
-@@ -31336,27 +29391,10 @@
+@@ -31336,27 +29391,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10450,7 +10452,7 @@
glib_cv_has__inline__=yes
else
-@@ -31405,27 +29443,10 @@
+@@ -31405,27 +29443,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10482,7 +10484,7 @@
glib_cv_hasinline=yes
else
-@@ -31491,27 +29512,11 @@
+@@ -31491,27 +29512,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10515,7 +10517,7 @@
g_can_inline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31520,7 +29525,7 @@
+@@ -31520,7 +29525,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
g_can_inline=no
fi
@@ -10524,7 +10526,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $g_can_inline" >&5
echo "${ECHO_T}$g_can_inline" >&6; }
-@@ -31563,27 +29568,10 @@
+@@ -31563,27 +29568,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10556,7 +10558,7 @@
g_support_dowhile_macros=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31640,27 +29628,10 @@
+@@ -31640,27 +29628,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10588,7 +10590,7 @@
g_have_iso_c_varargs=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31716,27 +29687,10 @@
+@@ -31716,27 +29687,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10620,7 +10622,7 @@
g_have_iso_cxx_varargs=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31790,27 +29744,10 @@
+@@ -31790,27 +29744,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10652,7 +10654,7 @@
g_have_gnuc_varargs=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31930,27 +29867,10 @@
+@@ -31930,27 +29867,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10684,7 +10686,7 @@
g_have_sunstudio_visibility=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31992,7 +29912,8 @@
+@@ -31992,7 +29912,8 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@@ -10694,7 +10696,7 @@
bogus endian macros
#endif
-@@ -32013,27 +29934,10 @@
+@@ -32013,27 +29934,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10726,7 +10728,7 @@
# It does; now see whether it defined to BIG_ENDIAN or not.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32068,27 +29972,10 @@
+@@ -32068,27 +29972,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10758,7 +10760,7 @@
ac_cv_c_bigendian=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32139,27 +30026,10 @@
+@@ -32139,27 +30026,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10790,7 +10792,7 @@
if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
ac_cv_c_bigendian=yes
fi
-@@ -32302,31 +30172,14 @@
+@@ -32302,31 +30172,14 @@ esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
@@ -10829,7 +10831,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32362,17 +30215,10 @@
+@@ -32362,17 +30215,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10851,7 +10853,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32479,27 +30325,10 @@
+@@ -32479,27 +30325,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10883,7 +10885,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32535,17 +30364,10 @@
+@@ -32535,17 +30364,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10905,7 +10907,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32652,27 +30474,10 @@
+@@ -32652,27 +30474,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10937,7 +10939,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32708,17 +30513,10 @@
+@@ -32708,17 +30513,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10959,7 +10961,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32824,27 +30622,10 @@
+@@ -32824,27 +30622,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10991,7 +10993,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32880,17 +30661,10 @@
+@@ -32880,17 +30661,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11013,7 +11015,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33021,27 +30795,11 @@
+@@ -33021,27 +30795,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11046,7 +11048,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -33050,7 +30808,7 @@
+@@ -33050,7 +30808,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -11055,7 +11057,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -33098,27 +30856,11 @@
+@@ -33098,27 +30856,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11088,7 +11090,7 @@
jm_cv_langinfo_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33127,7 +30869,7 @@
+@@ -33127,7 +30869,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
jm_cv_langinfo_codeset=no
fi
@@ -11097,7 +11099,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -33220,27 +30962,10 @@
+@@ -33220,27 +30962,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11129,7 +11131,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33276,17 +31001,10 @@
+@@ -33276,17 +31001,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11151,7 +11153,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33417,27 +31135,11 @@
+@@ -33417,27 +31135,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11184,7 +11186,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -33446,7 +31148,7 @@
+@@ -33446,7 +31148,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -11193,7 +11195,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -33499,27 +31201,10 @@
+@@ -33499,27 +31201,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11225,7 +11227,7 @@
ac_cv_type_size_t=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33533,16 +31218,15 @@
+@@ -33533,16 +31218,15 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
@@ -11246,7 +11248,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -33552,7 +31236,7 @@
+@@ -33552,7 +31236,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11255,7 +11257,7 @@
int
main ()
{
-@@ -33576,27 +31260,10 @@
+@@ -33576,27 +31260,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11287,7 +11289,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -33606,7 +31273,7 @@
+@@ -33606,7 +31273,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11296,7 +11298,7 @@
int
main ()
{
-@@ -33630,27 +31297,10 @@
+@@ -33630,27 +31297,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11328,7 +11330,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -33677,7 +31327,7 @@
+@@ -33677,7 +31327,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11337,7 +11339,7 @@
int
main ()
{
-@@ -33701,27 +31351,10 @@
+@@ -33701,27 +31351,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11369,7 +11371,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -33731,7 +31364,7 @@
+@@ -33731,7 +31364,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11378,7 +11380,7 @@
int
main ()
{
-@@ -33755,27 +31388,10 @@
+@@ -33755,27 +31388,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11410,7 +11412,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -33812,7 +31428,7 @@
+@@ -33812,7 +31428,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11419,7 +11421,7 @@
int
main ()
{
-@@ -33836,27 +31452,10 @@
+@@ -33836,27 +31452,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11451,7 +11453,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -33869,11 +31468,15 @@
+@@ -33869,11 +31468,15 @@ rm -f core conftest.err conftest.$ac_obj
done
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
@@ -11469,7 +11471,7 @@
esac
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33883,7 +31486,7 @@
+@@ -33883,7 +31486,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -11478,7 +11480,7 @@
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>
-@@ -33942,21 +31545,25 @@
+@@ -33942,21 +31545,25 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -11508,7 +11510,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
_ACEOF
-@@ -34149,27 +31756,11 @@
+@@ -34149,27 +31756,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11541,7 +11543,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -34178,7 +31769,7 @@
+@@ -34178,7 +31769,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -11550,7 +11552,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -34261,27 +31852,11 @@
+@@ -34261,27 +31852,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11583,7 +11585,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -34290,7 +31865,7 @@
+@@ -34290,7 +31865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -11592,7 +11594,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -34344,27 +31919,10 @@
+@@ -34344,27 +31919,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11624,7 +11626,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34400,17 +31958,10 @@
+@@ -34400,17 +31958,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11646,7 +11648,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34541,27 +32092,11 @@
+@@ -34541,27 +32092,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11679,7 +11681,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -34570,7 +32105,7 @@
+@@ -34570,7 +32105,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -11688,7 +11690,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -34851,27 +32386,10 @@
+@@ -34851,27 +32386,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11720,7 +11722,7 @@
bh_cv_c_signed=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34927,27 +32445,11 @@
+@@ -34927,27 +32445,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11753,7 +11755,7 @@
ac_cv_type_long_long=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34956,7 +32458,7 @@
+@@ -34956,7 +32458,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_long_long=no
fi
@@ -11762,7 +11764,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-@@ -35011,27 +32513,10 @@
+@@ -35011,27 +32513,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11794,7 +11796,7 @@
gt_cv_c_long_double=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35088,27 +32573,10 @@
+@@ -35088,27 +32573,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11826,7 +11828,7 @@
gt_cv_c_wchar_t=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35164,27 +32632,10 @@
+@@ -35164,27 +32632,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11858,7 +11860,7 @@
gt_cv_c_wint_t=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35242,27 +32693,10 @@
+@@ -35242,27 +32693,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11890,7 +11892,7 @@
ac_cv_type_size_t=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35322,27 +32756,10 @@
+@@ -35322,27 +32756,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11922,7 +11924,7 @@
ac_cv_type_ptrdiff_t=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35399,27 +32816,10 @@
+@@ -35399,27 +32816,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11954,7 +11956,7 @@
jm_ac_cv_header_inttypes_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35463,39 +32863,22 @@
+@@ -35463,39 +32863,22 @@ uintmax_t i = (uintmax_t) -1;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12004,7 +12006,7 @@
jm_ac_cv_header_stdint_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35605,27 +32988,11 @@
+@@ -35605,27 +32988,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12037,7 +12039,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -35634,7 +33001,7 @@
+@@ -35634,7 +33001,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -12046,7 +12048,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -35867,27 +33234,11 @@
+@@ -35867,27 +33234,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12079,7 +12081,7 @@
glib_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35896,7 +33247,7 @@
+@@ -35896,7 +33247,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_ok=no
fi
@@ -12088,7 +12090,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $glib_ok" >&5
echo "${ECHO_T}$glib_ok" >&6; }
-@@ -35942,27 +33293,11 @@
+@@ -35942,27 +33293,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12121,7 +12123,7 @@
glib_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35971,7 +33306,7 @@
+@@ -35971,7 +33306,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_ok=no
fi
@@ -12130,7 +12132,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $glib_ok" >&5
echo "${ECHO_T}$glib_ok" >&6; }
-@@ -36016,27 +33351,10 @@
+@@ -36016,27 +33351,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12162,7 +12164,7 @@
glib_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36087,27 +33405,10 @@
+@@ -36087,27 +33405,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12194,7 +12196,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36255,27 +33556,10 @@
+@@ -36255,27 +33556,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12226,7 +12228,7 @@
glib_cv_langinfo_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36494,27 +33778,11 @@
+@@ -36494,27 +33778,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12259,7 +12261,7 @@
glib_cv_va_copy=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36523,7 +33791,7 @@
+@@ -36523,7 +33791,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_cv_va_copy=no
fi
@@ -12268,7 +12270,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -36564,27 +33832,11 @@
+@@ -36564,27 +33832,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12301,7 +12303,7 @@
glib_cv___va_copy=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36593,7 +33845,7 @@
+@@ -36593,7 +33845,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_cv___va_copy=no
fi
@@ -12310,7 +12312,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -36777,27 +34029,11 @@
+@@ -36777,27 +34029,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12343,7 +12345,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36806,7 +34042,7 @@
+@@ -36806,7 +34042,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
@@ -12352,7 +12354,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -36875,27 +34111,11 @@
+@@ -36875,27 +34111,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12385,7 +12387,7 @@
ac_cv_func_dlsym=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36904,7 +34124,7 @@
+@@ -36904,7 +34124,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlsym=no
fi
@@ -12394,7 +12396,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlsym" >&5
-@@ -36959,27 +34179,11 @@
+@@ -36959,27 +34179,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12427,7 +12429,7 @@
ac_cv_lib_root_load_image=yes
else
echo "$as_me: failed program was:" >&5
-@@ -36988,7 +34192,7 @@
+@@ -36988,7 +34192,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_root_load_image=no
fi
@@ -12436,7 +12438,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -37066,27 +34270,11 @@
+@@ -37066,27 +34270,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12469,7 +12471,7 @@
ac_cv_func_NSLinkModule=yes
else
echo "$as_me: failed program was:" >&5
-@@ -37095,7 +34283,7 @@
+@@ -37095,7 +34283,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_NSLinkModule=no
fi
@@ -12478,7 +12480,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_NSLinkModule" >&5
-@@ -37149,27 +34337,11 @@
+@@ -37149,27 +34337,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12511,7 +12513,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -37178,7 +34350,7 @@
+@@ -37178,7 +34350,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -12520,7 +12522,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -37227,27 +34399,11 @@
+@@ -37227,27 +34399,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12553,7 +12555,7 @@
ac_cv_lib_dl_dlsym=yes
else
echo "$as_me: failed program was:" >&5
-@@ -37256,7 +34412,7 @@
+@@ -37256,7 +34412,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlsym=no
fi
@@ -12562,7 +12564,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -37313,27 +34469,11 @@
+@@ -37313,27 +34469,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12595,7 +12597,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -37342,7 +34482,7 @@
+@@ -37342,7 +34482,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
@@ -12604,7 +12606,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -37583,27 +34723,11 @@
+@@ -37583,27 +34723,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12637,7 +12639,7 @@
ac_cv_func_dlerror=yes
else
echo "$as_me: failed program was:" >&5
-@@ -37612,7 +34736,7 @@
+@@ -37612,7 +34736,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlerror=no
fi
@@ -12646,7 +12648,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlerror" >&5
-@@ -37850,27 +34974,10 @@
+@@ -37850,27 +34974,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12678,7 +12680,7 @@
have_threads=posix
else
echo "$as_me: failed program was:" >&5
-@@ -37911,27 +35018,10 @@
+@@ -37911,27 +35018,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12710,7 +12712,7 @@
have_threads=dce
else
echo "$as_me: failed program was:" >&5
-@@ -37973,27 +35063,10 @@
+@@ -37973,27 +35063,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12742,7 +12744,7 @@
have_threads=posix
else
echo "$as_me: failed program was:" >&5
-@@ -38089,27 +35162,11 @@
+@@ -38089,27 +35162,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12775,7 +12777,7 @@
glib_flag_works=yes
else
echo "$as_me: failed program was:" >&5
-@@ -38118,7 +35175,7 @@
+@@ -38118,7 +35175,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_flag_works=no
fi
@@ -12784,7 +12786,7 @@
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38346,27 +35403,11 @@
+@@ -38346,27 +35403,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12817,7 +12819,7 @@
glib_result=yes
else
echo "$as_me: failed program was:" >&5
-@@ -38375,7 +35416,7 @@
+@@ -38375,7 +35416,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_result=no
fi
@@ -12826,7 +12828,7 @@
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38484,27 +35525,11 @@
+@@ -38484,27 +35525,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12859,7 +12861,7 @@
glib_result=yes
else
echo "$as_me: failed program was:" >&5
-@@ -38513,7 +35538,7 @@
+@@ -38513,7 +35538,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
glib_result=no
fi
@@ -12868,7 +12870,7 @@
conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38693,27 +35718,11 @@
+@@ -38693,27 +35718,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12901,7 +12903,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -38722,7 +35731,7 @@
+@@ -38722,7 +35731,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -12910,7 +12912,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -38854,27 +35863,11 @@
+@@ -38854,27 +35863,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12943,7 +12945,7 @@
ac_cv_func_nonposix_getpwuid_r=yes
else
echo "$as_me: failed program was:" >&5
-@@ -38883,7 +35876,7 @@
+@@ -38883,7 +35876,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_nonposix_getpwuid_r=no
fi
@@ -12952,7 +12954,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_nonposix_getpwuid_r" >&5
-@@ -38949,27 +35942,10 @@
+@@ -38949,27 +35942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12984,7 +12986,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -39003,27 +35979,10 @@
+@@ -39003,27 +35979,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13016,7 +13018,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -39074,27 +36033,10 @@
+@@ -39074,27 +36033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13048,7 +13050,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -39128,27 +36070,10 @@
+@@ -39128,27 +36070,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13080,7 +13082,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -39209,27 +36134,10 @@
+@@ -39209,27 +36134,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13112,7 +13114,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -39321,6 +36229,7 @@
+@@ -39321,6 +36229,7 @@ rm -f core *.core core.conftest.* gmon.o
fi
rm -f conftest.val
@@ -13120,7 +13122,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_sizeof_system_thread" >&5
echo "${ECHO_T}$glib_cv_sizeof_system_thread" >&6; }
-@@ -39361,27 +36270,11 @@
+@@ -39361,27 +36270,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13153,7 +13155,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-@@ -39397,7 +36290,7 @@
+@@ -39397,7 +36290,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "${ECHO_T}no" >&6; }
fi
@@ -13162,7 +13164,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: checking for minimal/maximal thread priority" >&5
echo $ECHO_N "checking for minimal/maximal thread priority... $ECHO_C" >&6; }
-@@ -39505,27 +36398,11 @@
+@@ -39505,27 +36398,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13195,7 +13197,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-@@ -39548,7 +36425,7 @@
+@@ -39548,7 +36425,7 @@ echo "${ECHO_T}no" >&6; }
echo "$as_me: WARNING: $POSIX_NO_PRIORITIES" >&2;}
fi
@@ -13204,7 +13206,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
posix_yield_func=none
-@@ -39584,27 +36461,11 @@
+@@ -39584,27 +36461,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13237,7 +13239,7 @@
posix_yield_func="$yield_func"
break
else
-@@ -39614,7 +36475,7 @@
+@@ -39614,7 +36475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -13246,7 +13248,7 @@
conftest$ac_exeext conftest.$ac_ext
done
if test x"$posix_yield_func" = xnone; then
-@@ -39678,27 +36539,10 @@
+@@ -39678,27 +36539,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13278,7 +13280,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -39731,27 +36575,10 @@
+@@ -39731,27 +36575,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13310,7 +13312,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -39801,27 +36628,10 @@
+@@ -39801,27 +36628,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13342,7 +13344,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -39854,27 +36664,10 @@
+@@ -39854,27 +36664,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13374,7 +13376,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -39934,27 +36727,10 @@
+@@ -39934,27 +36727,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13406,7 +13408,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -40045,6 +36821,7 @@
+@@ -40045,6 +36821,7 @@ rm -f core *.core core.conftest.* gmon.o
fi
rm -f conftest.val
@@ -13414,7 +13416,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_sizeof_system_thread" >&5
echo "${ECHO_T}$glib_cv_sizeof_system_thread" >&6; }
-@@ -40112,27 +36889,10 @@
+@@ -40112,27 +36889,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13446,7 +13448,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -40165,27 +36925,10 @@
+@@ -40165,27 +36925,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13478,7 +13480,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -40235,27 +36978,10 @@
+@@ -40235,27 +36978,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13510,7 +13512,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -40288,27 +37014,10 @@
+@@ -40288,27 +37014,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13542,7 +13544,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -40368,27 +37077,10 @@
+@@ -40368,27 +37077,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13574,7 +13576,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -40479,6 +37171,7 @@
+@@ -40479,6 +37171,7 @@ rm -f core *.core core.conftest.* gmon.o
fi
rm -f conftest.val
@@ -13582,7 +13584,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_sizeof_system_thread" >&5
echo "${ECHO_T}$glib_cv_sizeof_system_thread" >&6; }
-@@ -40562,27 +37255,10 @@
+@@ -40562,27 +37255,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13614,7 +13616,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -40616,27 +37292,10 @@
+@@ -40616,27 +37292,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13646,7 +13648,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -40687,27 +37346,10 @@
+@@ -40687,27 +37346,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13678,7 +13680,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -40741,27 +37383,10 @@
+@@ -40741,27 +37383,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13710,7 +13712,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -40822,27 +37447,10 @@
+@@ -40822,27 +37447,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13742,7 +13744,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -40934,6 +37542,7 @@
+@@ -40934,6 +37542,7 @@ rm -f core *.core core.conftest.* gmon.o
fi
rm -f conftest.val
@@ -13750,7 +13752,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_sizeof_gmutex" >&5
echo "${ECHO_T}$glib_cv_sizeof_gmutex" >&6; }
-@@ -41087,27 +37696,11 @@
+@@ -41087,27 +37696,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13783,7 +13785,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -41116,7 +37709,7 @@
+@@ -41116,7 +37709,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -13792,7 +13794,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -41171,27 +37764,11 @@
+@@ -41171,27 +37764,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13825,7 +13827,7 @@
ac_cv_lib_rt_clock_gettime=yes
else
echo "$as_me: failed program was:" >&5
-@@ -41200,7 +37777,7 @@
+@@ -41200,7 +37777,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_rt_clock_gettime=no
fi
@@ -13834,7 +13836,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -41257,27 +37834,10 @@
+@@ -41257,27 +37834,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13866,7 +13868,7 @@
glib_cv_monotonic_clock=yes
else
echo "$as_me: failed program was:" >&5
-@@ -41349,27 +37909,11 @@
+@@ -41349,27 +37909,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13899,7 +13901,7 @@
{ echo "$as_me:$LINENO: result: sparcv9" >&5
echo "${ECHO_T}sparcv9" >&6; }
-@@ -41387,7 +37931,7 @@
+@@ -41387,7 +37931,7 @@ echo "${ECHO_T}no" >&6; }
echo "$as_me: WARNING: $SPARCV9_WARNING" >&2;}
fi
@@ -13908,7 +13910,7 @@
conftest$ac_exeext conftest.$ac_ext
glib_memory_barrier_needed=yes
;;
-@@ -41505,27 +38049,10 @@
+@@ -41505,27 +38049,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13940,7 +13942,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -41558,27 +38085,10 @@
+@@ -41558,27 +38085,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13972,7 +13974,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -41628,27 +38138,10 @@
+@@ -41628,27 +38138,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14004,7 +14006,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -41681,27 +38174,10 @@
+@@ -41681,27 +38174,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14036,7 +14038,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -41749,39 +38225,22 @@
+@@ -41749,39 +38225,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14086,7 +14088,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -41867,6 +38326,7 @@
+@@ -41867,6 +38326,7 @@ 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
@@ -14094,7 +14096,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLIN" >&5
echo "${ECHO_T}$glib_cv_value_POLLIN" >&6; }
-@@ -41908,27 +38368,10 @@
+@@ -41908,27 +38368,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14126,7 +14128,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -41961,27 +38404,10 @@
+@@ -41961,27 +38404,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14158,7 +14160,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42031,27 +38457,10 @@
+@@ -42031,27 +38457,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14190,7 +14192,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -42084,27 +38493,10 @@
+@@ -42084,27 +38493,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14222,7 +14224,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42164,27 +38556,10 @@
+@@ -42164,27 +38556,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14254,7 +14256,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -42270,6 +38645,7 @@
+@@ -42270,6 +38645,7 @@ 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
@@ -14262,7 +14264,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLOUT" >&5
echo "${ECHO_T}$glib_cv_value_POLLOUT" >&6; }
-@@ -42311,27 +38687,10 @@
+@@ -42311,27 +38687,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14294,7 +14296,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -42364,27 +38723,10 @@
+@@ -42364,27 +38723,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14326,7 +14328,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42434,27 +38776,10 @@
+@@ -42434,27 +38776,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14358,7 +14360,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -42487,27 +38812,10 @@
+@@ -42487,27 +38812,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14390,7 +14392,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42567,27 +38875,10 @@
+@@ -42567,27 +38875,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14422,7 +14424,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -42673,6 +38964,7 @@
+@@ -42673,6 +38964,7 @@ 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
@@ -14430,7 +14432,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLPRI" >&5
echo "${ECHO_T}$glib_cv_value_POLLPRI" >&6; }
-@@ -42714,27 +39006,10 @@
+@@ -42714,27 +39006,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14462,7 +14464,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -42767,27 +39042,10 @@
+@@ -42767,27 +39042,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14494,7 +14496,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42837,27 +39095,10 @@
+@@ -42837,27 +39095,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14526,7 +14528,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -42890,27 +39131,10 @@
+@@ -42890,27 +39131,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14558,7 +14560,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -42970,27 +39194,10 @@
+@@ -42970,27 +39194,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14590,7 +14592,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -43076,6 +39283,7 @@
+@@ -43076,6 +39283,7 @@ 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
@@ -14598,7 +14600,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLERR" >&5
echo "${ECHO_T}$glib_cv_value_POLLERR" >&6; }
-@@ -43117,27 +39325,10 @@
+@@ -43117,27 +39325,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14630,7 +14632,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -43170,27 +39361,10 @@
+@@ -43170,27 +39361,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14662,7 +14664,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -43240,27 +39414,10 @@
+@@ -43240,27 +39414,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14694,7 +14696,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -43293,27 +39450,10 @@
+@@ -43293,27 +39450,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14726,7 +14728,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -43373,27 +39513,10 @@
+@@ -43373,27 +39513,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14758,7 +14760,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -43479,6 +39602,7 @@
+@@ -43479,6 +39602,7 @@ 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
@@ -14766,7 +14768,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLHUP" >&5
echo "${ECHO_T}$glib_cv_value_POLLHUP" >&6; }
-@@ -43520,27 +39644,10 @@
+@@ -43520,27 +39644,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14798,7 +14800,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -43573,27 +39680,10 @@
+@@ -43573,27 +39680,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14830,7 +14832,7 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -43643,27 +39733,10 @@
+@@ -43643,27 +39733,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14862,7 +14864,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -43696,27 +39769,10 @@
+@@ -43696,27 +39769,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14894,7 +14896,7 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
-@@ -43776,27 +39832,10 @@
+@@ -43776,27 +39832,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -14926,7 +14928,7 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
-@@ -43882,6 +39921,7 @@
+@@ -43882,6 +39921,7 @@ 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
@@ -14934,7 +14936,7 @@
fi
{ echo "$as_me:$LINENO: result: $glib_cv_value_POLLNVAL" >&5
echo "${ECHO_T}$glib_cv_value_POLLNVAL" >&6; }
-@@ -44043,7 +40083,7 @@
+@@ -44043,7 +40083,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14943,7 +14945,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -44086,7 +40126,7 @@
+@@ -44086,7 +40126,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14952,7 +14954,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -44232,7 +40272,7 @@
+@@ -44232,7 +40272,7 @@ Alternatively, you may set the environme
and PCRE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14961,7 +14963,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -44242,7 +40282,7 @@
+@@ -44242,7 +40282,7 @@ Alternatively, you may set the environme
and PCRE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14970,7 +14972,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -44370,27 +40410,10 @@
+@@ -44370,27 +40410,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15002,7 +15004,7 @@
PCRE_WARN_CFLAGS="$PCRE_WARN_CFLAGS -Wno-pointer-sign"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-@@ -44469,27 +40492,10 @@
+@@ -44469,27 +40492,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -15034,7 +15036,7 @@
have_eilseq=yes
else
echo "$as_me: failed program was:" >&5
-@@ -44533,7 +40539,7 @@
+@@ -44533,7 +40539,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15043,7 +15045,7 @@
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -44624,7 +40630,7 @@
+@@ -44624,7 +40630,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15052,7 +15054,7 @@
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -44699,7 +40705,7 @@
+@@ -44699,7 +40705,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15061,7 +15063,7 @@
ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -44768,7 +40774,7 @@
+@@ -44768,7 +40774,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15070,7 +15072,7 @@
ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -45147,7 +41153,8 @@
+@@ -45147,7 +41153,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
@@ -15080,7 +15082,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -45156,10 +41163,13 @@
+@@ -45156,10 +41163,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -15097,7 +15099,7 @@
# PATH needs CR
-@@ -45383,19 +41393,28 @@
+@@ -45383,19 +41393,28 @@ else
as_mkdir_p=false
fi
@@ -15137,16 +15139,16 @@
# 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'"
-@@ -45411,7 +41430,7 @@
+@@ -45411,7 +41430,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by glib $as_me 2.14.1, which was
+ This file was extended by glib $as_me 2.14.2, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -45440,7 +41459,7 @@
+@@ -45440,7 +41459,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -15155,16 +15157,16 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -45464,7 +41483,7 @@
+@@ -45464,7 +41483,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- glib config.status 2.14.1
+ glib config.status 2.14.2
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -46173,6 +42192,7 @@
+@@ -46173,6 +42192,7 @@ POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
ICONV_LIBS!$ICONV_LIBS$ac_delim
@@ -15172,7 +15174,7 @@
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
-@@ -46217,7 +42237,6 @@
+@@ -46217,7 +42237,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_
ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
@@ -15180,7 +15182,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -46259,6 +42278,7 @@
+@@ -46259,6 +42278,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -15188,7 +15190,7 @@
PCRE_LIBS!$PCRE_LIBS$ac_delim
PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim
-@@ -46281,7 +42301,7 @@
+@@ -46281,7 +42301,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -15197,8 +15199,9 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- glib2.0-2.14.1.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ glib2.0-2.14.1/ltmain.sh 2007-10-07 16:57:48.000000000 +0200
+diff -uprN -x config.guess -x config.sub glib2.0-2.14.2.orig/ltmain.sh glib2.0-2.14.2/ltmain.sh
+--- glib2.0-2.14.2.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
++++ glib2.0-2.14.2/ltmain.sh 2007-07-11 23:11:42.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -15210,7 +15213,7 @@
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
+@@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -15238,7 +15241,7 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@
+@@ -105,12 +113,14 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
@@ -15259,7 +15262,7 @@
# Make sure IFS has a sensible default
lt_nl='
-@@ -136,6 +146,8 @@
+@@ -136,6 +146,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -15268,7 +15271,7 @@
#####################################
# Shell function definitions:
-@@ -196,7 +208,13 @@
+@@ -196,7 +208,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
@@ -15283,7 +15286,7 @@
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@
+@@ -327,7 +345,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
@@ -15302,7 +15305,7 @@
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@
+@@ -454,11 +482,12 @@ do
;;
--version)
@@ -15320,7 +15323,7 @@
exit $?
;;
-@@ -755,9 +784,10 @@
+@@ -755,9 +784,10 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -15332,7 +15335,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@
+@@ -1138,8 +1168,9 @@ EOF
for arg
do
case $arg in
@@ -15344,7 +15347,7 @@
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
-@@ -1147,12 +1178,20 @@
+@@ -1147,12 +1178,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
@@ -15367,7 +15370,7 @@
build_libtool_libs=no
build_old_libs=yes
break
-@@ -1600,7 +1639,7 @@
+@@ -1600,7 +1639,7 @@ EOF
continue
;;
@@ -15376,7 +15379,7 @@
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@
+@@ -1620,10 +1659,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
@@ -15391,7 +15394,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@
+@@ -1651,9 +1691,9 @@ EOF
-no-install)
case $host in
@@ -15403,7 +15406,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1712,7 +1752,7 @@
+@@ -1712,7 +1752,7 @@ EOF
continue
;;
@@ -15412,7 +15415,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -2082,7 +2122,10 @@
+@@ -2082,7 +2122,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -15424,7 +15427,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -2094,7 +2137,7 @@
+@@ -2094,7 +2137,7 @@ EOF
lib=
found=no
case $deplib in
@@ -15433,7 +15436,7 @@
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2490,7 +2533,9 @@
+@@ -2490,7 +2533,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -15444,7 +15447,7 @@
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
-@@ -3186,7 +3231,7 @@
+@@ -3186,7 +3231,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
@@ -15453,7 +15456,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -3197,9 +3242,15 @@
+@@ -3197,9 +3242,15 @@ EOF
age="0"
;;
irix|nonstopux)
@@ -15470,7 +15473,7 @@
;;
esac
;;
-@@ -3258,7 +3309,8 @@
+@@ -3258,7 +3309,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -15480,7 +15483,7 @@
;;
freebsd-aout)
-@@ -3272,8 +3324,11 @@
+@@ -3272,8 +3324,11 @@ EOF
;;
irix | nonstopux)
@@ -15494,7 +15497,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3410,11 +3465,11 @@
+@@ -3410,11 +3465,11 @@ EOF
fi
# Eliminate all temporary directories.
@@ -15511,7 +15514,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3515,13 +3570,12 @@
+@@ -3515,13 +3570,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
@@ -15527,7 +15530,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3560,9 +3614,7 @@
+@@ -3560,9 +3614,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
@@ -15538,7 +15541,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3594,7 +3646,7 @@
+@@ -3594,7 +3646,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -15547,7 +15550,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3880,7 +3932,10 @@
+@@ -3880,7 +3932,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -15559,7 +15562,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -4239,12 +4294,14 @@
+@@ -4239,12 +4294,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -15576,7 +15579,7 @@
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
-@@ -4692,16 +4749,16 @@
+@@ -4692,16 +4749,16 @@ static const void *lt_preloaded_setup()
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
@@ -15599,7 +15602,7 @@
;;
esac
;;
-@@ -4716,13 +4773,13 @@
+@@ -4716,13 +4773,13 @@ static const void *lt_preloaded_setup()
# really was required.
# Nullify the symbol file.
@@ -15616,7 +15619,7 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -4809,7 +4866,7 @@
+@@ -4809,7 +4866,7 @@ static const void *lt_preloaded_setup()
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -15625,7 +15628,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4846,7 +4903,7 @@
+@@ -4846,7 +4903,7 @@ static const void *lt_preloaded_setup()
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -15634,7 +15637,7 @@
fi
# Quote $echo for shipping.
-@@ -5253,6 +5310,20 @@
+@@ -5253,6 +5310,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -15655,7 +15658,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5395,7 +5466,7 @@
+@@ -5395,7 +5466,7 @@ else
;;
esac
$echo >> $output "\
@@ -15664,7 +15667,7 @@
exit $EXIT_FAILURE
fi
else
-@@ -5581,7 +5652,7 @@
+@@ -5581,7 +5652,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -15673,7 +15676,7 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -5926,9 +5997,9 @@
+@@ -5926,9 +5997,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -15685,7 +15688,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6137,7 +6208,7 @@
+@@ -6137,7 +6208,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -15694,7 +15697,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -6348,8 +6419,10 @@
+@@ -6348,8 +6419,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -15707,7 +15710,7 @@
fi
;;
-@@ -6413,12 +6486,12 @@
+@@ -6413,12 +6486,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
@@ -15726,7 +15729,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -6775,9 +6848,9 @@
+@@ -6775,9 +6848,9 @@ The following components of LINK-COMMAND
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -15738,7 +15741,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6791,9 +6864,11 @@
+@@ -6791,9 +6864,11 @@ The following components of LINK-COMMAND
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
More information about the pkg-gnome-commits
mailing list