r11779 - in /desktop/experimental/gtk+2.0/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Jul 3 10:56:00 UTC 2007
Author: lool
Date: Tue Jul 3 10:56:00 2007
New Revision: 11779
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11779
Log:
* New upstream development release, with API additions; the new API may
still change incompatibly, especially the tooltips API.
- Bump shlibs to >= 2.11.5.
- Bump up libpango1.0-dev build-dep to >= 1.17.3.
- Ship the new gtk-builder-convert Python script to convert Glade files to
GtkBuilder syntax in libgtk2.0-dev; call dh_python to generate a
${python:Depends} but Recommend ${python:Depends} to avoid pulling
python on buildds; the script requires python >= 2.4, but this is not
enforced in the dependencies.
- Refresh patches 001_static-linking-dont-query-immodules,
006_proper-directfb-modules, 040_filechooser_single-click to apply
cleanly.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch
desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Jul 3 10:56:00 2007
@@ -1,3 +1,21 @@
+gtk+2.0 (2.11.5-1) experimental; urgency=low
+
+ * New upstream development release, with API additions; the new API may
+ still change incompatibly, especially the tooltips API.
+ - Bump shlibs to >= 2.11.5.
+ - Bump up libpango1.0-dev build-dep to >= 1.17.3.
+ - Ship the new gtk-builder-convert Python script to convert Glade files to
+ GtkBuilder syntax in libgtk2.0-dev; call dh_python to generate a
+ ${python:Depends} but Recommend ${python:Depends} to avoid pulling
+ python on buildds; the script requires python >= 2.4, but this is not
+ enforced in the dependencies.
+ - Refresh patches 001_static-linking-dont-query-immodules,
+ 006_proper-directfb-modules, 040_filechooser_single-click to apply
+ cleanly.
+ - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org> Tue, 03 Jul 2007 12:49:05 +0200
+
gtk+2.0 (2.11.4-1) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-dev.install.in?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in Tue Jul 3 10:56:00 2007
@@ -1,7 +1,8 @@
# from Debian
debian/dh_gtkmodules usr/bin
# from the shared flavor
-debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin
+debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin
+debian/install/shared/usr/bin/gtk-builder-convert usr/bin
debian/install/shared/usr/include usr
debian/install/shared/usr/lib/*.la usr/lib
debian/install/shared/usr/lib/*.so usr/lib
Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch Tue Jul 3 10:56:00 2007
@@ -1,19 +1,19 @@
-Index: gtk+2.0-2.11.2/configure.in
+Index: gtk+2.0-2.11.5/configure.in
===================================================================
---- gtk+2.0-2.11.2.orig/configure.in 2007-06-06 15:02:43.000000000 +0200
-+++ gtk+2.0-2.11.2/configure.in 2007-06-13 11:06:48.000000000 +0200
+--- gtk+2.0-2.11.5.orig/configure.in 2007-07-02 17:04:27.000000000 +0200
++++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:03.000000000 +0200
@@ -134,6 +134,7 @@
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
- if test "$os_win32" = "yes"; then
- if test x$enable_static = xyes -o x$enable_static = x; then
-Index: gtk+2.0-2.11.2/modules/input/Makefile.am
+ dnl
+ dnl Check for a working C++ compiler, but do not bail out, if none is found.
+Index: gtk+2.0-2.11.5/modules/input/Makefile.am
===================================================================
---- gtk+2.0-2.11.2.orig/modules/input/Makefile.am 2007-06-06 13:43:17.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/input/Makefile.am 2007-06-13 11:06:48.000000000 +0200
+--- gtk+2.0-2.11.5.orig/modules/input/Makefile.am 2007-07-02 17:04:10.000000000 +0200
++++ gtk+2.0-2.11.5/modules/input/Makefile.am 2007-07-03 11:34:03.000000000 +0200
@@ -106,8 +106,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
Modified: desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/006_proper-directfb-modules.patch?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch Tue Jul 3 10:56:00 2007
@@ -1,10 +1,10 @@
GNOME #447118; related to Debian #381081
-Index: gtk+2.0-2.11.3/configure.in
+Index: gtk+2.0-2.11.5/configure.in
===================================================================
---- gtk+2.0-2.11.3.orig/configure.in 2007-06-16 14:24:41.000000000 +0200
-+++ gtk+2.0-2.11.3/configure.in 2007-06-16 14:24:46.000000000 +0200
-@@ -1392,8 +1392,18 @@
+--- gtk+2.0-2.11.5.orig/configure.in 2007-07-03 11:34:03.000000000 +0200
++++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:32.000000000 +0200
+@@ -1411,8 +1411,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
AC_MSG_RESULT(found)
@@ -25,7 +25,7 @@
else
AC_MSG_ERROR([
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -1445,7 +1455,7 @@
+@@ -1464,7 +1474,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
Modified: desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/040_filechooser_single-click.patch?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch Tue Jul 3 10:56:00 2007
@@ -1,10 +1,10 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
-Index: gtk+2.0-2.11.3/gtk/gtkfilechooserdefault.c
+Index: gtk+2.0-2.11.5/gtk/gtkfilechooserdefault.c
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkfilechooserdefault.c 2007-06-15 20:07:36.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkfilechooserdefault.c 2007-06-16 14:26:14.000000000 +0200
+--- gtk+2.0-2.11.5.orig/gtk/gtkfilechooserdefault.c 2007-07-02 17:04:00.000000000 +0200
++++ gtk+2.0-2.11.5/gtk/gtkfilechooserdefault.c 2007-07-03 11:34:58.000000000 +0200
@@ -389,10 +389,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
@@ -16,7 +16,7 @@
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -3639,8 +3635,22 @@
+@@ -3638,8 +3634,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@@ -39,7 +39,7 @@
}
static gboolean
-@@ -3920,9 +3930,6 @@
+@@ -3919,9 +3929,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
@@ -49,7 +49,7 @@
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
-@@ -8521,25 +8528,6 @@
+@@ -8520,25 +8527,6 @@
gtk_file_path_free (path);
return retval;
}
@@ -75,7 +75,7 @@
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
-@@ -10330,25 +10318,6 @@
+@@ -10329,25 +10317,6 @@
}
}
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=11779&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 Tue Jul 3 10:56:00 2007
@@ -6,10 +6,10 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-diff -urN gtk+2.0-2.11.4.orig/Makefile.in gtk+2.0-2.11.4/Makefile.in
---- gtk+2.0-2.11.4.orig/Makefile.in 2007-06-19 17:28:56.000000000 +0200
-+++ gtk+2.0-2.11.4/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -90,6 +90,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/Makefile.in gtk+2.0-2.11.5/Makefile.in
+--- gtk+2.0-2.11.5.orig/Makefile.in 2007-07-02 21:28:57.000000000 +0200
++++ gtk+2.0-2.11.5/Makefile.in 2007-07-03 11:36:32.000000000 +0200
+@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -18,7 +18,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -323,7 +325,10 @@
+@@ -327,7 +329,10 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -30,7 +30,7 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -480,7 +485,8 @@
+@@ -484,7 +489,8 @@ DIST_COMMON = README $(srcdir)/Makefile.
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
@@ -40,7 +40,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -732,7 +738,7 @@
+@@ -736,7 +742,7 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
@@ -49,10 +49,10 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-diff -urN gtk+2.0-2.11.4.orig/aclocal.m4 gtk+2.0-2.11.4/aclocal.m4
---- gtk+2.0-2.11.4.orig/aclocal.m4 2007-06-19 17:28:50.000000000 +0200
-+++ gtk+2.0-2.11.4/aclocal.m4 2007-06-19 21:20:22.000000000 +0200
-@@ -941,7 +941,7 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/aclocal.m4 gtk+2.0-2.11.5/aclocal.m4
+--- gtk+2.0-2.11.5.orig/aclocal.m4 2007-07-02 19:40:18.000000000 +0200
++++ gtk+2.0-2.11.5/aclocal.m4 2007-07-03 11:36:27.000000000 +0200
+@@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -61,7 +61,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -2325,18 +2325,6 @@
+@@ -2325,18 +2325,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -80,7 +80,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2492,7 +2480,7 @@
+@@ -2492,7 +2480,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -89,7 +89,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2506,27 +2494,10 @@
+@@ -2506,27 +2494,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -118,7 +118,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2538,7 +2509,7 @@
+@@ -2538,7 +2509,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -127,7 +127,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2547,7 +2518,7 @@
+@@ -2547,7 +2518,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -136,7 +136,7 @@
;;
netbsd*)
-@@ -3255,7 +3226,7 @@
+@@ -3255,7 +3226,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -145,7 +145,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3309,11 +3280,11 @@
+@@ -3309,11 +3280,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -159,7 +159,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
-@@ -4061,7 +4032,7 @@
+@@ -4061,7 +4032,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -168,7 +168,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4220,7 +4191,7 @@
+@@ -4220,7 +4191,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -177,7 +177,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -4322,7 +4293,7 @@
+@@ -4322,7 +4293,7 @@ case $host_os in
;;
esac
;;
@@ -186,7 +186,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=
-@@ -5587,7 +5558,7 @@
+@@ -5587,7 +5558,7 @@ hpux*) # Its linker distinguishes data f
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -195,7 +195,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'"
-@@ -5860,7 +5831,7 @@
+@@ -5860,7 +5831,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -204,7 +204,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5903,7 +5874,7 @@
+@@ -5903,7 +5874,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -213,7 +213,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -5946,7 +5917,7 @@
+@@ -5946,7 +5917,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -222,7 +222,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6157,7 +6128,7 @@
+@@ -6157,7 +6128,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -231,7 +231,7 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -6298,6 +6269,9 @@
+@@ -6298,6 +6269,9 @@ ifelse([$1],[CXX],[
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'
;;
@@ -241,7 +241,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -6468,7 +6442,7 @@
+@@ -6468,7 +6442,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -250,7 +250,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6494,12 +6468,13 @@
+@@ -6494,12 +6468,13 @@ EOF
$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'
fi
@@ -265,7 +265,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=
-@@ -6829,7 +6804,7 @@
+@@ -6829,7 +6804,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -274,7 +274,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 +6906,7 @@
+@@ -6931,7 +6906,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -283,7 +283,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
-@@ -7650,7 +7625,8 @@
+@@ -7650,7 +7625,8 @@ installed software in a non-standard pre
_PKG_TEXT
])],
@@ -293,7 +293,16 @@
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
-@@ -8323,22 +8299,22 @@
+@@ -7659,7 +7635,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+@@ -8323,22 +8299,22 @@ AC_DEFUN([GTK_DOC_CHECK],
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
@@ -324,7 +333,7 @@
fi
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
have_gtk_doc=yes
-@@ -8350,9 +8326,9 @@
+@@ -8350,9 +8326,9 @@ ifelse([$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
@@ -336,7 +345,7 @@
have_gtk_doc=no
fi
fi
-@@ -8362,7 +8338,7 @@
+@@ -8362,7 +8338,7 @@ ifelse([$1],[],,
fi
fi
@@ -346,410 +355,14 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
-diff -urN gtk+2.0-2.11.4.orig/config.guess gtk+2.0-2.11.4/config.guess
---- gtk+2.0-2.11.4.orig/config.guess 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.4/config.guess 2007-04-20 04:09:10.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-13'
-+timestamp='2007-03-06'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -106,7 +107,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +161,7 @@
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -206,8 +208,11 @@
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -764,12 +769,19 @@
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -779,9 +791,15 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[345]*)
-- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -817,6 +835,9 @@
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
-@@ -851,7 +872,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-@@ -870,7 +895,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-@@ -925,6 +954,9 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-+ xtensa:Linux:*:*)
-+ echo xtensa-unknown-linux-gnu
-+ exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
-@@ -967,7 +999,7 @@
- LIBC=gnulibc1
- # endif
- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI)
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -977,7 +1009,11 @@
- LIBC=dietlibc
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
-@@ -1179,6 +1215,15 @@
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-diff -urN gtk+2.0-2.11.4.orig/config.sub gtk+2.0-2.11.4/config.sub
---- gtk+2.0-2.11.4.orig/config.sub 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.4/config.sub 2007-04-20 04:09:10.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-11'
-+timestamp='2007-01-18'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -240,15 +241,16 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -268,26 +270,25 @@
- | mn10200 | mn10300 \
- | mt \
- | msp430 \
-+ | nios | nios2 \
- | ns16k | ns32k \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-- m32c)
-- basic_machine=$basic_machine-unknown
-- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-@@ -317,18 +318,18 @@
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -350,29 +351,28 @@
- | mmix-* \
- | mt-* \
- | msp430-* \
-+ | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-- m32c-*)
-- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -818,6 +818,12 @@
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -904,6 +910,10 @@
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -915,6 +925,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1120,7 +1133,7 @@
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1193,7 +1206,8 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-@@ -1208,7 +1222,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1360,6 +1374,12 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1369,9 +1389,9 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1397,6 +1417,9 @@
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-diff -urN gtk+2.0-2.11.4.orig/configure gtk+2.0-2.11.4/configure
---- gtk+2.0-2.11.4.orig/configure 2007-06-19 17:29:01.000000000 +0200
-+++ gtk+2.0-2.11.4/configure 2007-06-19 21:20:27.000000000 +0200
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/configure gtk+2.0-2.11.5/configure
+--- gtk+2.0-2.11.5.orig/configure 2007-07-02 19:40:30.000000000 +0200
++++ gtk+2.0-2.11.5/configure 2007-07-03 11:36:32.000000000 +0200
@@ -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.4.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.11.4.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.5.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -763,7 +376,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -21,10 +22,13 @@
+@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -780,7 +393,7 @@
# PATH needs CR
-@@ -217,7 +221,7 @@
+@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -789,7 +402,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
-@@ -235,7 +239,6 @@
+@@ -235,7 +239,6 @@ IFS=$as_save_IFS
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
@@ -797,7 +410,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -244,10 +247,12 @@
+@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -813,7 +426,7 @@
:
_ASEOF
-@@ -255,7 +260,6 @@
+@@ -255,7 +260,6 @@ _ASEOF
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
@@ -821,7 +434,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -264,10 +268,12 @@
+@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -837,7 +450,7 @@
:
(as_func_return () {
-@@ -514,19 +520,28 @@
+@@ -514,19 +520,28 @@ else
as_mkdir_p=false
fi
@@ -877,7 +490,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -721,36 +736,36 @@
+@@ -721,36 +736,36 @@ ac_unique_file="gdk/gdktypes.h"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -924,24 +537,24 @@
# include <unistd.h>
#endif"
-@@ -848,6 +863,8 @@
+@@ -848,6 +863,8 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
+ENABLE_STATIC_TRUE
+ENABLE_STATIC_FALSE
- GREP
- EGREP
- LN_S
-@@ -1047,6 +1064,7 @@
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -1051,6 +1068,7 @@ target_alias
CC
CFLAGS
LDFLAGS
+LIBS
CPPFLAGS
- CPP
CXX
-@@ -1164,10 +1182,10 @@
+ CXXFLAGS
+@@ -1168,10 +1186,10 @@ do
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -954,7 +567,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1183,10 +1201,10 @@
+@@ -1187,10 +1205,10 @@ do
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -967,7 +580,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1380,19 +1398,19 @@
+@@ -1384,19 +1402,19 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -991,7 +604,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1667,7 +1685,7 @@
+@@ -1671,7 +1689,7 @@ Optional Features:
--disable-modules disable dynamic module loading
--enable-test-print-backend
build test print backend
@@ -1000,33 +613,33 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1694,6 +1712,7 @@
+@@ -1698,6 +1716,7 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-@@ -1774,7 +1793,7 @@
+ CXX C++ compiler command
+@@ -1778,7 +1797,7 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.11.4
+ gtk+ configure 2.11.5
-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.
-@@ -1788,7 +1807,7 @@
+@@ -1792,7 +1811,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.11.4, which was
+ It was created by gtk+ $as_me 2.11.5, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2214,7 +2233,7 @@
+@@ -2218,7 +2237,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1035,7 +648,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.
-@@ -2348,7 +2367,7 @@
+@@ -2352,7 +2371,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1044,7 +657,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2477,7 +2496,7 @@
+@@ -2481,7 +2500,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1053,7 +666,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2517,7 +2536,7 @@
+@@ -2521,7 +2540,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1062,7 +675,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2758,7 +2777,7 @@
+@@ -2762,7 +2781,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1071,7 +684,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2798,7 +2817,7 @@
+@@ -2802,7 +2821,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1080,7 +693,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2855,7 +2874,7 @@
+@@ -2859,7 +2878,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1089,7 +702,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2896,7 +2915,7 @@
+@@ -2900,7 +2919,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1098,7 +711,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2954,7 +2973,7 @@
+@@ -2958,7 +2977,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1107,7 +720,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
-@@ -2998,7 +3017,7 @@
+@@ -3002,7 +3021,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1116,7 +729,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3139,7 +3158,7 @@
+@@ -3143,7 +3162,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -1125,7 +738,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3167,6 +3186,12 @@
+@@ -3171,6 +3190,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -1138,7 +751,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3178,8 +3203,6 @@
+@@ -3182,8 +3207,6 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
@@ -1147,7 +760,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3357,27 +3380,10 @@
+@@ -3361,27 +3384,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1179,7 +792,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3432,27 +3438,10 @@
+@@ -3436,27 +3442,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1211,7 +824,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3487,27 +3476,10 @@
+@@ -3491,27 +3480,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1243,7 +856,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3543,27 +3515,10 @@
+@@ -3547,27 +3519,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1275,7 +888,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3679,27 +3634,10 @@
+@@ -3683,27 +3638,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1307,7 +920,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3929,6 +3867,16 @@
+@@ -3933,6 +3871,16 @@ fi
@@ -1321,10 +934,229 @@
+fi
+
+
- if test "$os_win32" = "yes"; then
- if test x$enable_static = xyes -o x$enable_static = x; then
- { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
-@@ -4070,7 +4018,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 +3899,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4012,7 +3960,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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 +4004,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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 +4117,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4244,27 +4175,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4299,27 +4213,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4355,27 +4252,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4547,27 +4427,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4618,27 +4481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ OBJC=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4807,7 +4653,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -1333,7 +1165,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
-@@ -4152,7 +4100,7 @@
+@@ -4889,7 +4735,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -1342,7 +1174,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
-@@ -4458,7 +4406,7 @@
+@@ -5195,7 +5041,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1351,7 +1183,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4512,11 +4460,11 @@
+@@ -5249,11 +5095,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -1365,16 +1197,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
-@@ -4633,7 +4581,7 @@
+@@ -5370,7 +5216,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 4636 "configure"' > conftest.$ac_ext
-+ echo '#line 4584 "configure"' > conftest.$ac_ext
+- echo '#line 5373 "configure"' > conftest.$ac_ext
++ echo '#line 5219 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4757,27 +4705,11 @@
+@@ -5494,27 +5340,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1407,7 +1239,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4786,7 +4718,7 @@
+@@ -5523,7 +5353,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
fi
@@ -1416,7 +1248,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4840,7 +4772,7 @@
+@@ -5577,7 +5407,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1425,7 +1257,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4880,7 +4812,7 @@
+@@ -5617,7 +5447,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1434,7 +1266,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4936,7 +4868,7 @@
+@@ -5673,7 +5503,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1443,7 +1275,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4976,7 +4908,7 @@
+@@ -5713,7 +5543,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1452,7 +1284,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5032,7 +4964,7 @@
+@@ -5769,7 +5599,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1461,7 +1293,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5072,7 +5004,7 @@
+@@ -5809,7 +5639,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1470,7 +1302,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5170,17 +5102,10 @@
+@@ -5907,17 +5737,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1492,7 +1324,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5214,17 +5139,10 @@
+@@ -5951,17 +5774,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1514,7 +1346,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5289,17 +5207,10 @@
+@@ -6026,17 +5842,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1536,7 +1368,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5333,17 +5244,10 @@
+@@ -6070,17 +5879,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1558,7 +1390,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5414,27 +5318,10 @@
+@@ -6151,27 +5953,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1590,7 +1422,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5610,27 +5497,10 @@
+@@ -6347,27 +6132,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1622,7 +1454,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -5693,27 +5563,10 @@
+@@ -6430,27 +6198,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1654,7 +1486,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5749,17 +5602,10 @@
+@@ -6486,17 +6237,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1676,153 +1508,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5851,7 +5697,7 @@
- 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
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5895,7 +5741,7 @@
- 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
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6008,27 +5854,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6083,27 +5912,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6138,27 +5950,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -6194,27 +5989,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_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_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6410,17 +6188,10 @@
+@@ -6613,17 +6357,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1844,7 +1530,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6454,17 +6225,10 @@
+@@ -6657,17 +6394,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1866,7 +1552,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6529,17 +6293,10 @@
+@@ -6732,17 +6462,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1888,7 +1574,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6573,17 +6330,10 @@
+@@ -6776,17 +6499,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1910,7 +1596,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6624,7 +6374,7 @@
+@@ -6826,7 +6542,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -1919,7 +1605,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
-@@ -6642,7 +6392,7 @@
+@@ -6844,7 +6560,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1928,7 +1614,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
-@@ -6668,7 +6418,7 @@
+@@ -6870,7 +6586,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -1937,7 +1623,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
-@@ -6686,7 +6436,7 @@
+@@ -6888,7 +6604,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1946,7 +1632,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6793,27 +6543,10 @@
+@@ -6995,27 +6711,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1978,7 +1664,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6856,27 +6589,10 @@
+@@ -7058,27 +6757,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2010,7 +1696,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7074,7 +6790,7 @@
+@@ -7276,7 +6958,7 @@ hpux*) # Its linker distinguishes data f
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2019,7 +1705,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'"
-@@ -7331,7 +7047,7 @@
+@@ -7533,7 +7215,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2028,7 +1714,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7371,7 +7087,7 @@
+@@ -7573,7 +7255,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2037,7 +1723,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7427,7 +7143,7 @@
+@@ -7629,7 +7311,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2046,7 +1732,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7467,7 +7183,7 @@
+@@ -7669,7 +7351,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2055,7 +1741,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7523,7 +7239,7 @@
+@@ -7725,7 +7407,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2064,7 +1750,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7563,7 +7279,7 @@
+@@ -7765,7 +7447,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2073,21 +1759,21 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7880,11 +7596,11 @@
+@@ -8082,11 +7764,11 @@ else
-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:7883: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7599: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7767: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7887: \$? = $ac_status" >&5
-+ echo "$as_me:7603: \$? = $ac_status" >&5
+- echo "$as_me:8089: \$? = $ac_status" >&5
++ echo "$as_me:7771: \$? = $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.
-@@ -8042,7 +7758,7 @@
+@@ -8244,7 +7926,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-Bstatic'
;;
@@ -2096,35 +1782,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8148,11 +7864,11 @@
+@@ -8350,11 +8032,11 @@ else
-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:8151: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7867: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8353: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8035: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8155: \$? = $ac_status" >&5
-+ echo "$as_me:7871: \$? = $ac_status" >&5
+- echo "$as_me:8357: \$? = $ac_status" >&5
++ echo "$as_me:8039: \$? = $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.
-@@ -8252,11 +7968,11 @@
+@@ -8454,11 +8136,11 @@ else
-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:8255: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7971: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8457: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8139: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8259: \$? = $ac_status" >&5
-+ echo "$as_me:7975: \$? = $ac_status" >&5
+- echo "$as_me:8461: \$? = $ac_status" >&5
++ echo "$as_me:8143: \$? = $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
-@@ -8481,7 +8197,7 @@
+@@ -8683,7 +8365,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -2133,7 +1819,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8507,12 +8223,13 @@
+@@ -8709,12 +8391,13 @@ EOF
$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'
fi
@@ -2148,7 +1834,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8732,27 +8449,11 @@
+@@ -8934,27 +8617,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2181,7 +1867,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8766,7 +8467,7 @@
+@@ -8968,7 +8635,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2190,7 +1876,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8807,27 +8508,11 @@
+@@ -9009,27 +8676,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2223,7 +1909,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8841,7 +8526,7 @@
+@@ -9043,7 +8694,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2232,7 +1918,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8972,7 +8657,7 @@
+@@ -9174,7 +8825,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2241,7 +1927,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9074,7 +8759,7 @@
+@@ -9276,7 +8927,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs=yes
;;
@@ -2250,7 +1936,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9564,18 +9249,6 @@
+@@ -9766,18 +9417,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -2269,7 +1955,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9731,7 +9404,7 @@
+@@ -9933,7 +9572,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -2278,7 +1964,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9745,31 +9418,10 @@
+@@ -9947,31 +9586,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -2286,7 +1972,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 9752 "configure"' > conftest.$ac_ext
+- echo '#line 9954 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2311,7 +1997,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9781,7 +9433,7 @@
+@@ -9983,7 +9601,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2320,7 +2006,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9790,7 +9442,7 @@
+@@ -9992,7 +9610,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2329,7 +2015,7 @@
;;
netbsd*)
-@@ -10110,27 +9762,11 @@
+@@ -10312,27 +9930,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2362,7 +2048,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10139,7 +9775,7 @@
+@@ -10341,7 +9943,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -2371,7 +2057,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10221,27 +9857,11 @@
+@@ -10423,27 +10025,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2404,7 +2090,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10250,7 +9870,7 @@
+@@ -10452,7 +10038,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
fi
@@ -2413,7 +2099,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10300,27 +9920,11 @@
+@@ -10502,27 +10088,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2446,7 +2132,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10329,7 +9933,7 @@
+@@ -10531,7 +10101,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
@@ -2455,7 +2141,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10401,27 +10005,11 @@
+@@ -10603,27 +10173,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2488,7 +2174,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10430,7 +10018,7 @@
+@@ -10632,7 +10186,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
@@ -2497,7 +2183,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10480,27 +10068,11 @@
+@@ -10682,27 +10236,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2530,7 +2216,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10509,7 +10081,7 @@
+@@ -10711,7 +10249,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -2539,7 +2225,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10560,27 +10132,11 @@
+@@ -10762,27 +10300,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2572,7 +2258,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10589,7 +10145,7 @@
+@@ -10791,7 +10313,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
fi
@@ -2581,7 +2267,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10640,27 +10196,11 @@
+@@ -10842,27 +10364,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2614,7 +2300,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10669,7 +10209,7 @@
+@@ -10871,7 +10377,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
fi
@@ -2623,25 +2309,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10725,7 +10265,7 @@
+@@ -10927,7 +10433,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10728 "configure"
-+#line 10268 "configure"
+-#line 10930 "configure"
++#line 10436 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10825,7 +10365,7 @@
+@@ -11027,7 +10533,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10828 "configure"
-+#line 10368 "configure"
+-#line 11030 "configure"
++#line 10536 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11912,27 +11452,11 @@
+@@ -12114,27 +11620,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2674,7 +2360,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -11946,7 +11470,7 @@
+@@ -12148,7 +11638,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2683,7 +2369,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -11988,27 +11512,11 @@
+@@ -12190,27 +11680,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2716,7 +2402,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -12022,7 +11530,7 @@
+@@ -12224,7 +11698,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2725,7 +2411,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12170,7 +11678,7 @@
+@@ -12372,7 +11846,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -2734,7 +2420,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12329,7 +11837,7 @@
+@@ -12531,7 +12005,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -2743,7 +2429,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12431,7 +11939,7 @@
+@@ -12633,7 +12107,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -2752,7 +2438,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=
-@@ -12998,7 +12506,7 @@
+@@ -13200,7 +12674,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2761,7 +2447,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13041,7 +12549,7 @@
+@@ -13243,7 +12717,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2770,7 +2456,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13084,7 +12592,7 @@
+@@ -13286,7 +12760,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2779,35 +2465,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13193,11 +12701,11 @@
+@@ -13395,11 +12869,11 @@ else
-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:13196: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12704: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13398: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12872: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13200: \$? = $ac_status" >&5
-+ echo "$as_me:12708: \$? = $ac_status" >&5
+- echo "$as_me:13402: \$? = $ac_status" >&5
++ echo "$as_me:12876: \$? = $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.
-@@ -13297,11 +12805,11 @@
+@@ -13499,11 +12973,11 @@ else
-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:13300: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12808: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13502: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12976: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13304: \$? = $ac_status" >&5
-+ echo "$as_me:12812: \$? = $ac_status" >&5
+- echo "$as_me:13506: \$? = $ac_status" >&5
++ echo "$as_me:12980: \$? = $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
-@@ -13369,6 +12877,9 @@
+@@ -13571,6 +13045,9 @@ echo $ECHO_N "checking whether the $comp
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'
;;
@@ -2817,7 +2503,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13648,18 +13159,6 @@
+@@ -13850,18 +13327,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -2836,7 +2522,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13815,7 +13314,7 @@
+@@ -14017,7 +13482,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -2845,7 +2531,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13829,31 +13328,10 @@
+@@ -14031,31 +13496,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -2853,7 +2539,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 13836 "configure"' > conftest.$ac_ext
+- echo '#line 14038 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2878,7 +2564,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13865,7 +13343,7 @@
+@@ -14067,7 +13511,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2887,7 +2573,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13874,7 +13352,7 @@
+@@ -14076,7 +13520,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2896,7 +2582,7 @@
;;
netbsd*)
-@@ -14782,7 +14260,7 @@
+@@ -14984,7 +14428,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -2905,35 +2591,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -14888,11 +14366,11 @@
+@@ -15090,11 +14534,11 @@ else
-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:14891: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15093: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14537: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14895: \$? = $ac_status" >&5
-+ echo "$as_me:14373: \$? = $ac_status" >&5
+- echo "$as_me:15097: \$? = $ac_status" >&5
++ echo "$as_me:14541: \$? = $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.
-@@ -14992,11 +14470,11 @@
+@@ -15194,11 +14638,11 @@ else
-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:14995: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15197: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14641: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14999: \$? = $ac_status" >&5
-+ echo "$as_me:14477: \$? = $ac_status" >&5
+- echo "$as_me:15201: \$? = $ac_status" >&5
++ echo "$as_me:14645: \$? = $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
-@@ -15221,7 +14699,7 @@
+@@ -15423,7 +14867,7 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -2942,7 +2628,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15247,12 +14725,13 @@
+@@ -15449,12 +14893,13 @@ EOF
$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'
fi
@@ -2957,7 +2643,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15462,27 +14941,11 @@
+@@ -15664,27 +15109,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2990,7 +2676,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15496,7 +14959,7 @@
+@@ -15698,7 +15127,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2999,7 +2685,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15527,27 +14990,11 @@
+@@ -15729,27 +15158,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3032,7 +2718,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15561,7 +15008,7 @@
+@@ -15763,7 +15176,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -3041,7 +2727,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15692,7 +15139,7 @@
+@@ -15894,7 +15307,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3050,7 +2736,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15794,7 +15241,7 @@
+@@ -15996,7 +15409,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_F77=yes
;;
@@ -3059,7 +2745,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
-@@ -16284,18 +15731,6 @@
+@@ -16486,18 +15899,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -3078,7 +2764,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16451,7 +15886,7 @@
+@@ -16653,7 +16054,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -3087,7 +2773,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16465,31 +15900,10 @@
+@@ -16667,31 +16068,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -3095,7 +2781,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 16472 "configure"' > conftest.$ac_ext
+- echo '#line 16674 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -3120,7 +2806,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16501,7 +15915,7 @@
+@@ -16703,7 +16083,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3129,7 +2815,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16510,7 +15924,7 @@
+@@ -16712,7 +16092,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3138,21 +2824,21 @@
;;
netbsd*)
-@@ -17243,11 +16657,11 @@
+@@ -17445,11 +16825,11 @@ else
-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:17246: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16660: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17448: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17250: \$? = $ac_status" >&5
-+ echo "$as_me:16664: \$? = $ac_status" >&5
+- echo "$as_me:17452: \$? = $ac_status" >&5
++ echo "$as_me:16832: \$? = $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.
-@@ -17405,7 +16819,7 @@
+@@ -17607,7 +16987,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -3161,35 +2847,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17511,11 +16925,11 @@
+@@ -17713,11 +17093,11 @@ else
-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:17514: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16928: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17716: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17518: \$? = $ac_status" >&5
-+ echo "$as_me:16932: \$? = $ac_status" >&5
+- echo "$as_me:17720: \$? = $ac_status" >&5
++ echo "$as_me:17100: \$? = $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.
-@@ -17615,11 +17029,11 @@
+@@ -17817,11 +17197,11 @@ else
-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:17618: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17032: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17820: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17622: \$? = $ac_status" >&5
-+ echo "$as_me:17036: \$? = $ac_status" >&5
+- echo "$as_me:17824: \$? = $ac_status" >&5
++ echo "$as_me:17204: \$? = $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
-@@ -17844,7 +17258,7 @@
+@@ -18046,7 +17426,7 @@ EOF
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -3198,7 +2884,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17870,12 +17284,13 @@
+@@ -18072,12 +17452,13 @@ EOF
$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'
fi
@@ -3213,7 +2899,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18095,27 +17510,11 @@
+@@ -18297,27 +17678,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3246,7 +2932,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18129,7 +17528,7 @@
+@@ -18331,7 +17696,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -3255,7 +2941,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18170,27 +17569,11 @@
+@@ -18372,27 +17737,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3288,7 +2974,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18204,7 +17587,7 @@
+@@ -18406,7 +17755,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -3297,7 +2983,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18335,7 +17718,7 @@
+@@ -18537,7 +17886,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3306,7 +2992,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18437,7 +17820,7 @@
+@@ -18639,7 +17988,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_GCJ=yes
;;
@@ -3315,7 +3001,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
-@@ -18927,18 +18310,6 @@
+@@ -19129,18 +18478,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -3334,7 +3020,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19094,7 +18465,7 @@
+@@ -19296,7 +18633,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -3343,7 +3029,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19108,31 +18479,10 @@
+@@ -19310,31 +18647,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -3351,7 +3037,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19115 "configure"' > conftest.$ac_ext
+- echo '#line 19317 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -3376,7 +3062,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19144,7 +18494,7 @@
+@@ -19346,7 +18662,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3385,7 +3071,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19153,7 +18503,7 @@
+@@ -19355,7 +18671,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3394,7 +3080,7 @@
;;
netbsd*)
-@@ -20386,27 +19736,10 @@
+@@ -20588,27 +19904,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3426,7 +3112,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20430,27 +19763,10 @@
+@@ -20632,27 +19931,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3458,7 +3144,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20478,7 +19794,6 @@
+@@ -20680,7 +19962,6 @@ if test "${ac_cv_sys_file_offset_bits+se
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -3466,7 +3152,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20515,28 +19830,11 @@
+@@ -20717,28 +19998,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3500,7 +3186,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20582,27 +19880,10 @@
+@@ -20784,27 +20048,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3532,7 +3218,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20612,26 +19893,28 @@
+@@ -20814,26 +20061,28 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3567,7 +3253,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20668,28 +19951,11 @@
+@@ -20870,28 +20119,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3601,7 +3287,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20735,27 +20001,10 @@
+@@ -20937,27 +20169,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3633,7 +3319,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20765,19 +20014,22 @@
+@@ -20967,19 +20182,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3660,7 +3346,7 @@
fi
-@@ -20806,7 +20058,7 @@
+@@ -21008,7 +20226,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3669,7 +3355,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
-@@ -20927,7 +20179,7 @@
+@@ -21129,7 +20347,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3678,7 +3364,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -20967,7 +20219,7 @@
+@@ -21169,7 +20387,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3687,7 +3373,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21027,7 +20279,7 @@
+@@ -21229,7 +20447,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3696,7 +3382,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21259,27 +20511,11 @@
+@@ -21461,27 +20679,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3729,7 +3415,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21288,7 +20524,7 @@
+@@ -21490,7 +20692,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -3738,7 +3424,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21388,27 +20624,10 @@
+@@ -21590,27 +20792,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3770,7 +3456,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21471,7 +20690,7 @@
+@@ -21673,7 +20858,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3779,7 +3465,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.
-@@ -21635,7 +20854,7 @@
+@@ -21837,7 +21022,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3788,7 +3474,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
-@@ -21678,7 +20897,7 @@
+@@ -21880,7 +21065,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3797,7 +3483,25 @@
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
-@@ -21920,7 +21139,7 @@
+@@ -22026,7 +21211,7 @@ Alternatively, you may set the environme
+ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ 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 +21221,7 @@ Alternatively, you may set the environme
+ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22122,7 +21307,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3806,7 +3510,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
-@@ -21963,7 +21182,7 @@
+@@ -22165,7 +21350,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3815,7 +3519,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22063,27 +21282,11 @@
+@@ -22265,27 +21450,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3848,7 +3552,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22092,7 +21295,7 @@
+@@ -22294,7 +21463,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3857,7 +3561,49 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22141,27 +21344,11 @@
+@@ -22375,27 +21544,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -22404,7 +21557,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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'}'`
+@@ -22453,27 +21606,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3890,7 +3636,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22170,7 +21357,7 @@
+@@ -22482,7 +21619,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3899,7 +3645,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22216,27 +21403,11 @@
+@@ -22528,27 +21665,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3932,7 +3678,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22245,7 +21416,7 @@
+@@ -22557,7 +21678,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3941,7 +3687,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22291,27 +21462,11 @@
+@@ -22603,27 +21724,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3974,7 +3720,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22320,7 +21475,7 @@
+@@ -22632,7 +21737,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3983,7 +3729,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22366,27 +21521,11 @@
+@@ -22678,27 +21783,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4016,7 +3762,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22395,7 +21534,7 @@
+@@ -22707,7 +21796,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -4025,7 +3771,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22441,27 +21580,11 @@
+@@ -22753,27 +21842,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4058,7 +3804,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22470,7 +21593,7 @@
+@@ -22782,7 +21855,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -4067,7 +3813,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22528,27 +21651,10 @@
+@@ -22840,27 +21913,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4099,7 +3845,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22584,17 +21690,10 @@
+@@ -22896,17 +21952,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4121,7 +3867,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22692,27 +21791,11 @@
+@@ -23004,27 +22053,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4154,7 +3900,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22721,7 +21804,7 @@
+@@ -23033,7 +22066,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
am_cv_val_LC_MESSAGES=no
fi
@@ -4163,7 +3909,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -22777,27 +21860,10 @@
+@@ -23089,27 +22122,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4195,7 +3941,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22833,17 +21899,10 @@
+@@ -23145,17 +22161,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4217,7 +3963,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22939,27 +21998,11 @@
+@@ -23251,27 +22260,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4250,7 +3996,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22968,7 +22011,7 @@
+@@ -23280,7 +22273,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_ngettext_libc=no
fi
@@ -4259,7 +4005,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23011,27 +22054,11 @@
+@@ -23323,27 +22316,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4292,7 +4038,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23040,7 +22067,7 @@
+@@ -23352,7 +22329,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_dgettext_libc=no
fi
@@ -4301,7 +4047,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23116,27 +22143,11 @@
+@@ -23428,27 +22405,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4334,7 +4080,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23145,7 +22156,7 @@
+@@ -23457,7 +22418,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4343,7 +4089,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23210,27 +22221,11 @@
+@@ -23522,27 +22483,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4376,7 +4122,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23239,7 +22234,7 @@
+@@ -23551,7 +22496,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -4385,7 +4131,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23288,27 +22283,11 @@
+@@ -23600,27 +22545,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4418,7 +4164,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23317,7 +22296,7 @@
+@@ -23629,7 +22558,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -4427,7 +4173,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23366,27 +22345,11 @@
+@@ -23678,27 +22607,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4460,7 +4206,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23395,7 +22358,7 @@
+@@ -23707,7 +22620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dgettext=no
fi
@@ -4469,7 +4215,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23457,27 +22420,11 @@
+@@ -23769,27 +22682,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4502,7 +4248,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23486,7 +22433,7 @@
+@@ -23798,7 +22695,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -4511,7 +4257,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23535,27 +22482,11 @@
+@@ -23847,27 +22744,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4544,7 +4290,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23564,7 +22495,7 @@
+@@ -23876,7 +22757,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dcgettext=no
fi
@@ -4553,7 +4299,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23659,27 +22590,11 @@
+@@ -23971,27 +22852,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4586,7 +4332,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23688,7 +22603,7 @@
+@@ -24000,7 +22865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4595,7 +4341,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23835,27 +22750,11 @@
+@@ -24147,27 +23012,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4628,7 +4374,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23864,7 +22763,7 @@
+@@ -24176,7 +23025,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4637,7 +4383,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23925,7 +22824,7 @@
+@@ -24237,7 +23086,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4646,7 +4392,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
-@@ -24013,27 +22912,11 @@
+@@ -24325,27 +23174,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4679,7 +4425,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24105,27 +22988,11 @@
+@@ -24417,27 +23250,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4712,7 +4458,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24134,7 +23001,7 @@
+@@ -24446,7 +23263,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -4721,7 +4467,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24155,7 +23022,7 @@
+@@ -24467,7 +23284,7 @@ fi
esac
fi
@@ -4730,7 +4476,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24463,27 +23330,10 @@
+@@ -24775,27 +23592,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4762,7 +4508,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24520,27 +23370,10 @@
+@@ -24832,27 +23632,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4794,7 +4540,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24614,7 +23447,7 @@
+@@ -24926,7 +23709,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4803,7 +4549,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
-@@ -24657,7 +23490,7 @@
+@@ -24969,7 +23752,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4812,7 +4558,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
-@@ -24926,27 +23759,11 @@
+@@ -25238,27 +24021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4845,7 +4591,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"
-@@ -24964,7 +23781,7 @@
+@@ -25276,7 +24043,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -4854,7 +4600,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25068,27 +23885,11 @@
+@@ -25380,27 +24147,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4887,7 +4633,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25097,7 +23898,7 @@
+@@ -25409,7 +24160,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4896,7 +4642,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25152,27 +23953,10 @@
+@@ -25464,27 +24215,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4928,7 +4674,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25208,17 +23992,10 @@
+@@ -25520,17 +24254,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4950,7 +4696,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25324,27 +24101,10 @@
+@@ -25636,27 +24363,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4982,7 +4728,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25380,17 +24140,10 @@
+@@ -25692,17 +24402,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5004,7 +4750,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25496,27 +24249,10 @@
+@@ -25808,27 +24511,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5036,7 +4782,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25552,17 +24288,10 @@
+@@ -25864,17 +24550,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5058,7 +4804,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25668,27 +24397,10 @@
+@@ -25980,27 +24659,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5090,7 +4836,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25724,17 +24436,10 @@
+@@ -26036,17 +24698,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5112,7 +4858,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25834,27 +24539,10 @@
+@@ -26146,27 +24801,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5144,7 +4890,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25919,27 +24607,10 @@
+@@ -26231,27 +24869,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5176,7 +4922,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26094,10 +24765,10 @@
+@@ -26406,10 +25027,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -5190,7 +4936,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26106,11 +24777,11 @@
+@@ -26418,11 +25039,11 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -5206,7 +4952,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26137,7 +24808,7 @@
+@@ -26449,7 +25070,7 @@ main ()
const int foo = 10;
if (!foo) return 0;
}
@@ -5215,7 +4961,7 @@
#endif
;
-@@ -26157,27 +24828,10 @@
+@@ -26469,27 +25090,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5247,7 +4993,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26235,27 +24889,10 @@
+@@ -26547,27 +25151,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5279,7 +5025,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26314,27 +24951,10 @@
+@@ -26626,27 +25213,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5311,7 +5057,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26370,17 +24990,10 @@
+@@ -26682,17 +25252,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5333,7 +5079,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26511,27 +25124,11 @@
+@@ -26823,27 +25386,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5366,7 +5112,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26540,7 +25137,7 @@
+@@ -26852,7 +25399,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5375,7 +5121,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26597,21 +25194,21 @@
+@@ -26909,21 +25456,21 @@ $ac_includes_default
#include <fcntl.h>
#include <sys/mman.h>
@@ -5401,7 +5147,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -26808,27 +25405,11 @@
+@@ -27120,27 +25667,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5434,7 +5180,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26837,7 +25418,7 @@
+@@ -27149,7 +25680,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5443,7 +5189,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26918,27 +25499,11 @@
+@@ -27230,27 +25761,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5476,7 +5222,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26947,7 +25512,7 @@
+@@ -27259,7 +25774,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5485,7 +5231,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27031,27 +25596,10 @@
+@@ -27343,27 +25858,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5517,7 +5263,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27120,17 +25668,10 @@
+@@ -27432,17 +25930,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5539,7 +5285,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27173,17 +25714,10 @@
+@@ -27485,17 +25976,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5561,7 +5307,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27268,27 +25802,11 @@
+@@ -27580,27 +26064,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5594,7 +5340,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27297,7 +25815,7 @@
+@@ -27609,7 +26077,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_iswalnum=no
fi
@@ -5603,7 +5349,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27347,27 +25865,11 @@
+@@ -27659,27 +26127,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5636,7 +5382,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27376,7 +25878,7 @@
+@@ -27688,7 +26140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_w_iswalnum=no
fi
@@ -5645,7 +5391,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27435,27 +25937,11 @@
+@@ -27747,27 +26199,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5678,7 +5424,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27464,7 +25950,7 @@
+@@ -27776,7 +26212,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gdk_working_wctype=no
fi
@@ -5687,7 +5433,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27503,17 +25989,10 @@
+@@ -27815,17 +26251,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5709,7 +5455,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27573,27 +26052,10 @@
+@@ -27885,27 +26314,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5741,7 +5487,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27629,17 +26091,10 @@
+@@ -27941,17 +26353,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5763,7 +5509,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27770,27 +26225,11 @@
+@@ -28082,27 +26487,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5796,7 +5542,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27799,7 +26238,7 @@
+@@ -28111,7 +26500,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5805,7 +5551,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27947,27 +26386,11 @@
+@@ -28259,27 +26648,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5838,7 +5584,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27976,7 +26399,7 @@
+@@ -28288,7 +26661,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
@@ -5847,7 +5593,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28017,27 +26440,10 @@
+@@ -28329,27 +26702,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5879,7 +5625,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28073,17 +26479,10 @@
+@@ -28385,17 +26741,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5901,7 +5647,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28188,27 +26587,11 @@
+@@ -28500,27 +26849,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5934,7 +5680,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28217,7 +26600,7 @@
+@@ -28529,7 +26862,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -5943,7 +5689,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28258,27 +26641,10 @@
+@@ -28570,27 +26903,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5975,7 +5721,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28314,17 +26680,10 @@
+@@ -28626,17 +26942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5997,7 +5743,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28429,27 +26788,11 @@
+@@ -28741,27 +27050,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6030,7 +5776,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28458,7 +26801,7 @@
+@@ -28770,7 +27063,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -6039,7 +5785,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28499,27 +26842,10 @@
+@@ -28811,27 +27104,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6071,7 +5817,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28555,17 +26881,10 @@
+@@ -28867,17 +27143,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6093,7 +5839,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28693,27 +27012,11 @@
+@@ -29005,27 +27274,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6126,7 +5872,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28722,7 +27025,7 @@
+@@ -29034,7 +27287,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -6135,7 +5881,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28763,17 +27066,10 @@
+@@ -29075,17 +27328,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6157,7 +5903,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28829,27 +27125,11 @@
+@@ -29141,27 +27387,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6190,7 +5936,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28858,7 +27138,7 @@
+@@ -29170,7 +27400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -6199,7 +5945,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28947,27 +27227,11 @@
+@@ -29259,27 +27489,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6232,7 +5978,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28976,7 +27240,7 @@
+@@ -29288,7 +27502,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_png_png_read_info=no
fi
@@ -6241,7 +5987,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29017,27 +27281,10 @@
+@@ -29329,27 +27543,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6273,7 +6019,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29073,17 +27320,10 @@
+@@ -29385,17 +27582,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6295,7 +6041,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29180,27 +27420,10 @@
+@@ -29492,27 +27682,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6327,7 +6073,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29493,27 +27716,10 @@
+@@ -29805,27 +27978,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6359,7 +6105,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29570,27 +27776,10 @@
+@@ -29882,27 +28038,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6391,7 +6137,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -29693,27 +27882,10 @@
+@@ -30005,27 +28144,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6423,7 +6169,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29749,17 +27921,10 @@
+@@ -30061,17 +28183,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6445,7 +6191,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29855,27 +28020,10 @@
+@@ -30167,27 +28282,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6477,7 +6223,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29911,17 +28059,10 @@
+@@ -30223,17 +28321,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6499,7 +6245,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30031,27 +28172,11 @@
+@@ -30343,27 +28434,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6532,7 +6278,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30060,7 +28185,7 @@
+@@ -30372,7 +28447,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_mlib_mlib_ImageSetStruct=no
fi
@@ -6541,7 +6287,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30125,27 +28250,11 @@
+@@ -30437,27 +28512,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6574,7 +6320,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30154,7 +28263,7 @@
+@@ -30466,7 +28525,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
fi
@@ -6583,7 +6329,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30291,7 +28400,7 @@
+@@ -30603,7 +28662,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6592,7 +6338,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
-@@ -30332,7 +28441,7 @@
+@@ -30644,7 +28703,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6601,7 +6347,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
-@@ -30562,17 +28671,10 @@
+@@ -30874,17 +28933,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6623,7 +6369,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -30595,7 +28697,7 @@
+@@ -30907,7 +28959,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -6632,7 +6378,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30624,27 +28726,11 @@
+@@ -30936,27 +28988,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6665,7 +6411,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -30657,7 +28743,7 @@
+@@ -30969,7 +29005,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -6674,7 +6420,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -30665,7 +28751,7 @@
+@@ -30977,7 +29013,7 @@ do
done
fi
@@ -6683,7 +6429,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -30720,12 +28806,12 @@
+@@ -31032,12 +29068,12 @@ else
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 . . . .
@@ -6701,7 +6447,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30753,44 +28839,20 @@
+@@ -31065,44 +29101,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6755,7 +6501,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30818,48 +28880,30 @@
+@@ -31130,48 +29142,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6821,7 +6567,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -30908,27 +28952,11 @@
+@@ -31220,27 +29214,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6854,7 +6600,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -30976,27 +29004,11 @@
+@@ -31288,27 +29266,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6887,7 +6633,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31005,7 +29017,7 @@
+@@ -31317,7 +29279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -6896,7 +6642,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31058,27 +29070,11 @@
+@@ -31370,27 +29332,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6929,7 +6675,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31087,7 +29083,7 @@
+@@ -31399,7 +29345,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -6938,7 +6684,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31100,7 +29096,7 @@
+@@ -31412,7 +29358,7 @@ fi
fi
fi
@@ -6947,7 +6693,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -31175,27 +29171,11 @@
+@@ -31487,27 +29433,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6980,7 +6726,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31204,7 +29184,7 @@
+@@ -31516,7 +29446,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_gethostbyname=no
fi
@@ -6989,7 +6735,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -31253,27 +29233,11 @@
+@@ -31565,27 +29495,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7022,7 +6768,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31282,7 +29246,7 @@
+@@ -31594,7 +29508,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -7031,7 +6777,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31335,27 +29299,11 @@
+@@ -31647,27 +29561,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7064,7 +6810,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31364,7 +29312,7 @@
+@@ -31676,7 +29574,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -7073,7 +6819,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31447,27 +29395,11 @@
+@@ -31759,27 +29657,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7106,7 +6852,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31476,7 +29408,7 @@
+@@ -31788,7 +29670,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_connect=no
fi
@@ -7115,7 +6861,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -31525,27 +29457,11 @@
+@@ -31837,27 +29719,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7148,7 +6894,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31554,7 +29470,7 @@
+@@ -31866,7 +29732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_socket_connect=no
fi
@@ -7157,7 +6903,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31630,27 +29546,11 @@
+@@ -31942,27 +29808,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7190,7 +6936,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31659,7 +29559,7 @@
+@@ -31971,7 +29821,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_remove=no
fi
@@ -7199,7 +6945,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -31708,27 +29608,11 @@
+@@ -32020,27 +29870,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7232,7 +6978,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31737,7 +29621,7 @@
+@@ -32049,7 +29883,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_posix_remove=no
fi
@@ -7241,7 +6987,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31813,27 +29697,11 @@
+@@ -32125,27 +29959,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7274,7 +7020,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31842,7 +29710,7 @@
+@@ -32154,7 +29972,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shmat=no
fi
@@ -7283,17 +7029,94 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -31872,46 +29740,30 @@
- char shmat ();
- int
- main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -32203,27 +30021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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_lib_ipc_shmat=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32232,7 +30034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_ipc_shmat=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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32296,27 +30098,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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_lib_ICE_IceConnectionNumber=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32325,7 +30111,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_ICE_IceConnectionNumber=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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32416,39 +30202,23 @@ return XOpenDisplay ();
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7319,13 +7142,6 @@
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
-+{
-+return shmat ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7345,11 +7161,485 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -31920,7 +29772,7 @@
- ac_cv_lib_ipc_shmat=no
+ ac_cv_func_XOpenDisplay=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32457,7 +30227,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -32533,27 +30303,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -32562,7 +30316,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -32638,27 +30392,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -32667,7 +30405,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -32713,27 +30451,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -32769,27 +30490,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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; }
+
+@@ -32883,27 +30587,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -32912,7 +30600,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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'}'`
+@@ -32996,27 +30684,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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_XAddConnectionWatch=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33025,7 +30697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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_XAddConnectionWatch" >&5
+@@ -33126,27 +30798,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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_XkbQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33155,7 +30811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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_XkbQueryExtension" >&5
+@@ -33237,27 +30893,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -33266,7 +30906,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -33346,27 +30986,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -33375,7 +30999,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -33409,27 +31033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -33525,27 +31132,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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
+@@ -33554,7 +31145,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 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
+@@ -33605,27 +31196,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 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_lib_XextSam_XShmAttach=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33634,7 +31209,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_lib_XextSam_XShmAttach=no
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -7357,565 +7647,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31984,27 +29836,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_lib_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32013,7 +29849,7 @@
- ac_cv_lib_ICE_IceConnectionNumber=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
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -32116,27 +29952,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
-@@ -32145,7 +29965,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
-@@ -32221,27 +30041,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
-@@ -32250,7 +30054,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
-@@ -32326,27 +30130,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
-@@ -32355,7 +30143,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
-@@ -32401,27 +30189,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
-@@ -32457,27 +30228,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; }
-
-@@ -32571,27 +30325,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
-@@ -32600,7 +30338,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'}'`
-@@ -32684,27 +30422,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_XAddConnectionWatch=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32713,7 +30435,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_XAddConnectionWatch" >&5
-@@ -32814,27 +30536,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_XkbQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32843,7 +30549,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_XkbQueryExtension" >&5
-@@ -32925,27 +30631,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
-@@ -32954,7 +30644,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
-@@ -33034,27 +30724,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
-@@ -33063,7 +30737,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
-@@ -33097,27 +30771,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
-@@ -33213,27 +30870,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
-@@ -33242,7 +30883,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
-@@ -33293,27 +30934,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_lib_XextSam_XShmAttach=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33322,7 +30947,7 @@
- ac_cv_lib_XextSam_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
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -33376,27 +31001,10 @@
+@@ -33688,27 +31263,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7947,7 +7679,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33432,17 +31040,10 @@
+@@ -33744,17 +31302,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7969,7 +7701,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33540,27 +31141,10 @@
+@@ -33852,27 +31403,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8001,7 +7733,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33596,17 +31180,10 @@
+@@ -33908,17 +31442,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8023,7 +7755,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33716,27 +31293,10 @@
+@@ -34028,27 +31555,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8055,7 +7787,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33833,27 +31393,11 @@
+@@ -34145,27 +31655,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8088,7 +7820,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33862,7 +31406,7 @@
+@@ -34174,7 +31668,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XineramaGetInfo=no
fi
@@ -8097,7 +7829,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -33896,27 +31440,10 @@
+@@ -34208,27 +31702,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8129,7 +7861,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34007,27 +31534,11 @@
+@@ -34319,27 +31796,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8162,7 +7894,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34036,7 +31547,7 @@
+@@ -34348,7 +31809,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -8171,7 +7903,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34071,27 +31582,10 @@
+@@ -34383,27 +31844,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8203,7 +7935,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34223,27 +31717,11 @@
+@@ -34535,27 +31979,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8236,7 +7968,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34252,7 +31730,7 @@
+@@ -34564,7 +31992,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -8245,7 +7977,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34287,27 +31765,10 @@
+@@ -34599,27 +32027,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8277,7 +8009,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34520,8 +31981,18 @@
+@@ -34832,8 +32243,18 @@ echo $ECHO_N "checking for DirectFB... $
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; }
@@ -8298,7 +8030,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -34630,27 +32101,11 @@
+@@ -34942,27 +32363,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8331,7 +8063,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34665,7 +32120,7 @@
+@@ -34977,7 +32382,7 @@ echo "$as_me: error:
{ (exit 1); exit 1; }; }
fi
@@ -8340,7 +8072,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34673,7 +32128,7 @@
+@@ -34985,7 +32390,7 @@ fi
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -8349,7 +8081,7 @@
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
-@@ -34761,27 +32216,11 @@
+@@ -35073,27 +32478,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8382,7 +8114,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34796,7 +32235,7 @@
+@@ -35108,7 +32497,7 @@ echo "$as_me: error:
{ (exit 1); exit 1; }; }
fi
@@ -8391,7 +8123,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34852,7 +32291,7 @@
+@@ -35164,7 +32553,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8400,7 +8132,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
-@@ -34944,27 +32383,10 @@
+@@ -35256,27 +32645,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8432,7 +8164,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35000,17 +32422,10 @@
+@@ -35312,17 +32684,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8454,7 +8186,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35113,27 +32528,10 @@
+@@ -35425,27 +32790,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8486,7 +8218,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35169,17 +32567,10 @@
+@@ -35481,17 +32829,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8508,7 +8240,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35338,7 +32729,7 @@
+@@ -35650,7 +32991,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8517,7 +8249,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
-@@ -35423,7 +32814,7 @@
+@@ -35735,7 +33076,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8526,7 +8258,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35483,7 +32874,7 @@
+@@ -35795,7 +33136,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8535,7 +8267,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
-@@ -35552,7 +32943,7 @@
+@@ -35864,7 +33205,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8544,7 +8276,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
-@@ -35753,6 +33144,13 @@
+@@ -36065,6 +33406,13 @@ echo "$as_me: error: conditional \"am__f
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8558,7 +8290,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
-@@ -36113,7 +33511,8 @@
+@@ -36439,7 +33787,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
@@ -8568,7 +8300,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -36122,10 +33521,13 @@
+@@ -36448,10 +33797,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -8585,7 +8317,7 @@
# PATH needs CR
-@@ -36349,19 +33751,28 @@
+@@ -36675,19 +34027,28 @@ else
as_mkdir_p=false
fi
@@ -8625,16 +8357,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'"
-@@ -36377,7 +33788,7 @@
+@@ -36703,7 +34064,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.11.4, which was
+ This file was extended by gtk+ $as_me 2.11.5, 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
-@@ -36406,7 +33817,7 @@
+@@ -36732,7 +34093,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -8643,67 +8375,130 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -36430,7 +33841,7 @@
+@@ -36756,7 +34117,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gtk+ config.status 2.11.4
+ gtk+ config.status 2.11.5
-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.
-@@ -36796,9 +34207,9 @@
+@@ -37122,9 +34483,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim
+ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim
- GREP!$GREP$ac_delim
--EGREP!$EGREP$ac_delim
--LN_S!$LN_S$ac_delim
+ CXX!$CXX$ac_delim
+-CXXFLAGS!$CXXFLAGS$ac_delim
+-ac_ct_CXX!$ac_ct_CXX$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36840,6 +34251,8 @@
+@@ -37166,6 +34527,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+EGREP!$EGREP$ac_delim
-+LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
-@@ -36935,8 +34348,6 @@
- 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
--INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
+ CXXDEPMODE!$CXXDEPMODE$ac_delim
+ am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+ am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+@@ -37261,8 +34624,6 @@ INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_de
+ 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_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
-@@ -36978,6 +34389,8 @@
+@@ -37304,6 +34665,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
-+INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim
- INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim
- INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim
- INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim
-@@ -37072,7 +34485,7 @@
- LTLIBOBJS!$LTLIBOBJS$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
+@@ -37399,10 +34762,9 @@ 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` = 92; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
+- 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
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -urN gtk+2.0-2.11.4.orig/contrib/Makefile.in gtk+2.0-2.11.4/contrib/Makefile.in
---- gtk+2.0-2.11.4.orig/contrib/Makefile.in 2007-06-19 17:28:56.000000000 +0200
-+++ gtk+2.0-2.11.4/contrib/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -90,6 +90,8 @@
+@@ -37438,6 +34800,50 @@ CEOF$ac_eof
+ _ACEOF
+
+
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++ cat >conf$$subs.sed <<_ACEOF
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; 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
+@@ -37681,7 +35087,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+ 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"; } &&
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/contrib/Makefile.in gtk+2.0-2.11.5/contrib/Makefile.in
+--- gtk+2.0-2.11.5.orig/contrib/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/contrib/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8712,10 +8507,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.4/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.11.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-19 17:28:56.000000000 +0200
-+++ gtk+2.0-2.11.4/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.5/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.11.5.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8724,10 +8519,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/demos/Makefile.in gtk+2.0-2.11.4/demos/Makefile.in
---- gtk+2.0-2.11.4.orig/demos/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/demos/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -90,6 +90,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/demos/Makefile.in gtk+2.0-2.11.5/demos/Makefile.in
+--- gtk+2.0-2.11.5.orig/demos/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/demos/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8736,10 +8531,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.4/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.11.4.orig/demos/gtk-demo/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/demos/gtk-demo/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.5/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.11.5.orig/demos/gtk-demo/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/demos/gtk-demo/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8748,10 +8543,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/Makefile.in gtk+2.0-2.11.4/docs/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/Makefile.in gtk+2.0-2.11.5/docs/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/docs/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8760,10 +8555,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/faq/Makefile.in gtk+2.0-2.11.4/docs/faq/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/faq/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/faq/Makefile.in 2007-06-19 21:20:28.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/faq/Makefile.in gtk+2.0-2.11.5/docs/faq/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/faq/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/docs/faq/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8772,10 +8567,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/reference/Makefile.in gtk+2.0-2.11.4/docs/reference/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/reference/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/reference/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/Makefile.in gtk+2.0-2.11.5/docs/reference/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/reference/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/docs/reference/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8784,10 +8579,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.4/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/reference/gdk/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/reference/gdk/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -95,6 +95,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.5/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/reference/gdk/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/docs/reference/gdk/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8796,10 +8591,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.4/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/reference/gdk-pixbuf/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -95,6 +95,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.5/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-02 21:28:58.000000000 +0200
++++ gtk+2.0-2.11.5/docs/reference/gdk-pixbuf/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8808,10 +8603,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.4/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/reference/gtk/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/reference/gtk/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -95,6 +95,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.5/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/reference/gtk/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/docs/reference/gtk/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8820,10 +8615,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/tools/Makefile.in gtk+2.0-2.11.4/docs/tools/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/tools/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/tools/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/tools/Makefile.in gtk+2.0-2.11.5/docs/tools/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/tools/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/docs/tools/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8832,10 +8627,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.4/docs/tutorial/Makefile.in
---- gtk+2.0-2.11.4.orig/docs/tutorial/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/docs/tutorial/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.5/docs/tutorial/Makefile.in
+--- gtk+2.0-2.11.5.orig/docs/tutorial/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/docs/tutorial/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8844,10 +8639,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/Makefile.in gtk+2.0-2.11.4/gdk/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/Makefile.in gtk+2.0-2.11.5/gdk/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8856,10 +8651,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.4/gdk/directfb/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/directfb/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/directfb/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.5/gdk/directfb/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/directfb/Makefile.in 2007-07-02 21:29:00.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/directfb/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8868,10 +8663,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.4/gdk/quartz/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/quartz/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/quartz/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.5/gdk/quartz/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/quartz/Makefile.in 2007-07-02 21:29:00.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/quartz/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8880,10 +8675,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/win32/Makefile.in gtk+2.0-2.11.4/gdk/win32/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/win32/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/win32/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/win32/Makefile.in gtk+2.0-2.11.5/gdk/win32/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/win32/Makefile.in 2007-07-02 21:29:00.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/win32/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8892,10 +8687,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.4/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/win32/rc/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/win32/rc/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.5/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/win32/rc/Makefile.in 2007-07-02 21:29:00.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/win32/rc/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8904,10 +8699,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk/x11/Makefile.in gtk+2.0-2.11.4/gdk/x11/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk/x11/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk/x11/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/x11/Makefile.in gtk+2.0-2.11.5/gdk/x11/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk/x11/Makefile.in 2007-07-02 21:29:00.000000000 +0200
++++ gtk+2.0-2.11.5/gdk/x11/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8916,10 +8711,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.4/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk-pixbuf/Makefile.in 2007-06-19 17:28:57.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk-pixbuf/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.5/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk-pixbuf/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/gdk-pixbuf/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8928,10 +8723,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.4/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.11.4.orig/gdk-pixbuf/pixops/Makefile.in 2007-06-19 17:28:58.000000000 +0200
-+++ gtk+2.0-2.11.4/gdk-pixbuf/pixops/Makefile.in 2007-06-19 21:20:29.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.5/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.11.5.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-02 21:28:59.000000000 +0200
++++ gtk+2.0-2.11.5/gdk-pixbuf/pixops/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8940,10 +8735,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gtk/Makefile.in gtk+2.0-2.11.4/gtk/Makefile.in
---- gtk+2.0-2.11.4.orig/gtk/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/gtk/Makefile.in 2007-06-19 21:20:30.000000000 +0200
-@@ -111,6 +111,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/Makefile.in gtk+2.0-2.11.5/gtk/Makefile.in
+--- gtk+2.0-2.11.5.orig/gtk/Makefile.in 2007-07-02 21:46:17.000000000 +0200
++++ gtk+2.0-2.11.5/gtk/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8952,7 +8747,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -370,6 +372,8 @@
+@@ -376,6 +378,8 @@ INCLUDES = \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -8961,7 +8756,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -625,7 +629,10 @@
+@@ -631,7 +635,10 @@ gtk_public_h_sources = \
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -8973,7 +8768,7 @@
# GTK+ header files that don't get installed
-@@ -641,10 +648,7 @@
+@@ -647,10 +654,7 @@ gtk_private_h_sources = \
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -8984,10 +8779,10 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-diff -urN gtk+2.0-2.11.4.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.4/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.11.4.orig/gtk/theme-bits/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/gtk/theme-bits/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.5/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.11.5.orig/gtk/theme-bits/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/gtk/theme-bits/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8996,10 +8791,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.4/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.11.4.orig/gtk/xdgmime/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/gtk/xdgmime/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.5/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.11.5.orig/gtk/xdgmime/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/gtk/xdgmime/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9008,10 +8803,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/ltmain.sh gtk+2.0-2.11.4/ltmain.sh
---- gtk+2.0-2.11.4.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.4/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
-@@ -43,7 +43,7 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/ltmain.sh gtk+2.0-2.11.5/ltmain.sh
+--- gtk+2.0-2.11.5.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.5/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
+@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -9020,7 +8815,7 @@
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 @@
+@@ -2082,7 +2082,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -9032,7 +8827,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -3201,6 +3204,11 @@
+@@ -3201,6 +3204,11 @@ EOF
age="$number_minor"
revision="$number_minor"
;;
@@ -9044,10 +8839,10 @@
esac
;;
no)
-diff -urN gtk+2.0-2.11.4.orig/m4macros/Makefile.in gtk+2.0-2.11.4/m4macros/Makefile.in
---- gtk+2.0-2.11.4.orig/m4macros/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/m4macros/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/m4macros/Makefile.in gtk+2.0-2.11.5/m4macros/Makefile.in
+--- gtk+2.0-2.11.5.orig/m4macros/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/m4macros/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9056,10 +8851,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/Makefile.in gtk+2.0-2.11.4/modules/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/Makefile.in gtk+2.0-2.11.5/modules/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9068,10 +8863,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/engines/Makefile.in gtk+2.0-2.11.4/modules/engines/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/engines/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/engines/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/Makefile.in gtk+2.0-2.11.5/modules/engines/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/engines/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/engines/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9080,10 +8875,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/engines/ms-windows/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/engines/ms-windows/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9092,10 +8887,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9104,10 +8899,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9116,10 +8911,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.4/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/engines/pixbuf/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/engines/pixbuf/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.5/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/engines/pixbuf/Makefile.in 2007-07-02 21:29:01.000000000 +0200
++++ gtk+2.0-2.11.5/modules/engines/pixbuf/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9128,10 +8923,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/input/Makefile.in gtk+2.0-2.11.4/modules/input/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/input/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/input/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/input/Makefile.in gtk+2.0-2.11.5/modules/input/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/input/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/input/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9140,7 +8935,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -424,9 +426,10 @@
+@@ -428,9 +430,10 @@ im_multipress_la_LIBADD = $(LDADDS)
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -9152,7 +8947,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -979,7 +982,18 @@
+@@ -983,7 +986,18 @@ uninstall-local:
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -9172,10 +8967,10 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.4/modules/printbackends/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/printbackends/Makefile.in 2007-06-19 17:28:59.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/printbackends/Makefile.in 2007-06-19 21:20:31.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.5/modules/printbackends/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/printbackends/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/printbackends/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9184,10 +8979,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.4/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/printbackends/cups/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/printbackends/cups/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.5/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/printbackends/cups/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/printbackends/cups/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9196,10 +8991,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.4/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/printbackends/file/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/printbackends/file/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.5/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/printbackends/file/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/printbackends/file/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9208,10 +9003,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.4/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/printbackends/lpr/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/printbackends/lpr/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.5/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/printbackends/lpr/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/printbackends/lpr/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9220,10 +9015,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.4/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.11.4.orig/modules/printbackends/test/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/modules/printbackends/test/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.5/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.11.5.orig/modules/printbackends/test/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/modules/printbackends/test/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9232,10 +9027,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/perf/Makefile.in gtk+2.0-2.11.4/perf/Makefile.in
---- gtk+2.0-2.11.4.orig/perf/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/perf/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/perf/Makefile.in gtk+2.0-2.11.5/perf/Makefile.in
+--- gtk+2.0-2.11.5.orig/perf/Makefile.in 2007-07-02 21:29:02.000000000 +0200
++++ gtk+2.0-2.11.5/perf/Makefile.in 2007-07-03 11:36:37.000000000 +0200
+@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -9244,10 +9039,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN gtk+2.0-2.11.4.orig/tests/Makefile.in gtk+2.0-2.11.4/tests/Makefile.in
---- gtk+2.0-2.11.4.orig/tests/Makefile.in 2007-06-19 17:29:00.000000000 +0200
-+++ gtk+2.0-2.11.4/tests/Makefile.in 2007-06-19 21:20:32.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/tests/Makefile.in gtk+2.0-2.11.5/tests/Makefile.in
+--- gtk+2.0-2.11.5.orig/tests/Makefile.in 2007-07-02 21:29:03.000000000 +0200
++++ gtk+2.0-2.11.5/tests/Makefile.in 2007-07-03 11:36:37.000000000 +0200
+@@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11779&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Jul 3 10:56:00 2007
@@ -48,7 +48,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.11.4
+SHVER := 2.11.5
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
@@ -291,7 +291,8 @@
dh_strip -a --dbg-package=$(DEBUG_PKG)
dh_compress -a
dh_fixperms -a -Xusr/lib/$(SHARED_PKG)
- dh_makeshlibs -p$(SHARED_PKG)\
+ dh_python -a
+ dh_makeshlibs -p$(SHARED_PKG) \
-X$(MODULES_BASE_PATH) \
-V"$(SHARED_PKG) (>= $(SHVER))" \
--add-udeb=$(UDEB_PKG)
More information about the pkg-gnome-commits
mailing list