r12485 - in /desktop/experimental/gtk+2.0/debian: changelog patches/070_mandatory-relibtoolize.patch
alanbach-guest at users.alioth.debian.org
alanbach-guest at users.alioth.debian.org
Sun Sep 16 15:48:14 UTC 2007
Author: alanbach-guest
Date: Sun Sep 16 15:48:14 2007
New Revision: 12485
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12485
Log:
* New upstream stable release: Regenerated 070_mandatory-relibtoolize.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=12485&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Sun Sep 16 15:48:14 2007
@@ -1,10 +1,9 @@
-gtk+2.0 (2.11.6-2) UNRELEASED; urgency=low
-
- * New patch, 080_from_svn_fix_dangling_tooltip, fixes tooltips not
- disappearing in the systray; from SVN; found in Ubuntu package;
- Ubuntu #128781.
-
- -- Loic Minier <lool at dooz.org> Tue, 07 Aug 2007 16:28:19 +0200
+gtk+2.0 (2.12.0-1) experimental; urgency=low
+
+ * New upstream stable release
+ - Regenerated 070_mandatory-relibtoolize.patch
+
+ -- Alan Baghumian <alan at technotux.org> Sun, 16 Sep 2007 18:49:52 +0330
gtk+2.0 (2.11.6-1) experimental; urgency=low
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=12485&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Sun Sep 16 15:48:14 2007
@@ -6,348 +6,19 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
---- gtk+2.0-2.11.6.orig/Makefile.in 2007-07-20 22:21:30.000000000 +0200
-+++ gtk+2.0-2.11.6/Makefile.in 2007-07-24 10:36:26.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -327,7 +330,10 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+# don't build perf measurement tools in static builds
-+ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
-+
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
-
- # require automake 1.4
-@@ -478,13 +484,14 @@
- DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
- acinclude.m4 aclocal.m4 compile config.guess config.h.in \
-- config.h.win32.in config.sub configure.in depcomp \
-+ config.h.win32.in config.sub configure configure.in depcomp \
- gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \
- gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \
- gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \
- gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \
- missing mkinstalldirs
--DIST_SUBDIRS = $(SUBDIRS)
-+DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
-+ perf contrib docs m4macros
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-@@ -736,7 +743,7 @@
- || exit 1; \
- fi; \
- done
-- list='$(SUBDIRS)'; for subdir in $$list; do \
-+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
---- gtk+2.0-2.11.6.orig/aclocal.m4 2007-07-20 22:21:07.000000000 +0200
-+++ gtk+2.0-2.11.6/aclocal.m4 2007-07-24 10:36:26.000000000 +0200
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/aclocal.m4 gtk+-2.12.0/aclocal.m4
+--- gtk+-2.12.0.orig/aclocal.m4 2007-09-14 00:17:30.000000000 +0330
++++ gtk+-2.12.0/aclocal.m4 2007-09-16 18:42:52.000000000 +0330
@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1104,7 +1104,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -1191,8 +1191,9 @@
- # Check for compiler boilerplate output or warnings with
- # the simple compiler test code.
- AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -1204,8 +1205,9 @@
- # Check for linker boilerplate output or warnings with
- # the simple link test code.
- AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -1221,12 +1223,20 @@
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi],[])
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ])# _LT_AC_SYS_LIBPATH_AIX
-
-@@ -1457,13 +1467,17 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -1480,6 +1494,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -1551,7 +1568,7 @@
- AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -1592,11 +1609,12 @@
- # ------------------------------------------------------------
- # Check whether the given compiler option works
- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- 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
-@@ -1710,24 +1728,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
- ])
-@@ -1954,7 +1975,8 @@
- # ---------------------------------
- # Check to see if options -c and -o are simultaneously supported by compiler
- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- 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
-@@ -1962,7 +1984,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -2102,6 +2124,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-@@ -2119,7 +2142,8 @@
- # -----------------------------
- # PORTME Fill in your ld.so characteristics
- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -2133,20 +2157,58 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+m4_if($1,[],[
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+fi])
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -2303,12 +2365,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -2325,18 +2383,6 @@
+@@ -2325,18 +2325,6 @@
dynamic_linker=no
;;
@@ -366,25 +37,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2374,7 +2420,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -2437,7 +2483,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2492,7 +2538,7 @@
+@@ -2492,7 +2480,7 @@
;;
# This must be Linux ELF.
@@ -393,7 +46,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2506,27 +2552,10 @@
+@@ -2506,27 +2494,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -416,14 +69,13 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2538,7 +2567,7 @@
+@@ -2538,7 +2509,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -432,7 +84,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2547,7 +2576,7 @@
+@@ -2547,7 +2518,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -441,73 +93,7 @@
;;
netbsd*)
-@@ -2631,6 +2660,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -2736,7 +2769,8 @@
- # _LT_AC_TAGCONFIG
- # ----------------
- AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-@@ -2997,7 +3031,7 @@
-
- # AC_PATH_TOOL_PREFIX
- # -------------------
--# find a file program which can recognise shared library
-+# find a file program which can recognize shared library
- AC_DEFUN([AC_PATH_TOOL_PREFIX],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_MSG_CHECKING([for $1])
-@@ -3060,7 +3094,7 @@
-
- # AC_PATH_MAGIC
- # -------------
--# find a file program which can recognise a shared library
-+# find a file program which can recognize a shared library
- 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
-@@ -3207,7 +3241,7 @@
- # how to check for library dependencies
- # -- PORTME fill in with the dynamic library characteristics
- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -3246,16 +3280,22 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
+@@ -3255,7 +3226,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -516,16 +102,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3293,7 +3333,7 @@
- esac
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- # 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)$'
- ;;
-@@ -3309,11 +3349,11 @@
+@@ -3309,11 +3280,11 @@
;;
# This must be Linux ELF.
@@ -539,75 +116,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
-@@ -3343,6 +3383,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -3395,7 +3439,7 @@
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3611,10 +3655,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
- _LT_AC_SYS_COMPILER
-
-@@ -3716,10 +3760,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -3865,7 +3909,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -4024,10 +4068,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _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}'
- ;;
- *)
-@@ -4061,7 +4105,7 @@
+@@ -4061,7 +4032,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -616,27 +125,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4110,9 +4154,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-@@ -4180,7 +4222,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- _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'
-@@ -4220,7 +4262,7 @@
+@@ -4220,7 +4191,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -645,37 +134,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -4300,6 +4342,29 @@
- # 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'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -4322,7 +4387,7 @@
+@@ -4322,7 +4293,7 @@
;;
esac
;;
@@ -684,202 +143,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=
-@@ -4338,16 +4403,20 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -4509,15 +4578,10 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4564,6 +4628,12 @@
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -4807,7 +4877,7 @@
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
--interix3*)
-+interix[[3-9]]*)
- # 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)=
-@@ -4815,13 +4885,46 @@
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -4870,10 +4973,17 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4952,10 +5062,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -5008,7 +5118,7 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -5097,6 +5207,7 @@
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
-@@ -5143,7 +5254,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -5468,7 +5579,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5551,6 +5662,7 @@
- # ---------------------------------
- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
- [AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([LT_AC_PROG_SED])
- AC_REQUIRE([AC_PROG_NM])
- AC_REQUIRE([AC_OBJEXT])
- # Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5587,7 +5699,7 @@
+@@ -5587,7 +5558,7 @@
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'"
;;
@@ -888,33 +152,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'"
-@@ -5777,12 +5889,14 @@
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -5794,7 +5908,7 @@
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5860,7 +5974,7 @@
+@@ -5860,7 +5831,7 @@
;;
esac
;;
@@ -923,7 +161,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5903,7 +6017,7 @@
+@@ -5903,7 +5874,7 @@
;;
esac
;;
@@ -932,22 +170,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -5930,6 +6044,14 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -5946,7 +6068,7 @@
+@@ -5946,7 +5917,7 @@
;;
esac
;;
@@ -956,43 +179,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6050,13 +6172,15 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
-@@ -6066,7 +6190,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -6124,7 +6248,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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'
-@@ -6157,7 +6281,7 @@
+@@ -6157,7 +6128,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -1001,111 +188,28 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -6176,6 +6300,22 @@
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -6185,6 +6325,10 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-+ rdos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6279,7 +6423,8 @@
- # ------------------------------------
- # See if the linker supports building shared libraries.
- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- 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
-@@ -6296,7 +6441,10 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+@@ -6298,6 +6269,9 @@
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
- cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
++ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -6435,7 +6583,7 @@
- _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
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- 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'
-@@ -6453,7 +6601,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- _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'
-@@ -6468,7 +6616,7 @@
+ ;;
+@@ -6468,7 +6442,7 @@
_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'
;;
- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6486,20 +6634,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -6494,12 +6468,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
@@ -1118,47 +222,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=
-@@ -6532,7 +6690,7 @@
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-@@ -6651,7 +6809,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6744,7 +6902,7 @@
- # 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.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-@@ -6786,10 +6944,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _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}'
- ;;
- *)
-@@ -6829,7 +6987,7 @@
+@@ -6829,7 +6804,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1167,7 +231,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
-@@ -6931,7 +7089,7 @@
+@@ -6931,7 +6906,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1176,152 +240,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
-@@ -6951,24 +7109,28 @@
- ;;
-
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-@@ -7027,17 +7189,16 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- *)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-@@ -7094,7 +7255,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _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
-@@ -7169,7 +7330,7 @@
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
-@@ -7272,6 +7433,30 @@
- [AC_CHECK_TOOL(RC, windres, no)
- ])
-
-+
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-+
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-+
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-+
- # 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 #
-@@ -7292,12 +7477,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7330,6 +7516,7 @@
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
-
-@@ -7650,7 +7837,8 @@
+@@ -7650,7 +7625,8 @@
_PKG_TEXT
])],
@@ -1331,7 +250,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
-@@ -7659,7 +7847,7 @@
+@@ -7659,7 +7635,7 @@
_PKG_TEXT
@@ -1340,7 +259,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7879,7 +8067,7 @@
+@@ -7879,7 +7855,7 @@
AC_CHECK_FUNCS(dcgettext)
MSGFMT_OPTS=
AC_MSG_CHECKING([if msgfmt accepts -c])
@@ -1349,66 +268,57 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-@@ -8323,22 +8511,22 @@
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
- dnl for overriding the documentation installation directory
-- AC_ARG_WITH(html-dir,
-- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+ AC_ARG_WITH([html-dir],
-+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
- [with_html_dir='${datadir}/gtk-doc/html'])
- HTML_DIR="$with_html_dir"
-- AC_SUBST(HTML_DIR)
-+ AC_SUBST([HTML_DIR])
-
- dnl enable/disable documentation building
-- AC_ARG_ENABLE(gtk-doc,
-- AC_HELP_STRING([--enable-gtk-doc],
-- [use gtk-doc to build documentation [default=no]]),,
-- enable_gtk_doc=no)
-+ AC_ARG_ENABLE([gtk-doc],
-+ AS_HELP_STRING([--enable-gtk-doc],
-+ [use gtk-doc to build documentation [[default=no]]]),,
-+ [enable_gtk_doc=no])
-
- have_gtk_doc=no
+@@ -8335,18 +8311,32 @@
+ [use gtk-doc to build documentation [[default=no]]]),,
+ [enable_gtk_doc=no])
+
++ have_gtk_doc=no
if test x$enable_gtk_doc = xyes; then
- if test -z "$PKG_CONFIG"; then
-- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+- ifelse([$1],[],
+- [PKG_CHECK_EXISTS([gtk-doc],,
+- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
+- fi
+-
+- AC_MSG_CHECKING([whether to build gtk-doc documentation])
+- AC_MSG_RESULT($enable_gtk_doc)
++ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
- fi
- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
- have_gtk_doc=yes
-@@ -8350,9 +8538,9 @@
- if test "$have_gtk_doc" = yes; then
- AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-- AC_MSG_RESULT(yes)
++ fi
++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++ have_gtk_doc=yes
++ fi
+
+- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
++ dnl do we want to do a version check?
++ifelse([$1],[],,
++ [gtk_doc_min_version=$1
++ if test "$have_gtk_doc" = yes; then
++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+ AC_MSG_RESULT([yes])
- else
-- AC_MSG_RESULT(no)
++ else
+ AC_MSG_RESULT([no])
- have_gtk_doc=no
- fi
- fi
-@@ -8362,7 +8550,7 @@
- fi
- fi
-
-- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
- ])
-
---- gtk+2.0-2.11.6.orig/configure 2007-07-20 22:21:42.000000000 +0200
-+++ gtk+2.0-2.11.6/configure 2007-07-24 10:36:26.000000000 +0200
++ have_gtk_doc=no
++ fi
++ fi
++])
++ if test "$have_gtk_doc" != yes; then
++ enable_gtk_doc=no
++ fi
++ fi
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/configure gtk+-2.12.0/configure
+--- gtk+-2.12.0.orig/configure 2007-09-14 00:17:55.000000000 +0330
++++ gtk+-2.12.0/configure 2007-09-16 18:43:03.000000000 +0330
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gtk+ 2.11.6.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.11.6.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.12.0.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.12.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -1592,15 +502,15 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -858,6 +875,7 @@
- HAVE_CXX_FALSE
- HAVE_OBJC_TRUE
- HAVE_OBJC_FALSE
-+SED
- GREP
- EGREP
- LN_S
-@@ -1051,6 +1069,7 @@
+@@ -1031,7 +1048,6 @@
+ TEST_PRINT_BACKEND_TRUE
+ TEST_PRINT_BACKEND_FALSE
+ HTML_DIR
+-GTKDOC_CHECK
+ ENABLE_GTK_DOC_TRUE
+ ENABLE_GTK_DOC_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
+@@ -1053,6 +1069,7 @@
CC
CFLAGS
LDFLAGS
@@ -1608,7 +518,7 @@
CPPFLAGS
CXX
CXXFLAGS
-@@ -1168,10 +1187,10 @@
+@@ -1170,10 +1187,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -1621,7 +531,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1187,10 +1206,10 @@
+@@ -1189,10 +1206,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1634,7 +544,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1384,19 +1403,19 @@
+@@ -1386,19 +1403,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1658,16 +568,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1671,7 +1690,7 @@
- --disable-modules disable dynamic module loading
- --enable-test-print-backend
- build test print backend
-- --enable-gtk-doc use gtk-doc to build documentation default=no
-+ --enable-gtk-doc use gtk-doc to build documentation [default=no]
- --enable-man regenerate man pages from Docbook [default=no]
-
- Optional Packages:
-@@ -1698,6 +1717,7 @@
+@@ -1700,6 +1717,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -1675,25 +576,25 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
-@@ -1778,7 +1798,7 @@
+@@ -1780,7 +1798,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.11.6
+ gtk+ configure 2.12.0
-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.
-@@ -1792,7 +1812,7 @@
+@@ -1794,7 +1812,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.11.6, which was
+ It was created by gtk+ $as_me 2.12.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2218,7 +2238,7 @@
+@@ -2220,7 +2238,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1702,7 +603,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.
-@@ -2352,7 +2372,7 @@
+@@ -2354,7 +2372,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1711,7 +612,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2481,7 +2501,7 @@
+@@ -2483,7 +2501,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1720,7 +621,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2521,7 +2541,7 @@
+@@ -2523,7 +2541,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1729,7 +630,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2762,7 +2782,7 @@
+@@ -2764,7 +2782,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1738,7 +639,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2802,7 +2822,7 @@
+@@ -2804,7 +2822,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1747,7 +648,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2859,7 +2879,7 @@
+@@ -2861,7 +2879,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1756,7 +657,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2900,7 +2920,7 @@
+@@ -2902,7 +2920,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1765,7 +666,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2958,7 +2978,7 @@
+@@ -2960,7 +2978,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1774,7 +675,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
-@@ -3002,7 +3022,7 @@
+@@ -3004,7 +3022,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1783,7 +684,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3143,7 +3163,7 @@
+@@ -3145,7 +3163,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -1792,7 +693,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3171,6 +3191,12 @@
+@@ -3173,6 +3191,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -1805,7 +706,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3182,8 +3208,6 @@
+@@ -3184,8 +3208,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -1814,7 +715,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3361,27 +3385,10 @@
+@@ -3363,27 +3385,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1846,7 +747,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3436,27 +3443,10 @@
+@@ -3438,27 +3443,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1878,7 +779,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3491,27 +3481,10 @@
+@@ -3493,27 +3481,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1910,7 +811,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3547,27 +3520,10 @@
+@@ -3549,27 +3520,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1942,7 +843,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3683,27 +3639,10 @@
+@@ -3685,27 +3639,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1974,7 +875,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3933,6 +3872,16 @@
+@@ -3935,6 +3872,16 @@
@@ -1991,7 +892,7 @@
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3951,7 +3900,7 @@
+@@ -3953,7 +3900,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2000,7 +901,7 @@
ac_cv_prog_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4012,7 +3961,7 @@
+@@ -4014,7 +3961,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2009,7 +910,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
-@@ -4056,7 +4005,7 @@
+@@ -4058,7 +4005,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2018,7 +919,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4169,27 +4118,10 @@
+@@ -4171,27 +4118,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2050,7 +951,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4244,27 +4176,10 @@
+@@ -4246,27 +4176,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2082,7 +983,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4299,27 +4214,10 @@
+@@ -4301,27 +4214,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2114,7 +1015,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4355,27 +4253,10 @@
+@@ -4357,27 +4253,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2146,7 +1047,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4547,27 +4428,10 @@
+@@ -4549,27 +4428,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2178,7 +1079,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4618,27 +4482,10 @@
+@@ -4620,27 +4482,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2210,30 +1111,7 @@
OBJC=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4743,12 +4590,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4783,6 +4631,7 @@
- fi
-
- SED=$lt_cv_path_SED
-+
- { echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6; }
-
-@@ -4807,7 +4656,7 @@
+@@ -4809,7 +4654,7 @@
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"
@@ -2242,7 +1120,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
-@@ -4889,7 +4738,7 @@
+@@ -4891,7 +4736,7 @@
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"
@@ -2251,36 +1129,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
-@@ -5144,8 +4993,8 @@
- echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5186,16 +5035,22 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
+@@ -5197,7 +5042,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -2289,16 +1138,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -5233,7 +5088,7 @@
- esac
- ;;
-
--interix3*)
-+interix[3-9]*)
- # 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)$'
- ;;
-@@ -5249,11 +5104,11 @@
+@@ -5251,11 +5096,11 @@
;;
# This must be Linux ELF.
@@ -2312,57 +1152,16 @@
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
-@@ -5283,6 +5138,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -5370,7 +5229,7 @@
+@@ -5372,7 +5217,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 5373 "configure"' > conftest.$ac_ext
-+ echo '#line 5232 "configure"' > conftest.$ac_ext
+- echo '#line 5375 "configure"' > conftest.$ac_ext
++ echo '#line 5220 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5405,7 +5264,8 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5416,6 +5276,9 @@
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -5432,6 +5295,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -5494,27 +5360,11 @@
+@@ -5496,27 +5341,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2395,7 +1194,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5523,7 +5373,7 @@
+@@ -5525,7 +5354,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -2404,7 +1203,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5577,7 +5427,7 @@
+@@ -5579,7 +5408,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2413,7 +1212,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5617,7 +5467,7 @@
+@@ -5619,7 +5448,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2422,7 +1221,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5673,7 +5523,7 @@
+@@ -5675,7 +5504,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2431,7 +1230,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5713,7 +5563,7 @@
+@@ -5715,7 +5544,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2440,7 +1239,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5769,7 +5619,7 @@
+@@ -5771,7 +5600,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2449,7 +1248,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5809,7 +5659,7 @@
+@@ -5811,7 +5640,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2458,7 +1257,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5907,17 +5757,10 @@
+@@ -5909,17 +5738,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2480,7 +1279,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5951,17 +5794,10 @@
+@@ -5953,17 +5775,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2502,7 +1301,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6026,17 +5862,10 @@
+@@ -6028,17 +5843,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2524,7 +1323,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6070,17 +5899,10 @@
+@@ -6072,17 +5880,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2546,7 +1345,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6151,27 +5973,10 @@
+@@ -6153,27 +5954,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2578,7 +1377,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6347,27 +6152,10 @@
+@@ -6349,27 +6133,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2610,7 +1409,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6430,27 +6218,10 @@
+@@ -6432,27 +6199,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2642,7 +1441,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6486,17 +6257,10 @@
+@@ -6488,17 +6238,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2664,7 +1463,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6613,17 +6377,10 @@
+@@ -6615,17 +6358,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2686,7 +1485,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6657,17 +6414,10 @@
+@@ -6659,17 +6395,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2708,7 +1507,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6732,17 +6482,10 @@
+@@ -6734,17 +6463,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2730,7 +1529,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6776,17 +6519,10 @@
+@@ -6778,17 +6500,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2752,7 +1551,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6826,7 +6562,7 @@
+@@ -6828,7 +6543,7 @@
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
@@ -2761,7 +1560,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
-@@ -6844,7 +6580,7 @@
+@@ -6846,7 +6561,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2770,7 +1569,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
-@@ -6870,7 +6606,7 @@
+@@ -6872,7 +6587,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -2779,7 +1578,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
-@@ -6888,7 +6624,7 @@
+@@ -6890,7 +6605,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2788,7 +1587,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6995,27 +6731,10 @@
+@@ -6997,27 +6712,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2820,7 +1619,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7058,27 +6777,10 @@
+@@ -7060,27 +6758,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2852,60 +1651,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7205,24 +6907,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
-
-@@ -7239,6 +6944,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; }
-@@ -7276,7 +6982,7 @@
+@@ -7278,7 +6959,7 @@
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'"
;;
@@ -2914,7 +1660,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'"
-@@ -7533,7 +7239,7 @@
+@@ -7535,7 +7216,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2923,7 +1669,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7573,7 +7279,7 @@
+@@ -7575,7 +7256,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2932,7 +1678,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7629,7 +7335,7 @@
+@@ -7631,7 +7312,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2941,7 +1687,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7669,7 +7375,7 @@
+@@ -7671,7 +7352,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2950,7 +1696,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7725,7 +7431,7 @@
+@@ -7727,7 +7408,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2959,7 +1705,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7765,7 +7471,7 @@
+@@ -7767,7 +7448,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2968,104 +1714,21 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7827,7 +7533,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -8027,10 +7733,10 @@
- objext=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
-
- # If no C compiler was specified, use CC.
-@@ -8045,13 +7751,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -8071,7 +7777,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -8082,11 +7788,11 @@
+@@ -8084,11 +7765,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7791: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8087: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8089: \$? = $ac_status" >&5
-+ echo "$as_me:7795: \$? = $ac_status" >&5
+- echo "$as_me:8091: \$? = $ac_status" >&5
++ echo "$as_me:7772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8137,13 +7843,15 @@
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
-@@ -8153,7 +7861,7 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -8211,7 +7919,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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'
-@@ -8244,7 +7952,7 @@
+@@ -8246,7 +7927,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -3074,144 +1737,46 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8263,6 +7971,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -8272,6 +7996,10 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -8339,7 +8067,7 @@
- else
- lt_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -8350,11 +8078,11 @@
+@@ -8352,11 +8033,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8353: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8081: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8355: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8357: \$? = $ac_status" >&5
-+ echo "$as_me:8085: \$? = $ac_status" >&5
+- echo "$as_me:8359: \$? = $ac_status" >&5
++ echo "$as_me:8040: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8403,7 +8131,7 @@
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- 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
-@@ -8443,7 +8171,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -8454,11 +8182,11 @@
+@@ -8456,11 +8137,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8457: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8185: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8459: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8461: \$? = $ac_status" >&5
-+ echo "$as_me:8189: \$? = $ac_status" >&5
+- echo "$as_me:8463: \$? = $ac_status" >&5
++ echo "$as_me:8144: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8650,7 +8378,7 @@
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- 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'
-@@ -8668,7 +8396,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8683,7 +8411,7 @@
+@@ -8685,7 +8366,7 @@
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'
;;
- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8701,20 +8429,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -8711,12 +8392,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
@@ -3224,16 +1789,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8866,7 +8604,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct=yes
-+ :
- else
- # We have old collect2
- hardcode_direct=unsupported
-@@ -8934,33 +8672,24 @@
+@@ -8936,27 +8618,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3258,33 +1814,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8968,7 +8697,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -8970,7 +8636,7 @@
fi
@@ -3293,7 +1831,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9009,33 +8738,24 @@
+@@ -9011,27 +8677,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3318,33 +1856,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9043,7 +8763,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -9045,7 +8695,7 @@
fi
@@ -3353,29 +1873,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9089,7 +8809,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-@@ -9131,10 +8851,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- 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}'
- ;;
- *)
-@@ -9174,7 +8894,7 @@
+@@ -9176,7 +8826,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3384,7 +1882,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9276,7 +8996,7 @@
+@@ -9278,7 +8928,7 @@
link_all_deplibs=yes
;;
@@ -3393,173 +1891,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9296,24 +9016,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs=no
- fi
- ;;
-
-@@ -9372,17 +9096,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs=yes
- ;;
-@@ -9439,7 +9162,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-@@ -9516,7 +9239,7 @@
- { 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*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -9574,17 +9297,55 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[lt_foo]++; }
-+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -9744,12 +9505,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -9766,18 +9523,6 @@
+@@ -9768,18 +9418,6 @@
dynamic_linker=no
;;
@@ -3578,25 +1910,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9815,7 +9560,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -9878,7 +9623,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9933,7 +9678,7 @@
+@@ -9935,7 +9573,7 @@
;;
# This must be Linux ELF.
@@ -3605,7 +1919,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9947,31 +9692,10 @@
+@@ -9949,31 +9587,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -3613,7 +1927,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 9954 "configure"' > conftest.$ac_ext
+- echo '#line 9956 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -3632,14 +1946,13 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9983,7 +9707,7 @@
+@@ -9985,7 +9602,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3648,7 +1961,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9992,7 +9716,7 @@
+@@ -9994,7 +9611,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3657,26 +1970,7 @@
;;
netbsd*)
-@@ -10076,6 +9800,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -10229,6 +9957,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -10312,27 +10041,11 @@
+@@ -10314,27 +9931,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3709,7 +2003,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10341,7 +10054,7 @@
+@@ -10343,7 +9944,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -3718,7 +2012,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10423,27 +10136,11 @@
+@@ -10425,27 +10026,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3751,7 +2045,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10452,7 +10149,7 @@
+@@ -10454,7 +10039,7 @@
ac_cv_func_shl_load=no
fi
@@ -3760,7 +2054,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10502,27 +10199,11 @@
+@@ -10504,27 +10089,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3793,7 +2087,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10531,7 +10212,7 @@
+@@ -10533,7 +10102,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -3802,7 +2096,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10603,27 +10284,11 @@
+@@ -10605,27 +10174,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3835,7 +2129,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10632,7 +10297,7 @@
+@@ -10634,7 +10187,7 @@
ac_cv_func_dlopen=no
fi
@@ -3844,7 +2138,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10682,27 +10347,11 @@
+@@ -10684,27 +10237,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3877,7 +2171,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10711,7 +10360,7 @@
+@@ -10713,7 +10250,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -3886,7 +2180,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10762,27 +10411,11 @@
+@@ -10764,27 +10301,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3919,7 +2213,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10791,7 +10424,7 @@
+@@ -10793,7 +10314,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -3928,7 +2222,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10842,27 +10475,11 @@
+@@ -10844,27 +10365,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3961,7 +2255,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10871,7 +10488,7 @@
+@@ -10873,7 +10378,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -3970,89 +2264,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10927,7 +10544,7 @@
+@@ -10929,7 +10434,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10930 "configure"
-+#line 10547 "configure"
+-#line 10932 "configure"
++#line 10437 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11027,7 +10644,7 @@
+@@ -11029,7 +10534,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11030 "configure"
-+#line 10647 "configure"
+-#line 11032 "configure"
++#line 10537 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11225,6 +10842,7 @@
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
-+ fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
-@@ -11269,7 +10887,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -11593,7 +11211,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols
-@@ -11762,10 +11380,10 @@
- objext_CXX=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -11781,13 +11399,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -12046,7 +11664,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_CXX=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
-@@ -12114,33 +11732,24 @@
+@@ -12116,27 +11621,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4077,33 +2307,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12148,7 +11757,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -12150,7 +11639,7 @@
fi
@@ -4112,7 +2324,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12190,33 +11799,24 @@
+@@ -12192,27 +11681,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4137,33 +2349,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12224,7 +11824,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -12226,7 +11699,7 @@
fi
@@ -4172,20 +2366,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12335,10 +11935,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- 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}'
- ;;
- *)
-@@ -12372,7 +11972,7 @@
+@@ -12374,7 +11847,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -4194,27 +2375,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12421,9 +12021,7 @@
- hardcode_libdir_separator_CXX=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- export_dynamic_flag_spec_CXX='${wl}-E'
- ;;
-@@ -12491,7 +12089,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12531,7 +12129,7 @@
+@@ -12533,7 +12006,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -4223,37 +2384,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12611,6 +12209,29 @@
- # 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'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ no_undefined_flag_CXX=' -zdefs'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -12633,7 +12254,7 @@
+@@ -12635,7 +12108,7 @@
;;
esac
;;
@@ -4262,152 +2393,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=
-@@ -12649,16 +12270,20 @@
- ld_shlibs_CXX=no
- ;;
- openbsd*)
-- hardcode_direct_CXX=yes
-- hardcode_shlibpath_var_CXX=no
-- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- export_dynamic_flag_spec_CXX='${wl}-E'
-- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ ld_shlibs_CXX=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -12820,15 +12445,10 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
- ;;
- esac
- link_all_deplibs_CXX=yes
-@@ -12875,6 +12495,12 @@
- fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -13066,7 +12692,7 @@
-
- # PORTME: override above test on systems where it is broken
- case $host_os in
--interix3*)
-+interix[3-9]*)
- # 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=
-@@ -13074,13 +12700,46 @@
- postdeps_CXX=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- postdeps_CXX='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -13117,12 +12776,14 @@
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -13134,7 +12795,7 @@
- # DJGPP does not support shared libraries at all
- lt_prog_compiler_pic_CXX=
- ;;
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -13200,7 +12861,7 @@
+@@ -13202,7 +12675,7 @@
;;
esac
;;
@@ -4416,7 +2402,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13243,7 +12904,7 @@
+@@ -13245,7 +12718,7 @@
;;
esac
;;
@@ -4425,22 +2411,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13270,6 +12931,14 @@
- lt_prog_compiler_static_CXX='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ lt_prog_compiler_wl_CXX='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -13286,7 +12955,7 @@
+@@ -13288,7 +12761,7 @@
;;
esac
;;
@@ -4449,119 +2420,45 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13384,7 +13053,7 @@
- else
- lt_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -13395,11 +13064,11 @@
+@@ -13397,11 +12870,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13398: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13067: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13400: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13402: \$? = $ac_status" >&5
-+ echo "$as_me:13071: \$? = $ac_status" >&5
+- echo "$as_me:13404: \$? = $ac_status" >&5
++ echo "$as_me:12877: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13448,7 +13117,7 @@
- lt_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- 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
-@@ -13488,7 +13157,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -13499,11 +13168,11 @@
+@@ -13501,11 +12974,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13502: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13171: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13504: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12977: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13506: \$? = $ac_status" >&5
-+ echo "$as_me:13175: \$? = $ac_status" >&5
+- echo "$as_me:13508: \$? = $ac_status" >&5
++ echo "$as_me:12981: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13569,7 +13238,10 @@
- export_symbols_cmds_CXX="$ltdll_cmds"
+@@ -13573,6 +13046,9 @@
+ cygwin* | mingw*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
- cygwin* | mingw*)
-- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+ ;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
- ;;
++ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13600,7 +13272,7 @@
- { 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*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -13658,20 +13330,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -13828,12 +13487,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-
-@@ -13850,18 +13504,6 @@
+@@ -13852,18 +13328,6 @@
dynamic_linker=no
;;
@@ -4580,25 +2477,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13899,7 +13541,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -13962,7 +13604,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14017,7 +13659,7 @@
+@@ -14019,7 +13483,7 @@
;;
# This must be Linux ELF.
@@ -4607,7 +2486,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14031,31 +13673,10 @@
+@@ -14033,31 +13497,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -4615,7 +2494,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 14038 "configure"' > conftest.$ac_ext
+- echo '#line 14040 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -4634,14 +2513,13 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14067,7 +13688,7 @@
+@@ -14069,7 +13512,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4650,7 +2528,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14076,7 +13697,7 @@
+@@ -14078,7 +13521,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -4659,107 +2537,7 @@
;;
netbsd*)
-@@ -14160,6 +13781,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -14354,6 +13979,7 @@
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
-+ fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
-@@ -14674,7 +14300,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
-@@ -14765,10 +14391,17 @@
- objext_F77=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -14784,13 +14417,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -14877,13 +14510,15 @@
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
-@@ -14893,7 +14528,7 @@
- lt_prog_compiler_pic_F77='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -14951,7 +14586,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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'
-@@ -14984,7 +14619,7 @@
+@@ -14986,7 +14429,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -4768,144 +2546,46 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15003,6 +14638,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -15012,6 +14663,10 @@
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
-@@ -15079,7 +14734,7 @@
- else
- lt_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -15090,11 +14745,11 @@
+@@ -15092,11 +14535,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15093: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14748: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15095: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15097: \$? = $ac_status" >&5
-+ echo "$as_me:14752: \$? = $ac_status" >&5
+- echo "$as_me:15099: \$? = $ac_status" >&5
++ echo "$as_me:14542: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15143,7 +14798,7 @@
- lt_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- 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
-@@ -15183,7 +14838,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -15194,11 +14849,11 @@
+@@ -15196,11 +14639,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15197: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14852: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15199: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14642: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15201: \$? = $ac_status" >&5
-+ echo "$as_me:14856: \$? = $ac_status" >&5
+- echo "$as_me:15203: \$? = $ac_status" >&5
++ echo "$as_me:14646: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15390,7 +15045,7 @@
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=no
- enable_shared_with_static_runtimes_F77=yes
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- 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'
-@@ -15408,7 +15063,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -15423,7 +15078,7 @@
+@@ -15425,7 +14868,7 @@
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'
;;
- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15441,20 +15096,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -15451,12 +14894,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
@@ -4918,16 +2598,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15606,7 +15271,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_F77=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_F77=unsupported
-@@ -15664,33 +15329,24 @@
+@@ -15666,27 +15110,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4952,33 +2623,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15698,7 +15354,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -15700,7 +15128,7 @@
fi
@@ -4987,7 +2640,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15729,33 +15385,24 @@
+@@ -15731,27 +15159,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5012,33 +2665,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15763,7 +15410,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -15765,7 +15177,7 @@
fi
@@ -5047,29 +2682,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15809,7 +15456,7 @@
- # 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.
-- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
- ;;
-@@ -15851,10 +15498,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- 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}'
- ;;
- *)
-@@ -15894,7 +15541,7 @@
+@@ -15896,7 +15308,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5078,7 +2691,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15996,7 +15643,7 @@
+@@ -15998,7 +15410,7 @@
link_all_deplibs_F77=yes
;;
@@ -5087,134 +2700,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
-@@ -16016,24 +15663,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_F77='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_F77=no
- fi
- ;;
-
-@@ -16092,17 +15743,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_F77=yes
- ;;
-@@ -16159,7 +15809,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_F77='${wl}-z,text'
- archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-@@ -16236,7 +15886,7 @@
- { 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*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -16294,20 +15944,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -16464,12 +16101,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -16486,18 +16118,6 @@
+@@ -16488,18 +15900,6 @@
dynamic_linker=no
;;
@@ -5233,25 +2719,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16535,7 +16155,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -16598,7 +16218,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -16653,7 +16273,7 @@
+@@ -16655,7 +16055,7 @@
;;
# This must be Linux ELF.
@@ -5260,7 +2728,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16667,31 +16287,10 @@
+@@ -16669,31 +16069,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -5268,7 +2736,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 16674 "configure"' > conftest.$ac_ext
+- echo '#line 16676 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -5287,14 +2755,13 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16703,7 +16302,7 @@
+@@ -16705,7 +16084,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5303,7 +2770,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16712,7 +16311,7 @@
+@@ -16714,7 +16093,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -5312,123 +2779,21 @@
;;
netbsd*)
-@@ -16796,6 +16395,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -16990,6 +16593,7 @@
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
-+ fix_srcfile_path_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
-
-@@ -17310,7 +16914,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_F77
-@@ -17368,10 +16972,10 @@
- objext_GCJ=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -17387,13 +16991,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -17434,7 +17038,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -17445,11 +17049,11 @@
+@@ -17447,11 +16826,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17448: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17052: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17450: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16829: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17452: \$? = $ac_status" >&5
-+ echo "$as_me:17056: \$? = $ac_status" >&5
+- echo "$as_me:17454: \$? = $ac_status" >&5
++ echo "$as_me:16833: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17500,13 +17104,15 @@
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
- ;;
-
-@@ -17516,7 +17122,7 @@
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -17574,7 +17180,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # 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'
-@@ -17607,7 +17213,7 @@
+@@ -17609,7 +16988,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -5437,144 +2802,46 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17626,6 +17232,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -17635,6 +17257,10 @@
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17702,7 +17328,7 @@
- else
- lt_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 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.
-@@ -17713,11 +17339,11 @@
+@@ -17715,11 +17094,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17716: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17342: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17718: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17097: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17720: \$? = $ac_status" >&5
-+ echo "$as_me:17346: \$? = $ac_status" >&5
+- echo "$as_me:17722: \$? = $ac_status" >&5
++ echo "$as_me:17101: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17766,7 +17392,7 @@
- lt_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- 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
-@@ -17806,7 +17432,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -17817,11 +17443,11 @@
+@@ -17819,11 +17198,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17820: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17446: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17822: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17824: \$? = $ac_status" >&5
-+ echo "$as_me:17450: \$? = $ac_status" >&5
+- echo "$as_me:17826: \$? = $ac_status" >&5
++ echo "$as_me:17205: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18013,7 +17639,7 @@
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- 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'
-@@ -18031,7 +17657,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18046,7 +17672,7 @@
+@@ -18048,7 +17427,7 @@
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'
;;
- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18064,20 +17690,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -18074,12 +17453,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
@@ -5587,16 +2854,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18229,7 +17865,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_GCJ=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
-@@ -18297,33 +17933,24 @@
+@@ -18299,27 +17679,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5621,33 +2879,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18331,7 +17958,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -18333,7 +17697,7 @@
fi
@@ -5656,7 +2896,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18372,33 +17999,24 @@
+@@ -18374,27 +17738,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5681,33 +2921,15 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18406,7 +18024,7 @@
+
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+ }'`
+@@ -18408,7 +17756,7 @@
fi
@@ -5716,29 +2938,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18452,7 +18070,7 @@
- # 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.
-- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
- ;;
-@@ -18494,10 +18112,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- 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}'
- ;;
- *)
-@@ -18537,7 +18155,7 @@
+@@ -18539,7 +17887,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5747,7 +2947,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18639,7 +18257,7 @@
+@@ -18641,7 +17989,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5756,134 +2956,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
-@@ -18659,24 +18277,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_GCJ='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- ;;
-- *)
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_GCJ=no
- fi
- ;;
-
-@@ -18735,17 +18357,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_GCJ=yes
- ;;
-@@ -18802,7 +18423,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_GCJ='${wl}-z,text'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-@@ -18879,7 +18500,7 @@
- { 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*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -18937,20 +18558,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -19107,12 +18715,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -19129,18 +18732,6 @@
+@@ -19131,18 +18479,6 @@
dynamic_linker=no
;;
@@ -5902,25 +2975,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19178,7 +18769,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -19241,7 +18832,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -19296,7 +18887,7 @@
+@@ -19298,7 +18634,7 @@
;;
# This must be Linux ELF.
@@ -5929,7 +2984,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19310,31 +18901,10 @@
+@@ -19312,31 +18648,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -5937,7 +2992,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19317 "configure"' > conftest.$ac_ext
+- echo '#line 19319 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -5956,14 +3011,13 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19346,7 +18916,7 @@
+@@ -19348,7 +18663,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5972,7 +3026,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19355,7 +18925,7 @@
+@@ -19357,7 +18672,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -5981,77 +3035,7 @@
;;
netbsd*)
-@@ -19439,6 +19009,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -19633,6 +19207,7 @@
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
-+ fix_srcfile_path_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
-
-@@ -19953,7 +19528,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_GCJ
-@@ -20010,7 +19585,7 @@
- objext_RC=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20029,13 +19604,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -20113,6 +19688,7 @@
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
-+ fix_srcfile_path_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
-@@ -20433,7 +20009,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_RC
-@@ -20588,27 +20164,10 @@
+@@ -20590,27 +19905,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6083,7 +3067,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20632,27 +20191,10 @@
+@@ -20634,27 +19932,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6115,7 +3099,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20680,7 +20222,6 @@
+@@ -20682,7 +19963,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -6123,7 +3107,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20717,28 +20258,11 @@
+@@ -20719,28 +19999,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6157,7 +3141,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20784,27 +20308,10 @@
+@@ -20786,27 +20049,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6189,7 +3173,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20814,26 +20321,28 @@
+@@ -20816,26 +20062,28 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6224,7 +3208,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20870,28 +20379,11 @@
+@@ -20872,28 +20120,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6258,7 +3242,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20937,27 +20429,10 @@
+@@ -20939,27 +20170,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6290,7 +3274,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20967,19 +20442,22 @@
+@@ -20969,19 +20183,22 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6317,7 +3301,7 @@
fi
-@@ -21008,7 +20486,7 @@
+@@ -21010,7 +20227,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6326,7 +3310,7 @@
ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21129,7 +20607,7 @@
+@@ -21131,7 +20348,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6335,7 +3319,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21169,7 +20647,7 @@
+@@ -21171,7 +20388,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6344,7 +3328,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21229,7 +20707,7 @@
+@@ -21231,7 +20448,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6353,7 +3337,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21461,27 +20939,11 @@
+@@ -21463,27 +20680,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6386,7 +3370,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21490,7 +20952,7 @@
+@@ -21492,7 +20693,7 @@
fi
@@ -6395,7 +3379,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21590,27 +21052,10 @@
+@@ -21592,27 +20793,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6427,7 +3411,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21673,7 +21118,7 @@
+@@ -21675,7 +20859,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6436,7 +3420,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.
-@@ -21837,7 +21282,7 @@
+@@ -21839,7 +21023,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6445,7 +3429,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
-@@ -21880,7 +21325,7 @@
+@@ -21882,7 +21066,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6454,7 +3438,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
-@@ -22026,7 +21471,7 @@
+@@ -22028,7 +21212,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6463,7 +3447,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
-@@ -22036,7 +21481,7 @@
+@@ -22038,7 +21222,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6472,7 +3456,17 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22122,7 +21567,7 @@
+@@ -22052,7 +21236,8 @@
+ if test "$os_win32" != yes; then
+ # libtool option to control which symbols are exported
+ # right now, symbols starting with _ are not exported
+- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
++ # Disabled until -export-symbols-regex works (RH patch)
++ LIBTOOL_EXPORT_OPTIONS=
+ else
+ # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+ LIBTOOL_EXPORT_OPTIONS=
+@@ -22124,7 +21309,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6481,7 +3475,7 @@
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22165,7 +21610,7 @@
+@@ -22167,7 +21352,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6490,7 +3484,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22265,27 +21710,11 @@
+@@ -22267,27 +21452,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6523,7 +3517,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22294,7 +21723,7 @@
+@@ -22296,7 +21465,7 @@
eval "$as_ac_var=no"
fi
@@ -6532,7 +3526,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22375,27 +21804,11 @@
+@@ -22377,27 +21546,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6565,7 +3559,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22404,7 +21817,7 @@
+@@ -22406,7 +21559,7 @@
eval "$as_ac_var=no"
fi
@@ -6574,7 +3568,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22453,27 +21866,11 @@
+@@ -22455,27 +21608,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6607,7 +3601,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22482,7 +21879,7 @@
+@@ -22484,7 +21621,7 @@
gtk_ok=no
fi
@@ -6616,7 +3610,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22528,27 +21925,11 @@
+@@ -22530,27 +21667,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6649,7 +3643,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22557,7 +21938,7 @@
+@@ -22559,7 +21680,7 @@
gtk_ok=no
fi
@@ -6658,7 +3652,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22603,27 +21984,11 @@
+@@ -22605,27 +21726,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6691,7 +3685,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22632,7 +21997,7 @@
+@@ -22634,7 +21739,7 @@
gtk_ok=no
fi
@@ -6700,7 +3694,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22678,27 +22043,11 @@
+@@ -22680,27 +21785,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6733,7 +3727,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22707,7 +22056,7 @@
+@@ -22709,7 +21798,7 @@
gtk_ok=no
fi
@@ -6742,7 +3736,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22753,27 +22102,11 @@
+@@ -22755,27 +21844,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6775,7 +3769,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22782,7 +22115,7 @@
+@@ -22784,7 +21857,7 @@
gtk_ok=no
fi
@@ -6784,7 +3778,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22840,27 +22173,10 @@
+@@ -22842,27 +21915,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6816,7 +3810,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22896,17 +22212,10 @@
+@@ -22898,17 +21954,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6838,7 +3832,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23004,27 +22313,11 @@
+@@ -23006,27 +22055,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6871,7 +3865,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23033,7 +22326,7 @@
+@@ -23035,7 +22068,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -6880,7 +3874,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -23089,27 +22382,10 @@
+@@ -23091,27 +22124,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6912,7 +3906,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23145,17 +22421,10 @@
+@@ -23147,17 +22163,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6934,7 +3928,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23251,27 +22520,11 @@
+@@ -23253,27 +22262,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6967,7 +3961,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23280,7 +22533,7 @@
+@@ -23282,7 +22275,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -6976,7 +3970,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23323,27 +22576,11 @@
+@@ -23325,27 +22318,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7009,7 +4003,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23352,7 +22589,7 @@
+@@ -23354,7 +22331,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -7018,7 +4012,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23428,27 +22665,11 @@
+@@ -23430,27 +22407,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7051,7 +4045,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23457,7 +22678,7 @@
+@@ -23459,7 +22420,7 @@
eval "$as_ac_var=no"
fi
@@ -7060,7 +4054,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23522,27 +22743,11 @@
+@@ -23524,27 +22485,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7093,7 +4087,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23551,7 +22756,7 @@
+@@ -23553,7 +22498,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -7102,7 +4096,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23600,27 +22805,11 @@
+@@ -23602,27 +22547,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7135,7 +4129,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23629,7 +22818,7 @@
+@@ -23631,7 +22560,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -7144,7 +4138,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23678,27 +22867,11 @@
+@@ -23680,27 +22609,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7177,7 +4171,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23707,7 +22880,7 @@
+@@ -23709,7 +22622,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -7186,7 +4180,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23769,27 +22942,11 @@
+@@ -23771,27 +22684,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7219,7 +4213,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23798,7 +22955,7 @@
+@@ -23800,7 +22697,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -7228,7 +4222,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23847,27 +23004,11 @@
+@@ -23849,27 +22746,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7261,7 +4255,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23876,7 +23017,7 @@
+@@ -23878,7 +22759,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -7270,7 +4264,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23971,27 +23112,11 @@
+@@ -23973,27 +22854,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7303,7 +4297,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24000,7 +23125,7 @@
+@@ -24002,7 +22867,7 @@
eval "$as_ac_var=no"
fi
@@ -7312,7 +4306,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24147,27 +23272,11 @@
+@@ -24149,27 +23014,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7345,7 +4339,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24176,7 +23285,7 @@
+@@ -24178,7 +23027,7 @@
eval "$as_ac_var=no"
fi
@@ -7354,7 +4348,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24206,8 +23315,8 @@
+@@ -24208,8 +23057,8 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -7365,7 +4359,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -24237,7 +23346,7 @@
+@@ -24239,7 +23088,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7374,7 +4368,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
-@@ -24325,27 +23434,11 @@
+@@ -24327,27 +23176,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7407,7 +4401,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24417,27 +23510,11 @@
+@@ -24419,27 +23252,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7440,7 +4434,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24446,7 +23523,7 @@
+@@ -24448,7 +23265,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -7449,7 +4443,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24467,7 +23544,7 @@
+@@ -24469,7 +23286,7 @@
esac
fi
@@ -7458,7 +4452,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24775,27 +23852,10 @@
+@@ -24777,27 +23594,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7490,7 +4484,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24832,27 +23892,10 @@
+@@ -24834,27 +23634,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7522,7 +4516,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24926,7 +23969,7 @@
+@@ -24928,7 +23711,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7531,7 +4525,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
-@@ -24969,7 +24012,7 @@
+@@ -24971,7 +23754,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7540,7 +4534,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
-@@ -25238,27 +24281,11 @@
+@@ -25240,27 +24023,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7573,7 +4567,7 @@
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -25276,7 +24303,7 @@
+@@ -25278,7 +24045,7 @@
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -7582,7 +4576,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25380,27 +24407,11 @@
+@@ -25382,27 +24149,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7615,7 +4609,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25409,7 +24420,7 @@
+@@ -25411,7 +24162,7 @@
eval "$as_ac_var=no"
fi
@@ -7624,7 +4618,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25464,27 +24475,10 @@
+@@ -25466,27 +24217,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7656,7 +4650,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25520,17 +24514,10 @@
+@@ -25522,17 +24256,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7678,7 +4672,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25636,27 +24623,10 @@
+@@ -25638,27 +24365,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7710,7 +4704,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25692,17 +24662,10 @@
+@@ -25694,17 +24404,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7732,7 +4726,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25808,27 +24771,10 @@
+@@ -25810,27 +24513,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7764,7 +4758,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25864,17 +24810,10 @@
+@@ -25866,17 +24552,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7786,7 +4780,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25980,27 +24919,10 @@
+@@ -25982,27 +24661,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7818,7 +4812,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26036,17 +24958,10 @@
+@@ -26038,17 +24700,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7840,7 +4834,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26146,27 +25061,10 @@
+@@ -26148,27 +24803,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7872,7 +4866,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26231,27 +25129,10 @@
+@@ -26233,27 +24871,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7904,7 +4898,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26406,10 +25287,10 @@
+@@ -26408,10 +25029,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -7918,7 +4912,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26418,11 +25299,11 @@
+@@ -26420,11 +25041,11 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -7934,7 +4928,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26449,7 +25330,7 @@
+@@ -26451,7 +25072,7 @@
const int foo = 10;
if (!foo) return 0;
}
@@ -7943,7 +4937,7 @@
#endif
;
-@@ -26469,27 +25350,10 @@
+@@ -26471,27 +25092,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7975,7 +4969,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26547,27 +25411,10 @@
+@@ -26549,27 +25153,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8007,7 +5001,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26626,27 +25473,10 @@
+@@ -26628,27 +25215,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8039,7 +5033,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26682,17 +25512,10 @@
+@@ -26684,17 +25254,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8061,7 +5055,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26823,27 +25646,11 @@
+@@ -26825,27 +25388,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8094,7 +5088,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26852,7 +25659,7 @@
+@@ -26854,7 +25401,7 @@
eval "$as_ac_var=no"
fi
@@ -8103,7 +5097,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26909,21 +25716,21 @@
+@@ -26911,21 +25458,21 @@
#include <fcntl.h>
#include <sys/mman.h>
@@ -8129,7 +5123,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -27120,27 +25927,11 @@
+@@ -27122,27 +25669,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8162,7 +5156,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27149,7 +25940,7 @@
+@@ -27151,7 +25682,7 @@
eval "$as_ac_var=no"
fi
@@ -8171,7 +5165,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27230,27 +26021,11 @@
+@@ -27232,27 +25763,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8204,7 +5198,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27259,7 +26034,7 @@
+@@ -27261,7 +25776,7 @@
eval "$as_ac_var=no"
fi
@@ -8213,7 +5207,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27343,27 +26118,10 @@
+@@ -27345,27 +25860,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8245,7 +5239,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27432,17 +26190,10 @@
+@@ -27434,17 +25932,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8267,7 +5261,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27485,17 +26236,10 @@
+@@ -27487,17 +25978,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8289,7 +5283,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27580,27 +26324,11 @@
+@@ -27582,27 +26066,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8322,7 +5316,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27609,7 +26337,7 @@
+@@ -27611,7 +26079,7 @@
ac_cv_func_iswalnum=no
fi
@@ -8331,7 +5325,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27659,27 +26387,11 @@
+@@ -27661,27 +26129,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8364,7 +5358,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27688,7 +26400,7 @@
+@@ -27690,7 +26142,7 @@
ac_cv_lib_w_iswalnum=no
fi
@@ -8373,7 +5367,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27747,27 +26459,11 @@
+@@ -27749,27 +26201,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8406,7 +5400,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27776,7 +26472,7 @@
+@@ -27778,7 +26214,7 @@
gdk_working_wctype=no
fi
@@ -8415,7 +5409,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27815,17 +26511,10 @@
+@@ -27817,17 +26253,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8437,7 +5431,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27885,27 +26574,10 @@
+@@ -27887,27 +26316,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8469,7 +5463,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27941,17 +26613,10 @@
+@@ -27943,17 +26355,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8491,7 +5485,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28082,27 +26747,11 @@
+@@ -28084,27 +26489,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8524,7 +5518,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -28111,7 +26760,7 @@
+@@ -28113,7 +26502,7 @@
eval "$as_ac_var=no"
fi
@@ -8533,7 +5527,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -28259,27 +26908,11 @@
+@@ -28261,27 +26650,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8566,7 +5560,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28288,7 +26921,7 @@
+@@ -28290,7 +26663,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
@@ -8575,7 +5569,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28329,27 +26962,10 @@
+@@ -28331,27 +26704,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8607,7 +5601,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28385,17 +27001,10 @@
+@@ -28387,17 +26743,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8629,7 +5623,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28500,27 +27109,11 @@
+@@ -28502,27 +26851,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8662,7 +5656,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28529,7 +27122,7 @@
+@@ -28531,7 +26864,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -8671,7 +5665,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28570,27 +27163,10 @@
+@@ -28572,27 +26905,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8703,7 +5697,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28626,17 +27202,10 @@
+@@ -28628,17 +26944,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8725,7 +5719,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28741,27 +27310,11 @@
+@@ -28743,27 +27052,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8758,7 +5752,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28770,7 +27323,7 @@
+@@ -28772,7 +27065,7 @@
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -8767,7 +5761,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28811,27 +27364,10 @@
+@@ -28813,27 +27106,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8799,7 +5793,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28867,17 +27403,10 @@
+@@ -28869,17 +27145,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8821,7 +5815,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29005,27 +27534,11 @@
+@@ -29007,27 +27276,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8854,7 +5848,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29034,7 +27547,7 @@
+@@ -29036,7 +27289,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -8863,7 +5857,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29075,17 +27588,10 @@
+@@ -29077,17 +27330,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8885,7 +5879,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29141,27 +27647,11 @@
+@@ -29143,27 +27389,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8918,7 +5912,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29170,7 +27660,7 @@
+@@ -29172,7 +27402,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -8927,7 +5921,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29259,27 +27749,11 @@
+@@ -29261,27 +27491,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8960,7 +5954,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29288,7 +27762,7 @@
+@@ -29290,7 +27504,7 @@
ac_cv_lib_png_png_read_info=no
fi
@@ -8969,7 +5963,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29329,27 +27803,10 @@
+@@ -29331,27 +27545,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9001,7 +5995,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29385,17 +27842,10 @@
+@@ -29387,17 +27584,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9023,7 +6017,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29492,27 +27942,10 @@
+@@ -29494,27 +27684,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9055,7 +6049,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29805,27 +28238,10 @@
+@@ -29807,27 +27980,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9087,7 +6081,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29882,27 +28298,10 @@
+@@ -29884,27 +28040,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9119,7 +6113,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -30005,27 +28404,10 @@
+@@ -30007,27 +28146,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9151,7 +6145,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30061,17 +28443,10 @@
+@@ -30063,17 +28185,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9173,7 +6167,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30167,27 +28542,10 @@
+@@ -30169,27 +28284,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9205,7 +6199,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30223,17 +28581,10 @@
+@@ -30225,17 +28323,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9227,7 +6221,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30343,27 +28694,11 @@
+@@ -30345,27 +28436,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9260,7 +6254,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30372,7 +28707,7 @@
+@@ -30374,7 +28449,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=no
fi
@@ -9269,7 +6263,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30437,27 +28772,11 @@
+@@ -30439,27 +28514,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9302,7 +6296,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30466,7 +28785,7 @@
+@@ -30468,7 +28527,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
fi
@@ -9311,7 +6305,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30603,7 +28922,7 @@
+@@ -30605,7 +28664,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9320,7 +6314,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30644,7 +28963,7 @@
+@@ -30646,7 +28705,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9329,7 +6323,7 @@
ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30867,17 +29186,10 @@
+@@ -30869,17 +28928,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9351,7 +6345,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -30900,7 +29212,7 @@
+@@ -30902,7 +28954,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -9360,7 +6354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30929,27 +29241,11 @@
+@@ -30931,27 +28983,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9393,7 +6387,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -30962,7 +29258,7 @@
+@@ -30964,7 +29000,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -9402,7 +6396,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -30970,7 +29266,7 @@
+@@ -30972,7 +29008,7 @@
done
fi
@@ -9411,7 +6405,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -31025,12 +29321,12 @@
+@@ -31027,12 +29063,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -9429,7 +6423,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31058,44 +29354,20 @@
+@@ -31060,44 +29096,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9483,7 +6477,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31123,48 +29395,30 @@
+@@ -31125,48 +29137,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9549,7 +6543,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -31213,27 +29467,11 @@
+@@ -31215,27 +29209,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9582,7 +6576,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -31281,27 +29519,11 @@
+@@ -31283,27 +29261,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9615,7 +6609,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31310,7 +29532,7 @@
+@@ -31312,7 +29274,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -9624,7 +6618,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31363,27 +29585,11 @@
+@@ -31365,27 +29327,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9657,7 +6651,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31392,7 +29598,7 @@
+@@ -31394,7 +29340,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -9666,7 +6660,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31405,7 +29611,7 @@
+@@ -31407,7 +29353,7 @@
fi
fi
@@ -9675,7 +6669,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -31480,27 +29686,11 @@
+@@ -31482,27 +29428,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9708,7 +6702,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31509,7 +29699,7 @@
+@@ -31511,7 +29441,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -9717,7 +6711,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -31558,27 +29748,11 @@
+@@ -31560,27 +29490,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9750,7 +6744,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31587,7 +29761,7 @@
+@@ -31589,7 +29503,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -9759,7 +6753,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31640,27 +29814,11 @@
+@@ -31642,27 +29556,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9792,7 +6786,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31669,7 +29827,7 @@
+@@ -31671,7 +29569,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -9801,7 +6795,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31752,27 +29910,11 @@
+@@ -31754,27 +29652,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9834,7 +6828,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31781,7 +29923,7 @@
+@@ -31783,7 +29665,7 @@
ac_cv_func_connect=no
fi
@@ -9843,7 +6837,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -31830,27 +29972,11 @@
+@@ -31832,27 +29714,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9876,7 +6870,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31859,7 +29985,7 @@
+@@ -31861,7 +29727,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -9885,7 +6879,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31935,27 +30061,11 @@
+@@ -31937,27 +29803,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9918,7 +6912,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31964,7 +30074,7 @@
+@@ -31966,7 +29816,7 @@
ac_cv_func_remove=no
fi
@@ -9927,7 +6921,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -32013,27 +30123,11 @@
+@@ -32015,27 +29865,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9960,7 +6954,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32042,7 +30136,7 @@
+@@ -32044,7 +29878,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -9969,7 +6963,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32118,27 +30212,11 @@
+@@ -32120,27 +29954,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10002,7 +6996,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32147,7 +30225,7 @@
+@@ -32149,7 +29967,7 @@
ac_cv_func_shmat=no
fi
@@ -10011,7 +7005,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -32196,27 +30274,11 @@
+@@ -32198,27 +30016,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10044,7 +7038,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32225,7 +30287,7 @@
+@@ -32227,7 +30029,7 @@
ac_cv_lib_ipc_shmat=no
fi
@@ -10053,7 +7047,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32289,27 +30351,11 @@
+@@ -32291,27 +30093,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10086,7 +7080,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32318,7 +30364,7 @@
+@@ -32320,7 +30106,7 @@
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -10095,10 +7089,144 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32417,31 +30463,15 @@
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
+@@ -32423,27 +30209,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32452,7 +30222,7 @@
+ ac_cv_func_XOpenDisplay=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
+@@ -32528,27 +30298,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_XextFindDisplay=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32557,7 +30311,7 @@
+ ac_cv_func_XextFindDisplay=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
+@@ -32633,27 +30387,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_XRenderQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32662,7 +30400,7 @@
+ ac_cv_func_XRenderQueryExtension=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
+@@ -32696,39 +30434,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
@@ -10114,14 +7242,17 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
@@ -10130,21 +7261,85 @@
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ else
+@@ -32764,27 +30485,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+
+@@ -32878,27 +30582,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XOpenDisplay=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32450,7 +30480,7 @@
- ac_cv_func_XOpenDisplay=no
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32907,7 +30595,7 @@
+ eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
-@@ -32526,27 +30556,11 @@
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -32991,27 +30679,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10174,19 +7369,19 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XextFindDisplay=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32555,7 +30569,7 @@
- ac_cv_func_XextFindDisplay=no
+ ac_cv_func_XAddConnectionWatch=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33020,7 +30692,7 @@
+ ac_cv_func_XAddConnectionWatch=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
-@@ -32631,27 +30645,11 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
+@@ -33121,27 +30793,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10216,83 +7411,19 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XRenderQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32660,7 +30658,7 @@
- ac_cv_func_XRenderQueryExtension=no
+ ac_cv_func_XkbQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33150,7 +30806,7 @@
+ ac_cv_func_XkbQueryExtension=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
-@@ -32706,27 +30704,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- else
-@@ -32762,27 +30743,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-
-@@ -32876,27 +30840,11 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
+@@ -33232,27 +30888,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10322,19 +7453,19 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -32905,7 +30853,7 @@
- eval "$as_ac_var=no"
+ ac_cv_func_XShapeCombineMask=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33261,7 +30901,7 @@
+ ac_cv_func_XShapeCombineMask=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -32989,27 +30937,11 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
+@@ -33341,27 +30981,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10364,19 +7495,51 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XAddConnectionWatch=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33018,7 +30950,7 @@
- ac_cv_func_XAddConnectionWatch=no
+ ac_cv_func_XSyncQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33370,7 +30994,7 @@
+ ac_cv_func_XSyncQueryExtension=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
-@@ -33119,27 +31051,11 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
+@@ -33404,27 +31028,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_extensions_sync_h=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33520,27 +31127,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10406,177 +7569,19 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XkbQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33148,7 +31064,7 @@
- ac_cv_func_XkbQueryExtension=no
+ ac_cv_func_XShmAttach=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33549,7 +31140,7 @@
+ ac_cv_func_XShmAttach=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
-@@ -33230,27 +31146,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XShapeCombineMask=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33259,7 +31159,7 @@
- ac_cv_func_XShapeCombineMask=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
-@@ -33339,27 +31239,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XSyncQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33368,7 +31252,7 @@
- ac_cv_func_XSyncQueryExtension=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
-@@ -33402,27 +31286,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_sync_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33518,27 +31385,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XShmAttach=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33547,7 +31398,7 @@
- ac_cv_func_XShmAttach=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
-@@ -33598,27 +31449,11 @@
+@@ -33600,27 +31191,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10609,7 +7614,7 @@
ac_cv_lib_XextSam_XShmAttach=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33627,7 +31462,7 @@
+@@ -33629,7 +31204,7 @@
ac_cv_lib_XextSam_XShmAttach=no
fi
@@ -10618,7 +7623,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33681,27 +31516,10 @@
+@@ -33683,27 +31258,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10650,7 +7655,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33737,17 +31555,10 @@
+@@ -33739,17 +31297,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10672,7 +7677,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33845,27 +31656,10 @@
+@@ -33847,27 +31398,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10704,7 +7709,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33901,17 +31695,10 @@
+@@ -33903,17 +31437,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10726,7 +7731,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34021,27 +31808,10 @@
+@@ -34023,27 +31550,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10758,7 +7763,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34138,27 +31908,11 @@
+@@ -34140,27 +31650,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10791,7 +7796,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34167,7 +31921,7 @@
+@@ -34169,7 +31663,7 @@
ac_cv_func_XineramaGetInfo=no
fi
@@ -10800,7 +7805,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -34201,27 +31955,10 @@
+@@ -34203,27 +31697,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10832,7 +7837,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34312,27 +32049,11 @@
+@@ -34314,27 +31791,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10865,7 +7870,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34341,7 +32062,7 @@
+@@ -34343,7 +31804,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -10874,7 +7879,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34376,27 +32097,10 @@
+@@ -34378,27 +31839,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10906,7 +7911,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34528,27 +32232,11 @@
+@@ -34530,27 +31974,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10939,7 +7944,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34557,7 +32245,7 @@
+@@ -34559,7 +31987,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -10948,7 +7953,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34592,27 +32280,10 @@
+@@ -34594,27 +32022,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10980,7 +7985,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34825,8 +32496,18 @@
+@@ -34827,8 +32238,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
{ echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6; }
@@ -11001,7 +8006,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -34935,27 +32616,11 @@
+@@ -34937,27 +32358,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11034,7 +8039,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34970,7 +32635,7 @@
+@@ -34972,7 +32377,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -11043,7 +8048,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34978,7 +32643,7 @@
+@@ -34980,7 +32385,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -11052,7 +8057,7 @@
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
-@@ -35066,27 +32731,11 @@
+@@ -35068,27 +32473,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11085,7 +8090,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -35101,7 +32750,7 @@
+@@ -35103,7 +32492,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -11094,7 +8099,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -35167,7 +32816,7 @@
+@@ -35169,7 +32558,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11103,7 +8108,7 @@
ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35259,27 +32908,10 @@
+@@ -35247,27 +32636,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11135,7 +8140,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35315,17 +32947,10 @@
+@@ -35303,17 +32675,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11157,7 +8162,81 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35428,27 +33053,10 @@
+@@ -35418,27 +32783,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HTTP_AUTHSTRING
+@@ -35525,27 +32873,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -35554,7 +32886,7 @@
+ eval "$as_ac_var=no"
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -35607,27 +32939,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11189,7 +8268,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35484,17 +33092,10 @@
+@@ -35663,17 +32978,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11211,16 +8290,168 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35653,7 +33254,7 @@
+@@ -35776,27 +33084,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -35832,17 +33123,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -35980,38 +33264,19 @@
+ fi
+
+
++ have_gtk_doc=no
+ if test x$enable_gtk_doc = xyes; then
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- :
+-else
+- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&5
+-echo "$as_me: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+- fi
+-
+- { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+-echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+-echo "${ECHO_T}$enable_gtk_doc" >&6; }
+-
+- for ac_prog in gtkdoc-check
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $GTKDOC_CHECK in
++ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -36020,8 +33285,8 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ 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
-@@ -35738,7 +33339,7 @@
+ fi
+@@ -36029,22 +33294,43 @@
+ done
+ IFS=$as_save_IFS
+
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
+- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+-echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+- test -n "$GTKDOC_CHECK" && break
+-done
++ fi
++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++ have_gtk_doc=yes
++ fi
++
++ gtk_doc_min_version=1.6
++ if test "$have_gtk_doc" = yes; then
++ { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5
++echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; }
++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ have_gtk_doc=no
++ fi
++ fi
+
++ if test "$have_gtk_doc" != yes; then
++ enable_gtk_doc=no
++ fi
++ fi
+
+
+
+@@ -36084,7 +33370,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11229,7 +8460,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35798,7 +33399,7 @@
+@@ -36144,7 +33430,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11238,7 +8469,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
-@@ -35867,7 +33468,7 @@
+@@ -36213,7 +33499,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11247,7 +8478,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
-@@ -36068,6 +33669,13 @@
+@@ -36414,6 +33700,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11261,7 +8492,7 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36442,7 +34050,8 @@
+@@ -36788,7 +34081,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -11271,7 +8502,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -36451,10 +34060,13 @@
+@@ -36797,10 +34091,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -11288,7 +8519,7 @@
# PATH needs CR
-@@ -36678,19 +34290,28 @@
+@@ -37024,19 +34321,28 @@
as_mkdir_p=false
fi
@@ -11328,16 +8559,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'"
-@@ -36706,7 +34327,7 @@
+@@ -37052,7 +34358,7 @@
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.11.6, which was
+ This file was extended by gtk+ $as_me 2.12.0, 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
-@@ -36735,7 +34356,7 @@
+@@ -37081,7 +34387,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -11346,16 +8577,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
-@@ -36759,7 +34380,7 @@
+@@ -37105,7 +34411,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gtk+ config.status 2.11.6
+ gtk+ config.status 2.12.0
-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.
-@@ -37125,9 +34746,9 @@
+@@ -37471,9 +34777,9 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -11367,7 +8598,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37169,6 +34790,8 @@
+@@ -37515,6 +34821,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -11376,110 +8607,76 @@
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -37176,6 +34799,7 @@
- HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim
- HAVE_OBJC_TRUE!$HAVE_OBJC_TRUE$ac_delim
- HAVE_OBJC_FALSE!$HAVE_OBJC_FALSE$ac_delim
-+SED!$SED$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- LN_S!$LN_S$ac_delim
-@@ -37263,9 +34887,6 @@
- INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
+@@ -37610,8 +34918,6 @@
INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
--INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
+ INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
-INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37307,6 +34928,9 @@
+@@ -37653,6 +34959,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
+INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
+INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
-@@ -37401,11 +35025,9 @@
+@@ -37736,7 +35044,6 @@
+ TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim
+ TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim
+ HTML_DIR!$HTML_DIR$ac_delim
+-GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
+ ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
+ ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
+ GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
+@@ -37749,7 +35056,6 @@
XMLCATALOG!$XMLCATALOG$ac_delim
ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37791,10 +35097,11 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -37441,6 +35063,51 @@
- _ACEOF
-
-
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -37684,7 +35351,7 @@
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
---- gtk+2.0-2.11.6.orig/contrib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/contrib/Makefile.in 2007-07-24 10:36:26.000000000 +0200
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+-2.12.0/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+-2.12.0.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-09-14 03:10:46.000000000 +0330
++++ gtk+-2.12.0/contrib/gdk-pixbuf-xlib/Makefile.in 2007-09-16 18:43:07.000000000 +0330
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/contrib/Makefile.in gtk+-2.12.0/contrib/Makefile.in
+--- gtk+-2.12.0.orig/contrib/Makefile.in 2007-09-14 03:10:46.000000000 +0330
++++ gtk+-2.12.0/contrib/Makefile.in 2007-09-16 18:43:07.000000000 +0330
@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11489,16 +8686,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-24 10:36:26.000000000 +0200
+@@ -124,7 +126,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/demos/gtk-demo/Makefile.in gtk+-2.12.0/demos/gtk-demo/Makefile.in
+--- gtk+-2.12.0.orig/demos/gtk-demo/Makefile.in 2007-09-14 03:10:46.000000000 +0330
++++ gtk+-2.12.0/demos/gtk-demo/Makefile.in 2007-09-16 18:43:07.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11508,16 +8706,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/demos/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/demos/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/demos/Makefile.in gtk+-2.12.0/demos/Makefile.in
+--- gtk+-2.12.0.orig/demos/Makefile.in 2007-09-14 03:10:46.000000000 +0330
++++ gtk+-2.12.0/demos/Makefile.in 2007-09-16 18:43:07.000000000 +0330
@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11527,16 +8726,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -124,7 +126,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/faq/Makefile.in gtk+-2.12.0/docs/faq/Makefile.in
+--- gtk+-2.12.0.orig/docs/faq/Makefile.in 2007-09-14 03:10:47.000000000 +0330
++++ gtk+-2.12.0/docs/faq/Makefile.in 2007-09-16 18:43:08.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11546,16 +8746,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/Makefile.in gtk+-2.12.0/docs/Makefile.in
+--- gtk+-2.12.0.orig/docs/Makefile.in 2007-09-14 03:10:47.000000000 +0330
++++ gtk+-2.12.0/docs/Makefile.in 2007-09-16 18:43:08.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11565,16 +8766,77 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/faq/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/faq/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gdk/Makefile.in gtk+-2.12.0/docs/reference/gdk/Makefile.in
+--- gtk+-2.12.0.orig/docs/reference/gdk/Makefile.in 2007-09-14 03:28:39.000000000 +0330
++++ gtk+-2.12.0/docs/reference/gdk/Makefile.in 2007-09-16 18:43:08.000000000 +0330
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -129,7 +131,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+-2.12.0/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+-2.12.0.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-09-14 03:24:52.000000000 +0330
++++ gtk+-2.12.0/docs/reference/gdk-pixbuf/Makefile.in 2007-09-16 18:43:08.000000000 +0330
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -129,7 +131,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/gtk/Makefile.in gtk+-2.12.0/docs/reference/gtk/Makefile.in
+--- gtk+-2.12.0.orig/docs/reference/gtk/Makefile.in 2007-09-14 03:29:06.000000000 +0330
++++ gtk+-2.12.0/docs/reference/gtk/Makefile.in 2007-09-16 18:43:08.000000000 +0330
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -129,7 +131,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/reference/Makefile.in gtk+-2.12.0/docs/reference/Makefile.in
+--- gtk+-2.12.0.orig/docs/reference/Makefile.in 2007-09-14 03:10:47.000000000 +0330
++++ gtk+-2.12.0/docs/reference/Makefile.in 2007-09-16 18:43:08.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11584,16 +8846,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/reference/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/tools/Makefile.in gtk+-2.12.0/docs/tools/Makefile.in
+--- gtk+-2.12.0.orig/docs/tools/Makefile.in 2007-09-14 03:10:47.000000000 +0330
++++ gtk+-2.12.0/docs/tools/Makefile.in 2007-09-16 18:43:08.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11603,73 +8866,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -95,6 +95,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -95,6 +95,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -95,6 +95,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/tools/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/tools/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/docs/tutorial/Makefile.in gtk+-2.12.0/docs/tutorial/Makefile.in
+--- gtk+-2.12.0.orig/docs/tutorial/Makefile.in 2007-09-14 03:10:47.000000000 +0330
++++ gtk+-2.12.0/docs/tutorial/Makefile.in 2007-09-16 18:43:09.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11679,16 +8886,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/tutorial/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/directfb/Makefile.in gtk+-2.12.0/gdk/directfb/Makefile.in
+--- gtk+-2.12.0.orig/gdk/directfb/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/directfb/Makefile.in 2007-09-16 18:43:10.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11698,16 +8906,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/Makefile.in gtk+-2.12.0/gdk/Makefile.in
+--- gtk+-2.12.0.orig/gdk/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/Makefile.in 2007-09-16 18:43:09.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11717,16 +8926,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/directfb/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/quartz/Makefile.in gtk+-2.12.0/gdk/quartz/Makefile.in
+--- gtk+-2.12.0.orig/gdk/quartz/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/quartz/Makefile.in 2007-09-16 18:43:10.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11736,16 +8946,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/quartz/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/win32/Makefile.in gtk+-2.12.0/gdk/win32/Makefile.in
+--- gtk+-2.12.0.orig/gdk/win32/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/win32/Makefile.in 2007-09-16 18:43:10.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11755,16 +8966,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/win32/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/win32/rc/Makefile.in gtk+-2.12.0/gdk/win32/rc/Makefile.in
+--- gtk+-2.12.0.orig/gdk/win32/rc/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/win32/rc/Makefile.in 2007-09-16 18:43:10.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11774,16 +8986,37 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk/x11/Makefile.in gtk+-2.12.0/gdk/x11/Makefile.in
+--- gtk+-2.12.0.orig/gdk/x11/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk/x11/Makefile.in 2007-09-16 18:43:10.000000000 +0330
+@@ -91,6 +91,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -125,7 +127,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk-pixbuf/Makefile.in gtk+-2.12.0/gdk-pixbuf/Makefile.in
+--- gtk+-2.12.0.orig/gdk-pixbuf/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk-pixbuf/Makefile.in 2007-09-16 18:43:09.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11793,35 +9026,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in 2007-07-20 22:21:35.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/x11/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -246,6 +248,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gdk-pixbuf/pixops/Makefile.in gtk+-2.12.0/gdk-pixbuf/pixops/Makefile.in
+--- gtk+-2.12.0.orig/gdk-pixbuf/pixops/Makefile.in 2007-09-14 03:10:48.000000000 +0330
++++ gtk+-2.12.0/gdk-pixbuf/pixops/Makefile.in 2007-09-16 18:43:09.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11831,35 +9046,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gtk/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/Makefile.in 2007-07-24 10:37:34.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/Makefile.in gtk+-2.12.0/gtk/Makefile.in
+--- gtk+-2.12.0.orig/gtk/Makefile.in 2007-09-14 03:10:49.000000000 +0330
++++ gtk+-2.12.0/gtk/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -113,6 +113,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11869,15 +9066,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -268,6 +270,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -376,6 +379,8 @@
+@@ -147,7 +149,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+@@ -378,6 +379,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -11886,7 +9083,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -631,13 +636,16 @@
+@@ -633,13 +636,16 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -11906,7 +9103,7 @@
gtksearchenginebeagle.h \
gtksearchenginetracker.h\
gtksearchenginesimple.h \
-@@ -647,10 +655,7 @@
+@@ -649,10 +655,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -11917,8 +9114,9 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
---- gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/theme-bits/Makefile.in gtk+-2.12.0/gtk/theme-bits/Makefile.in
+--- gtk+-2.12.0.orig/gtk/theme-bits/Makefile.in 2007-09-14 03:10:49.000000000 +0330
++++ gtk+-2.12.0/gtk/theme-bits/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11928,16 +9126,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/gtk/xdgmime/Makefile.in gtk+-2.12.0/gtk/xdgmime/Makefile.in
+--- gtk+-2.12.0.orig/gtk/xdgmime/Makefile.in 2007-09-14 03:10:49.000000000 +0330
++++ gtk+-2.12.0/gtk/xdgmime/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -11947,230 +9146,27 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.6/ltmain.sh 2007-07-24 10:36:27.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.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007 Free Software Foundation, Inc.
- # 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 @@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/ltmain.sh gtk+-2.12.0/ltmain.sh
+--- gtk+-2.12.0.orig/ltmain.sh 2007-01-14 07:45:09.000000000 +0330
++++ gtk+-2.12.0/ltmain.sh 2006-03-22 03:36:55.000000000 +0330
+@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.24 Debian 1.5.24-1"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes.
--if test -n "${ZSH_VERSION+set}" ; then
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@
- # 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.
--if test "${LC_ALL+set}" = set; then
-- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
-- save_LANG="$LANG"; LANG=C; export LANG
--fi
-+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-
- # Make sure IFS has a sensible default
- lt_nl='
-@@ -136,6 +146,8 @@
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-
- #####################################
- # Shell function definitions:
-@@ -196,7 +208,13 @@
- 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 | \
-- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+ $SED -n -e '1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-- my_xdir="$my_gentop/$my_xlib"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@
- ;;
-
- --version)
-- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-- $echo
-- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ echo "\
-+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-+
-+Copyright (C) 2007 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
-
-@@ -755,9 +784,10 @@
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
-- *.f90) xform=f90 ;;
-+ *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
-+ *.obj) xform=obj ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@
- for arg
- do
- case $arg in
-- -all-static | -static)
-- if test "X$arg" = "X-all-static"; then
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
- 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 @@
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
-- else
-+ ;;
-+ -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
-- fi
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
- build_libtool_libs=no
- build_old_libs=yes
- break
-@@ -1600,7 +1639,7 @@
- continue
- ;;
-
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
-- # -pg pass through profiling flag for GCC
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $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 @@
- continue
- ;;
-
-- -static)
-+ -static | -static-libtool-libs)
- # 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 @@
++VERSION="1.5.22 Debian 1.5.22-4"
+ TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+
+ # See if we are running on zsh, and set the options which allow our
+@@ -2082,7 +2082,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -12182,336 +9178,21 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -2094,7 +2137,7 @@
- lib=
- found=no
- case $deplib in
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2490,7 +2533,9 @@
-
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
-- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
- # 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 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
-@@ -3197,9 +3242,15 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
+@@ -3201,6 +3204,11 @@
age="$number_minor"
revision="$number_minor"
-+ lt_irix_increment=no
-+ ;;
+ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
- ;;
++ ;;
esac
;;
-@@ -3258,7 +3309,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3272,8 +3324,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -3410,11 +3465,11 @@
- fi
-
- # Eliminate all temporary directories.
-- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-- done
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-+ #done
-
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
-@@ -3515,13 +3570,12 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
-- if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
-@@ -3560,9 +3614,7 @@
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $i
-- # Did it work?
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
-@@ -3594,7 +3646,7 @@
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
-- $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** make it link in! You will probably need to install it or some"
- $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 @@
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ case $archive_cmds in
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-+ esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
-@@ -4239,12 +4294,14 @@
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
-- # -Wl from whole_archive_flag_spec
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -4692,16 +4749,16 @@
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
- ;;
-@@ -4716,13 +4773,13 @@
- # really was required.
-
- # Nullify the symbol file.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
-- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
-
- # We have no uninstalled library dependencies, so finalize right now.
-@@ -4809,7 +4866,7 @@
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
-- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
-@@ -4846,7 +4903,7 @@
- fi
- done
- relink_command="(cd `pwd`; $relink_command)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
-@@ -5253,6 +5310,20 @@
- Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
-
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
- # 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 @@
- ;;
- esac
- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
-@@ -5581,7 +5652,7 @@
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
-@@ -5926,9 +5997,9 @@
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
- else
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6137,7 +6208,7 @@
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
-@@ -6348,8 +6419,10 @@
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit $EXIT_FAILURE
-+ if test ! -f "$dir/$dlname"; then
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
- fi
- ;;
-
-@@ -6413,12 +6486,12 @@
- fi
-
- # Restore saved environment variables
-- if test "${save_LC_ALL+set}" = set; then
-- LC_ALL="$save_LC_ALL"; export LC_ALL
-- fi
-- if test "${save_LANG+set}" = set; then
-- LANG="$save_LANG"; export LANG
-- fi
-+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ fi"
-+ done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
-@@ -6775,9 +6848,9 @@
- -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
-- try to export only the symbols listed in SYMFILE
-+ try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
-- try to export only the symbols matching REGEX
-+ try to export only the symbols matching REGEX
- -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 @@
- -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
-- -static do not do any dynamic linking of libtool libraries
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
-- specify library version info [each variable defaults to 0]
-+ specify library version info [each variable defaults to 0]
-
- All other options (arguments beginning with \`-') are ignored.
-
---- gtk+2.0-2.11.6.orig/m4macros/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/m4macros/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+ no)
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/m4macros/Makefile.in gtk+-2.12.0/m4macros/Makefile.in
+--- gtk+-2.12.0.orig/m4macros/Makefile.in 2007-09-14 03:10:49.000000000 +0330
++++ gtk+-2.12.0/m4macros/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12521,16 +9202,68 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/Makefile.in gtk+-2.12.0/Makefile.in
+--- gtk+-2.12.0.orig/Makefile.in 2007-09-14 03:10:46.000000000 +0330
++++ gtk+-2.12.0/Makefile.in 2007-09-16 18:43:07.000000000 +0330
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +126,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+@@ -329,7 +330,10 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++# don't build perf measurement tools in static builds
++ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+
+ # require automake 1.4
+@@ -487,7 +491,8 @@
+ gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \
+ gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \
+ missing mkinstalldirs
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
++ perf contrib docs m4macros
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+@@ -739,7 +744,7 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/Makefile.in gtk+-2.12.0/modules/engines/Makefile.in
+--- gtk+-2.12.0.orig/modules/engines/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/engines/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12540,16 +9273,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/engines/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Makefile.in
+--- gtk+-2.12.0.orig/modules/engines/ms-windows/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/engines/ms-windows/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12559,16 +9293,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12578,16 +9313,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+-2.12.0/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+-2.12.0.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/engines/ms-windows/Theme/Makefile.in 2007-09-16 18:43:11.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12597,16 +9333,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/engines/pixbuf/Makefile.in gtk+-2.12.0/modules/engines/pixbuf/Makefile.in
+--- gtk+-2.12.0.orig/modules/engines/pixbuf/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/engines/pixbuf/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12616,16 +9353,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/input/Makefile.in gtk+-2.12.0/modules/input/Makefile.in
+--- gtk+-2.12.0.orig/modules/input/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/input/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12635,34 +9373,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/input/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/input/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -428,9 +431,10 @@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+@@ -430,9 +431,10 @@
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -12674,7 +9393,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -983,7 +987,18 @@
+@@ -985,7 +987,18 @@
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -12694,8 +9413,89 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
---- gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/Makefile.in gtk+-2.12.0/modules/Makefile.in
+--- gtk+-2.12.0.orig/modules/Makefile.in 2007-09-14 03:10:49.000000000 +0330
++++ gtk+-2.12.0/modules/Makefile.in 2007-09-16 18:43:11.000000000 +0330
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/cups/Makefile.in gtk+-2.12.0/modules/printbackends/cups/Makefile.in
+--- gtk+-2.12.0.orig/modules/printbackends/cups/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/printbackends/cups/Makefile.in 2007-09-16 18:43:12.000000000 +0330
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/file/Makefile.in gtk+-2.12.0/modules/printbackends/file/Makefile.in
+--- gtk+-2.12.0.orig/modules/printbackends/file/Makefile.in 2007-09-14 03:10:51.000000000 +0330
++++ gtk+-2.12.0/modules/printbackends/file/Makefile.in 2007-09-16 18:43:12.000000000 +0330
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/lpr/Makefile.in gtk+-2.12.0/modules/printbackends/lpr/Makefile.in
+--- gtk+-2.12.0.orig/modules/printbackends/lpr/Makefile.in 2007-09-14 03:10:51.000000000 +0330
++++ gtk+-2.12.0/modules/printbackends/lpr/Makefile.in 2007-09-16 18:43:12.000000000 +0330
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/Makefile.in gtk+-2.12.0/modules/printbackends/Makefile.in
+--- gtk+-2.12.0.orig/modules/printbackends/Makefile.in 2007-09-14 03:10:50.000000000 +0330
++++ gtk+-2.12.0/modules/printbackends/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12705,16 +9505,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -246,6 +248,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -125,7 +127,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/modules/printbackends/test/Makefile.in gtk+-2.12.0/modules/printbackends/test/Makefile.in
+--- gtk+-2.12.0.orig/modules/printbackends/test/Makefile.in 2007-09-14 03:10:51.000000000 +0330
++++ gtk+-2.12.0/modules/printbackends/test/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12724,16 +9525,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/perf/Makefile.in gtk+-2.12.0/perf/Makefile.in
+--- gtk+-2.12.0.orig/perf/Makefile.in 2007-09-14 03:10:51.000000000 +0330
++++ gtk+-2.12.0/perf/Makefile.in 2007-09-16 18:43:12.000000000 +0330
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12743,73 +9545,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/perf/Makefile.in 2007-07-20 22:21:39.000000000 +0200
-+++ gtk+2.0-2.11.6/perf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
---- gtk+2.0-2.11.6.orig/tests/Makefile.in 2007-07-20 22:21:39.000000000 +0200
-+++ gtk+2.0-2.11.6/tests/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -123,7 +125,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
+diff -urN -x config.guess -x config.sub gtk+-2.12.0.orig/tests/Makefile.in gtk+-2.12.0/tests/Makefile.in
+--- gtk+-2.12.0.orig/tests/Makefile.in 2007-09-14 03:10:51.000000000 +0330
++++ gtk+-2.12.0/tests/Makefile.in 2007-09-16 18:43:13.000000000 +0330
@@ -92,6 +92,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -12819,11 +9565,11 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -247,6 +249,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- REBUILD_PNGS = @REBUILD_PNGS@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -126,7 +128,6 @@
+ GMSGFMT = @GMSGFMT@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+-GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTK_API_VERSION = @GTK_API_VERSION@
+ GTK_BINARY_AGE = @GTK_BINARY_AGE@
+ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
More information about the pkg-gnome-commits
mailing list