r12088 - in /desktop/experimental/gtk+2.0/debian: changelog patches/009_gtk-export-filechooser.patch patches/070_mandatory-relibtoolize.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Jul 24 09:26:30 UTC 2007
Author: lool
Date: Tue Jul 24 09:26:30 2007
New Revision: 12088
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12088
Log:
* Update patch 009_gtk-export-filechooser:
- gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources):
export gtkquery.h and gtksearchengine.h as semi-private.
- gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard.
- gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef
guard.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=12088&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Jul 24 09:26:30 2007
@@ -24,8 +24,14 @@
cleanly.
- Update patches 009_gtk-export-filechooser, 033_treeview_resizing to
apply; update relibtoolizing patch, 070_mandatory-relibtoolize.
-
- -- Loic Minier <lool at dooz.org> Tue, 24 Jul 2007 10:42:20 +0200
+ * Update patch 009_gtk-export-filechooser:
+ - gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources):
+ export gtkquery.h and gtksearchengine.h as semi-private.
+ - gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard.
+ - gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef
+ guard.
+
+ -- Loic Minier <lool at dooz.org> Tue, 24 Jul 2007 10:43:23 +0200
gtk+2.0 (2.11.5-1) experimental; urgency=low
Modified: desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=12088&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch Tue Jul 24 09:26:30 2007
@@ -1,3 +1,11 @@
+2007-06-24 Loic Minier <lool at dooz.org>
+
+ * gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources):
+ export gtkquery.h and gtksearchengine.h as semi-private
+ * gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard
+ * gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef
+ guard
+
2007-02-07 Kristian Rietveld <kris at imendio.com>
* gtk/gtkfilechooserutils.[ch]
@@ -26,10 +34,8 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.11.6/gtk/Makefile.am
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-24 10:31:52.000000000 +0200
@@ -33,6 +33,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -39,7 +45,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -335,7 +337,10 @@
+@@ -335,12 +337,15 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -47,10 +53,17 @@
+ gtkfilesystem.h \
+ gtkfilesystemmodel.h \
+ gtkfilechooserprivate.h \
-+ gtkfilechooserutils.h
++ gtkfilechooserutils.h \
++ gtkquery.h \
++ gtksearchengine.h
# GTK+ header files that don't get installed
gtk_private_h_sources = \
+- gtkquery.h \
+- gtksearchengine.h \
+ gtksearchenginebeagle.h \
+ gtksearchenginetracker.h\
+ gtksearchenginesimple.h \
@@ -350,10 +355,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
@@ -62,10 +75,8 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-Index: gtk+2.0-2.11.6/gtk/gtk.symbols
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-24 09:09:13.000000000 +0200
@@ -1416,6 +1416,12 @@
#endif
#endif
@@ -79,10 +90,8 @@
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
-Index: gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-24 09:09:14.000000000 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -98,10 +107,8 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
-Index: gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-24 09:09:14.000000000 +0200
@@ -119,6 +119,22 @@
"do-overwrite-confirmation");
}
@@ -132,10 +139,8 @@
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
-Index: gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-24 09:09:14.000000000 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -161,10 +166,8 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
-Index: gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h
-===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-23 13:02:14.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-24 09:09:14.000000000 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -176,10 +179,8 @@
#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
-Index: gtk+2.0-2.11.6/tests/autotestfilechooser.c
-===================================================================
--- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200
-+++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-23 13:02:32.000000000 +0200
++++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-24 09:09:14.000000000 +0200
@@ -30,6 +30,7 @@
*/
@@ -188,3 +189,37 @@
#undef GTK_DISABLE_DEPRECATED
#include <config.h>
+--- gtk+2.0-2.11.6.orig/gtk/gtkquery.h 2007-07-24 10:31:23.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkquery.h 2007-07-24 10:31:26.000000000 +0200
+@@ -23,6 +23,14 @@
+ #ifndef __GTK_QUERY_H__
+ #define __GTK_QUERY_H__
+
++/* This is a "semi-private" header; it is meant only for
++ * alternate GtkFileChooser implementations; no stability guarantees
++ * are made at this point
++ */
++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
++#error "gtkfilechooserprivate.h is not supported API for general use"
++#endif
++
+ #include <glib-object.h>
+
+ G_BEGIN_DECLS
+--- gtk+2.0-2.11.6.orig/gtk/gtksearchengine.h 2007-07-24 10:30:25.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtksearchengine.h 2007-07-24 10:30:55.000000000 +0200
+@@ -23,6 +23,14 @@
+ #ifndef __GTK_SEARCH_ENGINE_H__
+ #define __GTK_SEARCH_ENGINE_H__
+
++/* This is a "semi-private" header; it is meant only for
++ * alternate GtkFileChooser implementations; no stability guarantees
++ * are made at this point
++ */
++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
++#error "gtkfilechooserprivate.h is not supported API for general use"
++#endif
++
+ #include <glib-object.h>
+ #include "gtkquery.h"
+
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=12088&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 24 09:26:30 2007
@@ -6,10 +6,9 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/Makefile.in gtk+2.0-2.11.6/Makefile.in
--- gtk+2.0-2.11.6.orig/Makefile.in 2007-07-20 22:21:30.000000000 +0200
-+++ gtk+2.0-2.11.6/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/Makefile.in 2007-07-24 10:36:26.000000000 +0200
+@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -18,7 +17,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -245,6 +247,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -26,7 +25,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -327,7 +330,10 @@ sharedstatedir = @sharedstatedir@
+@@ -327,7 +330,10 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -38,7 +37,7 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -478,13 +484,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -478,13 +484,14 @@
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
acinclude.m4 aclocal.m4 compile config.guess config.h.in \
@@ -55,7 +54,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -736,7 +743,7 @@ distdir: $(DISTFILES)
+@@ -736,7 +743,7 @@
|| exit 1; \
fi; \
done
@@ -64,10 +63,9 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/aclocal.m4 gtk+2.0-2.11.6/aclocal.m4
--- gtk+2.0-2.11.6.orig/aclocal.m4 2007-07-20 22:21:07.000000000 +0200
-+++ gtk+2.0-2.11.6/aclocal.m4 2007-07-23 22:02:53.000000000 +0200
-@@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
++++ gtk+2.0-2.11.6/aclocal.m4 2007-07-24 10:36:26.000000000 +0200
+@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -76,7 +74,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1104,7 +1104,7 @@ test -z "$STRIP" && STRIP=:
+@@ -1104,7 +1104,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -85,7 +83,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -1191,8 +1191,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+@@ -1191,8 +1191,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -97,7 +95,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -1204,8 +1205,9 @@ $rm conftest*
+@@ -1204,8 +1205,9 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -109,7 +107,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -1221,12 +1223,20 @@ $rm conftest*
+@@ -1221,12 +1223,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -135,7 +133,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1457,13 +1467,17 @@ ia64-*-hpux*)
+@@ -1457,13 +1467,17 @@
rm -rf conftest*
;;
@@ -154,7 +152,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1480,6 +1494,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -1480,6 +1494,9 @@
;;
*64-bit*)
case $host in
@@ -164,7 +162,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1551,7 +1568,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+@@ -1551,7 +1568,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -173,7 +171,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -1592,11 +1609,12 @@ fi
+@@ -1592,11 +1609,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -188,7 +186,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -1710,24 +1728,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1710,24 +1728,27 @@
fi
;;
*)
@@ -233,7 +231,7 @@
;;
esac
])
-@@ -1954,7 +1975,8 @@ fi
+@@ -1954,7 +1975,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -243,7 +241,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1962,7 +1984,7 @@ AC_CACHE_CHECK([if $compiler supports -c
+@@ -1962,7 +1984,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -252,7 +250,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -2102,6 +2124,7 @@ else
+@@ -2102,6 +2124,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -260,7 +258,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -2119,7 +2142,8 @@ fi
+@@ -2119,7 +2142,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -270,7 +268,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -2133,20 +2157,58 @@ shlibpath_overrides_runpath=unknown
+@@ -2133,20 +2157,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -334,7 +332,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -2303,12 +2365,8 @@ darwin* | rhapsody*)
+@@ -2303,12 +2365,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -349,7 +347,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -2325,18 +2383,6 @@ freebsd1*)
+@@ -2325,18 +2383,6 @@
dynamic_linker=no
;;
@@ -368,7 +366,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2374,7 +2420,7 @@ freebsd* | dragonfly*)
+@@ -2374,7 +2420,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -377,7 +375,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -2437,7 +2483,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -2437,7 +2483,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -386,7 +384,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2492,7 +2538,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -2492,7 +2538,7 @@
;;
# This must be Linux ELF.
@@ -395,7 +393,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2506,27 +2552,10 @@ linux*)
+@@ -2506,27 +2552,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -425,7 +423,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2538,7 +2567,7 @@ linux*)
+@@ -2538,7 +2567,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -434,7 +432,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2547,7 +2576,7 @@ knetbsd*-gnu)
+@@ -2547,7 +2576,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -443,7 +441,7 @@
;;
netbsd*)
-@@ -2631,6 +2660,10 @@ osf3* | osf4* | osf5*)
+@@ -2631,6 +2660,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -454,7 +452,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2736,7 +2769,8 @@ fi
+@@ -2736,7 +2769,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -464,7 +462,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2997,7 +3031,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
+@@ -2997,7 +3031,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -473,7 +471,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -3060,7 +3094,7 @@ fi
+@@ -3060,7 +3094,7 @@
# AC_PATH_MAGIC
# -------------
@@ -482,7 +480,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -3207,7 +3241,7 @@ esac
+@@ -3207,7 +3241,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -491,7 +489,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -3246,16 +3280,22 @@ cygwin*)
+@@ -3246,16 +3280,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -518,7 +516,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3293,7 +3333,7 @@ hpux10.20* | hpux11*)
+@@ -3293,7 +3333,7 @@
esac
;;
@@ -527,7 +525,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
-@@ -3309,11 +3349,11 @@ irix5* | irix6* | nonstopux*)
+@@ -3309,11 +3349,11 @@
;;
# This must be Linux ELF.
@@ -541,7 +539,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3343,6 +3383,10 @@ osf3* | osf4* | osf5*)
+@@ -3343,6 +3383,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -552,7 +550,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3395,7 +3439,7 @@ AC_DEFUN([AC_PROG_NM],
+@@ -3395,7 +3439,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -561,7 +559,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3611,10 +3655,10 @@ objext=o
+@@ -3611,10 +3655,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -574,7 +572,7 @@
_LT_AC_SYS_COMPILER
-@@ -3716,10 +3760,10 @@ objext=o
+@@ -3716,10 +3760,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -587,7 +585,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3865,7 +3909,7 @@ case $host_os in
+@@ -3865,7 +3909,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -596,7 +594,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -4024,10 +4068,10 @@ case $host_os in
+@@ -4024,10 +4068,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -609,7 +607,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -4061,7 +4105,7 @@ case $host_os in
+@@ -4061,7 +4105,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -618,7 +616,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4110,9 +4154,7 @@ case $host_os in
+@@ -4110,9 +4154,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -629,7 +627,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -4180,7 +4222,7 @@ case $host_os in
+@@ -4180,7 +4222,7 @@
;;
esac
;;
@@ -638,7 +636,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -4220,7 +4262,7 @@ case $host_os in
+@@ -4220,7 +4262,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -647,7 +645,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -4300,6 +4342,29 @@ case $host_os in
+@@ -4300,6 +4342,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -677,7 +675,7 @@
esac
;;
lynxos*)
-@@ -4322,7 +4387,7 @@ case $host_os in
+@@ -4322,7 +4387,7 @@
;;
esac
;;
@@ -686,7 +684,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -4338,16 +4403,20 @@ case $host_os in
+@@ -4338,16 +4403,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -716,7 +714,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4509,15 +4578,10 @@ case $host_os in
+@@ -4509,15 +4578,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -735,7 +733,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4564,6 +4628,12 @@ case $host_os in
+@@ -4564,6 +4628,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -748,7 +746,7 @@
fi
;;
esac
-@@ -4807,7 +4877,7 @@ $rm -f confest.$objext
+@@ -4807,7 +4877,7 @@
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -757,7 +755,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4815,13 +4885,46 @@ interix3*)
+@@ -4815,13 +4885,46 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -805,7 +803,7 @@
;;
esac
;;
-@@ -4870,10 +4973,17 @@ objext=o
+@@ -4870,10 +4973,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -825,7 +823,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4952,10 +5062,10 @@ objext=o
+@@ -4952,10 +5062,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -838,7 +836,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -5008,7 +5118,7 @@ objext=o
+@@ -5008,7 +5118,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -847,7 +845,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -5097,6 +5207,7 @@ if test -f "$ltmain"; then
+@@ -5097,6 +5207,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -855,7 +853,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -5143,7 +5254,7 @@ ifelse([$1], [],
+@@ -5143,7 +5254,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -864,7 +862,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5468,7 +5579,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -5468,7 +5579,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -873,7 +871,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5551,6 +5662,7 @@ fi
+@@ -5551,6 +5662,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -881,7 +879,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5587,7 +5699,7 @@ hpux*) # Its linker distinguishes data f
+@@ -5587,7 +5699,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -890,7 +888,7 @@
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -5777,12 +5889,14 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5777,12 +5889,14 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -907,7 +905,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -5794,7 +5908,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5794,7 +5908,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -916,7 +914,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5860,7 +5974,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5860,7 +5974,7 @@
;;
esac
;;
@@ -925,7 +923,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5903,7 +6017,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5903,7 +6017,7 @@
;;
esac
;;
@@ -934,7 +932,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -5930,6 +6044,14 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5930,6 +6044,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -949,7 +947,7 @@
;;
esac
;;
-@@ -5946,7 +6068,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5946,7 +6068,7 @@
;;
esac
;;
@@ -958,7 +956,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6050,13 +6172,15 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6050,13 +6172,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -976,7 +974,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
-@@ -6066,7 +6190,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6066,7 +6190,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -985,7 +983,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -6124,7 +6248,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6124,7 +6248,7 @@
esac
;;
@@ -994,7 +992,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -6157,7 +6281,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6157,7 +6281,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -1003,7 +1001,7 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -6176,6 +6300,22 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6176,6 +6300,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1026,7 +1024,7 @@
esac
;;
-@@ -6185,6 +6325,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6185,6 +6325,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1037,7 +1035,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6279,7 +6423,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
+@@ -6279,7 +6423,8 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -1047,7 +1045,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -6296,7 +6441,10 @@ ifelse([$1],[CXX],[
+@@ -6296,7 +6441,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1059,7 +1057,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -6435,7 +6583,7 @@ EOF
+@@ -6435,7 +6583,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -1068,7 +1066,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6453,7 +6601,7 @@ EOF
+@@ -6453,7 +6601,7 @@
fi
;;
@@ -1077,7 +1075,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6468,7 +6616,7 @@ EOF
+@@ -6468,7 +6616,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1086,7 +1084,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6486,20 +6634,30 @@ EOF
+@@ -6486,20 +6634,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1120,7 +1118,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6532,7 +6690,7 @@ EOF
+@@ -6532,7 +6690,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -1129,7 +1127,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6651,7 +6809,7 @@ _LT_EOF
+@@ -6651,7 +6809,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1138,7 +1136,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6744,7 +6902,7 @@ _LT_EOF
+@@ -6744,7 +6902,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -1147,7 +1145,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6786,10 +6944,10 @@ _LT_EOF
+@@ -6786,10 +6944,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -1160,7 +1158,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -6829,7 +6987,7 @@ _LT_EOF
+@@ -6829,7 +6987,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1169,7 +1167,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6931,7 +7089,7 @@ _LT_EOF
+@@ -6931,7 +7089,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1178,7 +1176,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6951,24 +7109,28 @@ _LT_EOF
+@@ -6951,24 +7109,28 @@
;;
openbsd*)
@@ -1224,7 +1222,7 @@
fi
;;
-@@ -7027,17 +7189,16 @@ _LT_EOF
+@@ -7027,17 +7189,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1251,7 +1249,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -7094,7 +7255,7 @@ _LT_EOF
+@@ -7094,7 +7255,7 @@
fi
;;
@@ -1260,7 +1258,7 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -7169,7 +7330,7 @@ x|xyes)
+@@ -7169,7 +7330,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1269,7 +1267,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -7272,6 +7433,30 @@ AC_DEFUN([LT_AC_PROG_RC],
+@@ -7272,6 +7433,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1300,7 +1298,7 @@
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
-@@ -7292,12 +7477,13 @@ do
+@@ -7292,12 +7477,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1315,7 +1313,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7330,6 +7516,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+@@ -7330,6 +7516,7 @@
done
])
SED=$lt_cv_path_SED
@@ -1323,7 +1321,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -7650,7 +7837,8 @@ installed software in a non-standard pre
+@@ -7650,7 +7837,8 @@
_PKG_TEXT
])],
@@ -1333,7 +1331,7 @@
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
-@@ -7659,7 +7847,7 @@ path to pkg-config.
+@@ -7659,7 +7847,7 @@
_PKG_TEXT
@@ -1342,7 +1340,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7879,7 +8067,7 @@ glib_DEFUN([GLIB_WITH_NLS],
+@@ -7879,7 +8067,7 @@
AC_CHECK_FUNCS(dcgettext)
MSGFMT_OPTS=
AC_MSG_CHECKING([if msgfmt accepts -c])
@@ -1351,7 +1349,7 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-@@ -8323,22 +8511,22 @@ AC_DEFUN([GTK_DOC_CHECK],
+@@ -8323,22 +8511,22 @@
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
dnl for overriding the documentation installation directory
@@ -1382,7 +1380,7 @@
fi
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
have_gtk_doc=yes
-@@ -8350,9 +8538,9 @@ ifelse([$1],[],,
+@@ -8350,9 +8538,9 @@
if test "$have_gtk_doc" = yes; then
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
@@ -1394,7 +1392,7 @@
have_gtk_doc=no
fi
fi
-@@ -8362,7 +8550,7 @@ ifelse([$1],[],,
+@@ -8362,7 +8550,7 @@
fi
fi
@@ -1404,9 +1402,8 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/configure gtk+2.0-2.11.6/configure
--- gtk+2.0-2.11.6.orig/configure 2007-07-20 22:21:42.000000000 +0200
-+++ gtk+2.0-2.11.6/configure 2007-07-23 22:02:58.000000000 +0200
++++ gtk+2.0-2.11.6/configure 2007-07-24 10:36:26.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -1425,7 +1422,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -21,10 +22,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1442,7 +1439,7 @@
# PATH needs CR
-@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
+@@ -217,7 +221,7 @@
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1451,7 +1448,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
-@@ -235,7 +239,6 @@ IFS=$as_save_IFS
+@@ -235,7 +239,6 @@
# 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
@@ -1459,7 +1456,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -244,10 +247,12 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1475,7 +1472,7 @@
:
_ASEOF
-@@ -255,7 +260,6 @@ _ASEOF
+@@ -255,7 +260,6 @@
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
@@ -1483,7 +1480,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -264,10 +268,12 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -1499,7 +1496,7 @@
:
(as_func_return () {
-@@ -514,19 +520,28 @@ else
+@@ -514,19 +520,28 @@
as_mkdir_p=false
fi
@@ -1539,7 +1536,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 @@ ac_unique_file="gdk/gdktypes.h"
+@@ -721,36 +736,36 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1586,7 +1583,7 @@
# include <unistd.h>
#endif"
-@@ -848,6 +863,8 @@ AMDEPBACKSLASH
+@@ -848,6 +863,8 @@
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
@@ -1595,7 +1592,7 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -858,6 +875,7 @@ HAVE_CXX_TRUE
+@@ -858,6 +875,7 @@
HAVE_CXX_FALSE
HAVE_OBJC_TRUE
HAVE_OBJC_FALSE
@@ -1603,7 +1600,7 @@
GREP
EGREP
LN_S
-@@ -1051,6 +1069,7 @@ target_alias
+@@ -1051,6 +1069,7 @@
CC
CFLAGS
LDFLAGS
@@ -1611,7 +1608,7 @@
CPPFLAGS
CXX
CXXFLAGS
-@@ -1168,10 +1187,10 @@ do
+@@ -1168,10 +1187,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -1624,7 +1621,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1187,10 +1206,10 @@ do
+@@ -1187,10 +1206,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1637,7 +1634,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1384,19 +1403,19 @@ do
+@@ -1384,19 +1403,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -1661,7 +1658,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1671,7 +1690,7 @@ Optional Features:
+@@ -1671,7 +1690,7 @@
--disable-modules disable dynamic module loading
--enable-test-print-backend
build test print backend
@@ -1670,7 +1667,7 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1698,6 +1717,7 @@ Some influential environment variables:
+@@ -1698,6 +1717,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -1678,7 +1675,7 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
-@@ -1778,7 +1798,7 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1778,7 +1798,7 @@
if $ac_init_version; then
cat <<\_ACEOF
gtk+ configure 2.11.6
@@ -1687,7 +1684,7 @@
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1792,7 +1812,7 @@ This file contains any messages produced
+@@ -1792,7 +1812,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by gtk+ $as_me 2.11.6, which was
@@ -1696,7 +1693,7 @@
$ $0 $@
-@@ -2218,7 +2238,7 @@ case $as_dir/ in
+@@ -2218,7 +2238,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1705,7 +1702,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2352,7 +2372,7 @@ do
+@@ -2352,7 +2372,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1714,7 +1711,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2481,7 +2501,7 @@ do
+@@ -2481,7 +2501,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1723,7 +1720,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2521,7 +2541,7 @@ do
+@@ -2521,7 +2541,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1732,7 +1729,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2762,7 +2782,7 @@ do
+@@ -2762,7 +2782,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1741,7 +1738,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2802,7 +2822,7 @@ do
+@@ -2802,7 +2822,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1750,7 +1747,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2859,7 +2879,7 @@ do
+@@ -2859,7 +2879,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1759,7 +1756,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2900,7 +2920,7 @@ do
+@@ -2900,7 +2920,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1768,7 +1765,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2958,7 +2978,7 @@ do
+@@ -2958,7 +2978,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1777,7 +1774,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3002,7 +3022,7 @@ do
+@@ -3002,7 +3022,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1786,7 +1783,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3143,7 +3163,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3143,7 +3163,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -1795,7 +1792,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3171,6 +3191,12 @@ done
+@@ -3171,6 +3191,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -1808,7 +1805,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3182,8 +3208,6 @@ See \`config.log' for more details." >&2
+@@ -3182,8 +3208,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -1817,7 +1814,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3361,27 +3385,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3361,27 +3385,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1849,7 +1846,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3436,27 +3443,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3436,27 +3443,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1881,7 +1878,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3491,27 +3481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3491,27 +3481,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1913,7 +1910,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3547,27 +3520,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3547,27 +3520,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1945,7 +1942,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3683,27 +3639,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3683,27 +3639,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1977,7 +1974,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3933,6 +3872,16 @@ fi
+@@ -3933,6 +3872,16 @@
@@ -1994,7 +1991,7 @@
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3951,7 +3900,7 @@ do
+@@ -3951,7 +3900,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2003,7 +2000,7 @@
ac_cv_prog_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4012,7 +3961,7 @@ do
+@@ -4012,7 +3961,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2012,7 +2009,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4056,7 +4005,7 @@ do
+@@ -4056,7 +4005,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2021,7 +2018,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4169,27 +4118,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4169,27 +4118,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2053,7 +2050,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4244,27 +4176,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4244,27 +4176,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2085,7 +2082,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4299,27 +4214,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4299,27 +4214,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2117,7 +2114,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4355,27 +4253,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4355,27 +4253,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2149,7 +2146,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4547,27 +4428,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4547,27 +4428,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2181,7 +2178,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4618,27 +4482,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4618,27 +4482,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2213,7 +2210,7 @@
OBJC=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4743,12 +4590,13 @@ do
+@@ -4743,12 +4590,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2228,7 +2225,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4783,6 +4631,7 @@ done
+@@ -4783,6 +4631,7 @@
fi
SED=$lt_cv_path_SED
@@ -2236,7 +2233,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -4807,7 +4656,7 @@ do
+@@ -4807,7 +4656,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -2245,7 +2242,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -4889,7 +4738,7 @@ do
+@@ -4889,7 +4738,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -2254,7 +2251,7 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5144,8 +4993,8 @@ else
+@@ -5144,8 +4993,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -2265,7 +2262,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5186,16 +5035,22 @@ cygwin*)
+@@ -5186,16 +5035,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -2292,7 +2289,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -5233,7 +5088,7 @@ hpux10.20* | hpux11*)
+@@ -5233,7 +5088,7 @@
esac
;;
@@ -2301,7 +2298,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -5249,11 +5104,11 @@ irix5* | irix6* | nonstopux*)
+@@ -5249,11 +5104,11 @@
;;
# This must be Linux ELF.
@@ -2315,7 +2312,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
-@@ -5283,6 +5138,10 @@ osf3* | osf4* | osf5*)
+@@ -5283,6 +5138,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -2326,7 +2323,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5370,7 +5229,7 @@ ia64-*-hpux*)
+@@ -5370,7 +5229,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -2335,7 +2332,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5405,7 +5264,8 @@ ia64-*-hpux*)
+@@ -5405,7 +5264,8 @@
rm -rf conftest*
;;
@@ -2345,7 +2342,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5416,6 +5276,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -5416,6 +5276,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -2355,7 +2352,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5432,6 +5295,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -5432,6 +5295,9 @@
;;
*64-bit*)
case $host in
@@ -2365,7 +2362,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -5494,27 +5360,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5494,27 +5360,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2398,7 +2395,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5523,7 +5373,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5523,7 +5373,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -2407,7 +2404,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5577,7 +5427,7 @@ do
+@@ -5577,7 +5427,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2416,7 +2413,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5617,7 +5467,7 @@ do
+@@ -5617,7 +5467,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2425,7 +2422,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5673,7 +5523,7 @@ do
+@@ -5673,7 +5523,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2434,7 +2431,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5713,7 +5563,7 @@ do
+@@ -5713,7 +5563,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2443,7 +2440,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5769,7 +5619,7 @@ do
+@@ -5769,7 +5619,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2452,7 +2449,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5809,7 +5659,7 @@ do
+@@ -5809,7 +5659,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2461,7 +2458,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5907,17 +5757,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5907,17 +5757,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2483,7 +2480,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5951,17 +5794,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5951,17 +5794,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2505,7 +2502,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6026,17 +5862,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6026,17 +5862,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2527,7 +2524,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6070,17 +5899,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6070,17 +5899,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2549,7 +2546,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6151,27 +5973,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6151,27 +5973,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2581,7 +2578,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6347,27 +6152,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6347,27 +6152,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2613,7 +2610,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6430,27 +6218,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6430,27 +6218,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2645,7 +2642,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6486,17 +6257,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6486,17 +6257,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2667,7 +2664,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6613,17 +6377,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6613,17 +6377,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2689,7 +2686,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6657,17 +6414,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6657,17 +6414,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2711,7 +2708,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6732,17 +6482,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6732,17 +6482,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2733,7 +2730,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6776,17 +6519,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6776,17 +6519,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2755,7 +2752,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6826,7 +6562,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
+@@ -6826,7 +6562,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -2764,7 +2761,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -6844,7 +6580,7 @@ do
+@@ -6844,7 +6580,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2773,7 +2770,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6870,7 +6606,7 @@ fi
+@@ -6870,7 +6606,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -2782,7 +2779,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -6888,7 +6624,7 @@ do
+@@ -6888,7 +6624,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2791,7 +2788,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6995,27 +6731,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6995,27 +6731,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2823,7 +2820,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7058,27 +6777,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7058,27 +6777,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2855,7 +2852,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7205,24 +6907,27 @@ else
+@@ -7205,24 +6907,27 @@
fi
;;
*)
@@ -2900,7 +2897,7 @@
;;
esac
-@@ -7239,6 +6944,7 @@ fi
+@@ -7239,6 +6944,7 @@
@@ -2908,7 +2905,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7276,7 +6982,7 @@ hpux*) # Its linker distinguishes data f
+@@ -7276,7 +6982,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2917,7 +2914,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -7533,7 +7239,7 @@ do
+@@ -7533,7 +7239,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2926,7 +2923,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7573,7 +7279,7 @@ do
+@@ -7573,7 +7279,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2935,7 +2932,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7629,7 +7335,7 @@ do
+@@ -7629,7 +7335,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2944,7 +2941,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7669,7 +7375,7 @@ do
+@@ -7669,7 +7375,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2953,7 +2950,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7725,7 +7431,7 @@ do
+@@ -7725,7 +7431,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2962,7 +2959,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7765,7 +7471,7 @@ do
+@@ -7765,7 +7471,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2971,7 +2968,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7827,7 +7533,7 @@ test -z "$STRIP" && STRIP=:
+@@ -7827,7 +7533,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -2980,7 +2977,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8027,10 +7733,10 @@ objext=o
+@@ -8027,10 +7733,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -2993,7 +2990,7 @@
# If no C compiler was specified, use CC.
-@@ -8045,13 +7751,13 @@ compiler=$CC
+@@ -8045,13 +7751,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3009,7 +3006,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -8071,7 +7777,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+@@ -8071,7 +7777,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -3018,7 +3015,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8082,11 +7788,11 @@ else
+@@ -8082,11 +7788,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3032,7 +3029,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8137,13 +7843,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8137,13 +7843,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3050,7 +3047,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8153,7 +7861,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8153,7 +7861,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -3059,7 +3056,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -8211,7 +7919,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8211,7 +7919,7 @@
esac
;;
@@ -3068,7 +3065,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -8244,7 +7952,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8244,7 +7952,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -3077,7 +3074,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8263,6 +7971,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8263,6 +7971,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -3100,7 +3097,7 @@
esac
;;
-@@ -8272,6 +7996,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8272,6 +7996,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -3111,7 +3108,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -8339,7 +8067,7 @@ if test "${lt_prog_compiler_pic_works+se
+@@ -8339,7 +8067,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -3120,7 +3117,7 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8350,11 +8078,11 @@ else
+@@ -8350,11 +8078,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3134,7 +3131,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8403,7 +8131,7 @@ else
+@@ -8403,7 +8131,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -3143,7 +3140,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -8443,7 +8171,7 @@ else
+@@ -8443,7 +8171,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -3152,7 +3149,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8454,11 +8182,11 @@ else
+@@ -8454,11 +8182,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3166,7 +3163,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8650,7 +8378,7 @@ EOF
+@@ -8650,7 +8378,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -3175,7 +3172,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8668,7 +8396,7 @@ EOF
+@@ -8668,7 +8396,7 @@
fi
;;
@@ -3184,7 +3181,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8683,7 +8411,7 @@ EOF
+@@ -8683,7 +8411,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -3193,7 +3190,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8701,20 +8429,30 @@ EOF
+@@ -8701,20 +8429,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -3227,7 +3224,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8866,7 +8604,7 @@ _LT_EOF
+@@ -8866,7 +8604,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3236,7 +3233,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8934,33 +8672,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -8934,33 +8672,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3287,7 +3284,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8968,7 +8697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8968,7 +8697,7 @@
fi
@@ -3296,7 +3293,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9009,33 +8738,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -9009,33 +8738,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3347,7 +3344,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9043,7 +8763,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9043,7 +8763,7 @@
fi
@@ -3356,7 +3353,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9089,7 +8809,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9089,7 +8809,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -3365,7 +3362,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9131,10 +8851,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9131,10 +8851,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -3378,7 +3375,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -9174,7 +8894,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9174,7 +8894,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3387,7 +3384,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9276,7 +8996,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9276,7 +8996,7 @@
link_all_deplibs=yes
;;
@@ -3396,7 +3393,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9296,24 +9016,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9296,24 +9016,28 @@
;;
openbsd*)
@@ -3442,7 +3439,7 @@
fi
;;
-@@ -9372,17 +9096,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9372,17 +9096,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -3469,7 +3466,7 @@
esac
link_all_deplibs=yes
;;
-@@ -9439,7 +9162,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9439,7 +9162,7 @@
fi
;;
@@ -3478,7 +3475,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9516,7 +9239,7 @@ x|xyes)
+@@ -9516,7 +9239,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -3487,7 +3484,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9574,17 +9297,55 @@ shlibpath_overrides_runpath=unknown
+@@ -9574,17 +9297,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3547,7 +3544,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9744,12 +9505,8 @@ darwin* | rhapsody*)
+@@ -9744,12 +9505,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -3562,7 +3559,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9766,18 +9523,6 @@ freebsd1*)
+@@ -9766,18 +9523,6 @@
dynamic_linker=no
;;
@@ -3581,7 +3578,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9815,7 +9560,7 @@ freebsd* | dragonfly*)
+@@ -9815,7 +9560,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -3590,7 +3587,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9878,7 +9623,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -9878,7 +9623,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -3599,7 +3596,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9933,7 +9678,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -9933,7 +9678,7 @@
;;
# This must be Linux ELF.
@@ -3608,7 +3605,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9947,31 +9692,10 @@ linux*)
+@@ -9947,31 +9692,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -3642,7 +3639,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9983,7 +9707,7 @@ linux*)
+@@ -9983,7 +9707,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3651,7 +3648,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9992,7 +9716,7 @@ knetbsd*-gnu)
+@@ -9992,7 +9716,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3660,7 +3657,7 @@
;;
netbsd*)
-@@ -10076,6 +9800,10 @@ osf3* | osf4* | osf5*)
+@@ -10076,6 +9800,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3671,7 +3668,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -10229,6 +9957,7 @@ else
+@@ -10229,6 +9957,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -3679,7 +3676,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -10312,27 +10041,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10312,27 +10041,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3712,7 +3709,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10341,7 +10054,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10341,7 +10054,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -3721,7 +3718,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10423,27 +10136,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10423,27 +10136,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3754,7 +3751,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10452,7 +10149,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10452,7 +10149,7 @@
ac_cv_func_shl_load=no
fi
@@ -3763,7 +3760,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10502,27 +10199,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10502,27 +10199,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3796,7 +3793,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10531,7 +10212,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10531,7 +10212,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -3805,7 +3802,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10603,27 +10284,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10603,27 +10284,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3838,7 +3835,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10632,7 +10297,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10632,7 +10297,7 @@
ac_cv_func_dlopen=no
fi
@@ -3847,7 +3844,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10682,27 +10347,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10682,27 +10347,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3880,7 +3877,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10711,7 +10360,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10711,7 +10360,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -3889,7 +3886,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10762,27 +10411,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10762,27 +10411,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3922,7 +3919,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10791,7 +10424,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10791,7 +10424,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -3931,7 +3928,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10842,27 +10475,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10842,27 +10475,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3964,7 +3961,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10871,7 +10488,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10871,7 +10488,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -3973,7 +3970,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10927,7 +10544,7 @@ else
+@@ -10927,7 +10544,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -3982,7 +3979,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11027,7 +10644,7 @@ else
+@@ -11027,7 +10644,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -3991,7 +3988,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11225,6 +10842,7 @@ if test -f "$ltmain"; then
+@@ -11225,6 +10842,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -3999,7 +3996,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -11269,7 +10887,7 @@ echo "$as_me: creating $ofile" >&6;}
+@@ -11269,7 +10887,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -4008,7 +4005,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11593,7 +11211,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -11593,7 +11211,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -4017,7 +4014,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11762,10 +11380,10 @@ objext=o
+@@ -11762,10 +11380,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -4030,7 +4027,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11781,13 +11399,13 @@ compiler=$CC
+@@ -11781,13 +11399,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4046,7 +4043,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12046,7 +11664,7 @@ case $host_os in
+@@ -12046,7 +11664,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4055,7 +4052,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12114,33 +11732,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -12114,33 +11732,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4106,7 +4103,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12148,7 +11757,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12148,7 +11757,7 @@
fi
@@ -4115,7 +4112,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12190,33 +11799,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -12190,33 +11799,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4166,7 +4163,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12224,7 +11824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12224,7 +11824,7 @@
fi
@@ -4175,7 +4172,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12335,10 +11935,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12335,10 +11935,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -4188,7 +4185,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -12372,7 +11972,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12372,7 +11972,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -4197,7 +4194,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12421,9 +12021,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12421,9 +12021,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -4208,7 +4205,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -12491,7 +12089,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12491,7 +12089,7 @@
;;
esac
;;
@@ -4217,7 +4214,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12531,7 +12129,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12531,7 +12129,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -4226,7 +4223,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12611,6 +12209,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12611,6 +12209,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -4256,7 +4253,7 @@
esac
;;
lynxos*)
-@@ -12633,7 +12254,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12633,7 +12254,7 @@
;;
esac
;;
@@ -4265,7 +4262,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -12649,16 +12270,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12649,16 +12270,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -4295,7 +4292,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12820,15 +12445,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12820,15 +12445,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -4314,7 +4311,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12875,6 +12495,12 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12875,6 +12495,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -4327,7 +4324,7 @@
fi
;;
esac
-@@ -13066,7 +12692,7 @@ $rm -f confest.$objext
+@@ -13066,7 +12692,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -4336,7 +4333,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -13074,13 +12700,46 @@ interix3*)
+@@ -13074,13 +12700,46 @@
postdeps_CXX=
;;
@@ -4384,7 +4381,7 @@
;;
esac
;;
-@@ -13117,12 +12776,14 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13117,12 +12776,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -4401,7 +4398,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13134,7 +12795,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13134,7 +12795,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -4410,7 +4407,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -13200,7 +12861,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13200,7 +12861,7 @@
;;
esac
;;
@@ -4419,7 +4416,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13243,7 +12904,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13243,7 +12904,7 @@
;;
esac
;;
@@ -4428,7 +4425,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13270,6 +12931,14 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13270,6 +12931,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -4443,7 +4440,7 @@
;;
esac
;;
-@@ -13286,7 +12955,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13286,7 +12955,7 @@
;;
esac
;;
@@ -4452,7 +4449,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13384,7 +13053,7 @@ if test "${lt_prog_compiler_pic_works_CX
+@@ -13384,7 +13053,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -4461,7 +4458,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13395,11 +13064,11 @@ else
+@@ -13395,11 +13064,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4475,7 +4472,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13448,7 +13117,7 @@ else
+@@ -13448,7 +13117,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -4484,7 +4481,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13488,7 +13157,7 @@ else
+@@ -13488,7 +13157,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -4493,7 +4490,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -13499,11 +13168,11 @@ else
+@@ -13499,11 +13168,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4507,7 +4504,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13569,7 +13238,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -13569,7 +13238,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -4519,7 +4516,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13600,7 +13272,7 @@ x|xyes)
+@@ -13600,7 +13272,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -4528,7 +4525,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13658,20 +13330,7 @@ shlibpath_overrides_runpath=unknown
+@@ -13658,20 +13330,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4550,7 +4547,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13828,12 +13487,7 @@ darwin* | rhapsody*)
+@@ -13828,12 +13487,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -4564,7 +4561,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13850,18 +13504,6 @@ freebsd1*)
+@@ -13850,18 +13504,6 @@
dynamic_linker=no
;;
@@ -4583,7 +4580,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13899,7 +13541,7 @@ freebsd* | dragonfly*)
+@@ -13899,7 +13541,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -4592,7 +4589,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13962,7 +13604,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -13962,7 +13604,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -4601,7 +4598,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14017,7 +13659,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -14017,7 +13659,7 @@
;;
# This must be Linux ELF.
@@ -4610,7 +4607,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14031,31 +13673,10 @@ linux*)
+@@ -14031,31 +13673,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -4644,7 +4641,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14067,7 +13688,7 @@ linux*)
+@@ -14067,7 +13688,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4653,7 +4650,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14076,7 +13697,7 @@ knetbsd*-gnu)
+@@ -14076,7 +13697,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -4662,7 +4659,7 @@
;;
netbsd*)
-@@ -14160,6 +13781,10 @@ osf3* | osf4* | osf5*)
+@@ -14160,6 +13781,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -4673,7 +4670,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14354,6 +13979,7 @@ if test -f "$ltmain"; then
+@@ -14354,6 +13979,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -4681,7 +4678,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -14674,7 +14300,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -14674,7 +14300,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -4690,7 +4687,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14765,10 +14391,17 @@ objext=o
+@@ -14765,10 +14391,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -4710,7 +4707,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14784,13 +14417,13 @@ compiler=$CC
+@@ -14784,13 +14417,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4726,7 +4723,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -14877,13 +14510,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14877,13 +14510,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -4744,7 +4741,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14893,7 +14528,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14893,7 +14528,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -4753,7 +4750,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14951,7 +14586,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14951,7 +14586,7 @@
esac
;;
@@ -4762,7 +4759,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14984,7 +14619,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14984,7 +14619,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -4771,7 +4768,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15003,6 +14638,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15003,6 +14638,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -4794,7 +4791,7 @@
esac
;;
-@@ -15012,6 +14663,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15012,6 +14663,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -4805,7 +4802,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15079,7 +14734,7 @@ if test "${lt_prog_compiler_pic_works_F7
+@@ -15079,7 +14734,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -4814,7 +4811,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15090,11 +14745,11 @@ else
+@@ -15090,11 +14745,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4828,7 +4825,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15143,7 +14798,7 @@ else
+@@ -15143,7 +14798,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -4837,7 +4834,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -15183,7 +14838,7 @@ else
+@@ -15183,7 +14838,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -4846,7 +4843,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -15194,11 +14849,11 @@ else
+@@ -15194,11 +14849,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -4860,7 +4857,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15390,7 +15045,7 @@ EOF
+@@ -15390,7 +15045,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -4869,7 +4866,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -15408,7 +15063,7 @@ EOF
+@@ -15408,7 +15063,7 @@
fi
;;
@@ -4878,7 +4875,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -15423,7 +15078,7 @@ EOF
+@@ -15423,7 +15078,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -4887,7 +4884,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15441,20 +15096,30 @@ EOF
+@@ -15441,20 +15096,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -4921,7 +4918,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15606,7 +15271,7 @@ _LT_EOF
+@@ -15606,7 +15271,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4930,7 +4927,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -15664,33 +15329,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15664,33 +15329,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4981,7 +4978,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15698,7 +15354,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15698,7 +15354,7 @@
fi
@@ -4990,7 +4987,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15729,33 +15385,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15729,33 +15385,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5041,7 +5038,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15763,7 +15410,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15763,7 +15410,7 @@
fi
@@ -5050,7 +5047,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15809,7 +15456,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15809,7 +15456,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -5059,7 +5056,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15851,10 +15498,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15851,10 +15498,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -5072,7 +5069,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -15894,7 +15541,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15894,7 +15541,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5081,7 +5078,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15996,7 +15643,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15996,7 +15643,7 @@
link_all_deplibs_F77=yes
;;
@@ -5090,7 +5087,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16016,24 +15663,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16016,24 +15663,28 @@
;;
openbsd*)
@@ -5136,7 +5133,7 @@
fi
;;
-@@ -16092,17 +15743,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16092,17 +15743,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5163,7 +5160,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16159,7 +15809,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16159,7 +15809,7 @@
fi
;;
@@ -5172,7 +5169,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -16236,7 +15886,7 @@ x|xyes)
+@@ -16236,7 +15886,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -5181,7 +5178,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -16294,20 +15944,7 @@ shlibpath_overrides_runpath=unknown
+@@ -16294,20 +15944,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5203,7 +5200,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -16464,12 +16101,7 @@ darwin* | rhapsody*)
+@@ -16464,12 +16101,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5217,7 +5214,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -16486,18 +16118,6 @@ freebsd1*)
+@@ -16486,18 +16118,6 @@
dynamic_linker=no
;;
@@ -5236,7 +5233,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16535,7 +16155,7 @@ freebsd* | dragonfly*)
+@@ -16535,7 +16155,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5245,7 +5242,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -16598,7 +16218,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -16598,7 +16218,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -5254,7 +5251,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16653,7 +16273,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -16653,7 +16273,7 @@
;;
# This must be Linux ELF.
@@ -5263,7 +5260,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16667,31 +16287,10 @@ linux*)
+@@ -16667,31 +16287,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -5297,7 +5294,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16703,7 +16302,7 @@ linux*)
+@@ -16703,7 +16302,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5306,7 +5303,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16712,7 +16311,7 @@ knetbsd*-gnu)
+@@ -16712,7 +16311,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -5315,7 +5312,7 @@
;;
netbsd*)
-@@ -16796,6 +16395,10 @@ osf3* | osf4* | osf5*)
+@@ -16796,6 +16395,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5326,7 +5323,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16990,6 +16593,7 @@ if test -f "$ltmain"; then
+@@ -16990,6 +16593,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -5334,7 +5331,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -17310,7 +16914,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -17310,7 +16914,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5343,7 +5340,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -17368,10 +16972,10 @@ objext=o
+@@ -17368,10 +16972,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -5356,7 +5353,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -17387,13 +16991,13 @@ compiler=$CC
+@@ -17387,13 +16991,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5372,7 +5369,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -17434,7 +17038,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+@@ -17434,7 +17038,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -5381,7 +5378,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -17445,11 +17049,11 @@ else
+@@ -17445,11 +17049,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -5395,7 +5392,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17500,13 +17104,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17500,13 +17104,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5413,7 +5410,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -17516,7 +17122,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17516,7 +17122,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -5422,7 +5419,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -17574,7 +17180,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17574,7 +17180,7 @@
esac
;;
@@ -5431,7 +5428,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -17607,7 +17213,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17607,7 +17213,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -5440,7 +5437,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17626,6 +17232,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17626,6 +17232,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -5463,7 +5460,7 @@
esac
;;
-@@ -17635,6 +17257,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17635,6 +17257,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -5474,7 +5471,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17702,7 +17328,7 @@ if test "${lt_prog_compiler_pic_works_GC
+@@ -17702,7 +17328,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -5483,7 +5480,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -17713,11 +17339,11 @@ else
+@@ -17713,11 +17339,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -5497,7 +5494,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17766,7 +17392,7 @@ else
+@@ -17766,7 +17392,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -5506,7 +5503,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -17806,7 +17432,7 @@ else
+@@ -17806,7 +17432,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -5515,7 +5512,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17817,11 +17443,11 @@ else
+@@ -17817,11 +17443,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -5529,7 +5526,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18013,7 +17639,7 @@ EOF
+@@ -18013,7 +17639,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -5538,7 +5535,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18031,7 +17657,7 @@ EOF
+@@ -18031,7 +17657,7 @@
fi
;;
@@ -5547,7 +5544,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18046,7 +17672,7 @@ EOF
+@@ -18046,7 +17672,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -5556,7 +5553,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18064,20 +17690,30 @@ EOF
+@@ -18064,20 +17690,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -5590,7 +5587,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18229,7 +17865,7 @@ _LT_EOF
+@@ -18229,7 +17865,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5599,7 +5596,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -18297,33 +17933,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -18297,33 +17933,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5650,7 +5647,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18331,7 +17958,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18331,7 +17958,7 @@
fi
@@ -5659,7 +5656,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18372,33 +17999,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -18372,33 +17999,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5710,7 +5707,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18406,7 +18024,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18406,7 +18024,7 @@
fi
@@ -5719,7 +5716,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18452,7 +18070,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18452,7 +18070,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -5728,7 +5725,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -18494,10 +18112,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18494,10 +18112,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -5741,7 +5738,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -18537,7 +18155,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18537,7 +18155,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5750,7 +5747,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18639,7 +18257,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18639,7 +18257,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5759,7 +5756,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -18659,24 +18277,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18659,24 +18277,28 @@
;;
openbsd*)
@@ -5805,7 +5802,7 @@
fi
;;
-@@ -18735,17 +18357,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18735,17 +18357,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5832,7 +5829,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18802,7 +18423,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18802,7 +18423,7 @@
fi
;;
@@ -5841,7 +5838,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18879,7 +18500,7 @@ x|xyes)
+@@ -18879,7 +18500,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -5850,7 +5847,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18937,20 +18558,7 @@ shlibpath_overrides_runpath=unknown
+@@ -18937,20 +18558,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5872,7 +5869,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19107,12 +18715,7 @@ darwin* | rhapsody*)
+@@ -19107,12 +18715,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5886,7 +5883,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19129,18 +18732,6 @@ freebsd1*)
+@@ -19129,18 +18732,6 @@
dynamic_linker=no
;;
@@ -5905,7 +5902,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19178,7 +18769,7 @@ freebsd* | dragonfly*)
+@@ -19178,7 +18769,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5914,7 +5911,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19241,7 +18832,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -19241,7 +18832,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -5923,7 +5920,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19296,7 +18887,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -19296,7 +18887,7 @@
;;
# This must be Linux ELF.
@@ -5932,7 +5929,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19310,31 +18901,10 @@ linux*)
+@@ -19310,31 +18901,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -5966,7 +5963,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19346,7 +18916,7 @@ linux*)
+@@ -19346,7 +18916,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5975,7 +5972,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19355,7 +18925,7 @@ knetbsd*-gnu)
+@@ -19355,7 +18925,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -5984,7 +5981,7 @@
;;
netbsd*)
-@@ -19439,6 +19009,10 @@ osf3* | osf4* | osf5*)
+@@ -19439,6 +19009,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5995,7 +5992,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -19633,6 +19207,7 @@ if test -f "$ltmain"; then
+@@ -19633,6 +19207,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -6003,7 +6000,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19953,7 +19528,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -19953,7 +19528,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6012,7 +6009,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20010,7 +19585,7 @@ objext=o
+@@ -20010,7 +19585,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -6021,7 +6018,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20029,13 +19604,13 @@ compiler=$CC
+@@ -20029,13 +19604,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6037,7 +6034,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -20113,6 +19688,7 @@ if test -f "$ltmain"; then
+@@ -20113,6 +19688,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -6045,7 +6042,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -20433,7 +20009,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -20433,7 +20009,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6054,7 +6051,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -20588,27 +20164,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20588,27 +20164,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6086,7 +6083,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20632,27 +20191,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20632,27 +20191,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6118,7 +6115,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20680,7 +20222,6 @@ if test "${ac_cv_sys_file_offset_bits+se
+@@ -20680,7 +20222,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -6126,7 +6123,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20717,28 +20258,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20717,28 +20258,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6160,7 +6157,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20784,27 +20308,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20784,27 +20308,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6192,7 +6189,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20814,26 +20321,28 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20814,26 +20321,28 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6227,7 +6224,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20870,28 +20379,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20870,28 +20379,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6261,7 +6258,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20937,27 +20429,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20937,27 +20429,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6293,7 +6290,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20967,19 +20442,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20967,19 +20442,22 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6320,7 +6317,7 @@
fi
-@@ -21008,7 +20486,7 @@ do
+@@ -21008,7 +20486,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6329,7 +6326,7 @@
ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21129,7 +20607,7 @@ do
+@@ -21129,7 +20607,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6338,7 +6335,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21169,7 +20647,7 @@ do
+@@ -21169,7 +20647,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6347,7 +6344,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21229,7 +20707,7 @@ do
+@@ -21229,7 +20707,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6356,7 +6353,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21461,27 +20939,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -21461,27 +20939,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6389,7 +6386,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21490,7 +20952,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21490,7 +20952,7 @@
fi
@@ -6398,7 +6395,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21590,27 +21052,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -21590,27 +21052,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6430,7 +6427,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21673,7 +21118,7 @@ case $as_dir/ in
+@@ -21673,7 +21118,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6439,7 +6436,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -21837,7 +21282,7 @@ do
+@@ -21837,7 +21282,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6448,7 +6445,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21880,7 +21325,7 @@ do
+@@ -21880,7 +21325,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6457,7 +6454,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22026,7 +21471,7 @@ Alternatively, you may set the environme
+@@ -22026,7 +21471,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6466,7 +6463,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22036,7 +21481,7 @@ Alternatively, you may set the environme
+@@ -22036,7 +21481,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6475,7 +6472,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22122,7 +21567,7 @@ do
+@@ -22122,7 +21567,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6484,7 +6481,7 @@
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22165,7 +21610,7 @@ do
+@@ -22165,7 +21610,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6493,7 +6490,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22265,27 +21710,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22265,27 +21710,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6526,7 +6523,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22294,7 +21723,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22294,7 +21723,7 @@
eval "$as_ac_var=no"
fi
@@ -6535,7 +6532,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22375,27 +21804,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22375,27 +21804,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6568,7 +6565,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22404,7 +21817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22404,7 +21817,7 @@
eval "$as_ac_var=no"
fi
@@ -6577,7 +6574,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22453,27 +21866,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22453,27 +21866,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6610,7 +6607,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22482,7 +21879,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22482,7 +21879,7 @@
gtk_ok=no
fi
@@ -6619,7 +6616,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22528,27 +21925,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22528,27 +21925,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6652,7 +6649,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22557,7 +21938,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22557,7 +21938,7 @@
gtk_ok=no
fi
@@ -6661,7 +6658,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22603,27 +21984,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22603,27 +21984,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6694,7 +6691,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22632,7 +21997,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22632,7 +21997,7 @@
gtk_ok=no
fi
@@ -6703,7 +6700,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22678,27 +22043,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22678,27 +22043,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6736,7 +6733,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22707,7 +22056,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22707,7 +22056,7 @@
gtk_ok=no
fi
@@ -6745,7 +6742,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22753,27 +22102,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22753,27 +22102,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6778,7 +6775,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22782,7 +22115,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22782,7 +22115,7 @@
gtk_ok=no
fi
@@ -6787,7 +6784,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22840,27 +22173,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22840,27 +22173,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6819,7 +6816,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22896,17 +22212,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22896,17 +22212,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6841,7 +6838,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23004,27 +22313,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23004,27 +22313,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6874,7 +6871,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23033,7 +22326,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23033,7 +22326,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -6883,7 +6880,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -23089,27 +22382,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23089,27 +22382,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6915,7 +6912,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23145,17 +22421,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23145,17 +22421,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6937,7 +6934,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23251,27 +22520,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23251,27 +22520,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6970,7 +6967,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23280,7 +22533,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23280,7 +22533,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -6979,7 +6976,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23323,27 +22576,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23323,27 +22576,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7012,7 +7009,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23352,7 +22589,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23352,7 +22589,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -7021,7 +7018,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23428,27 +22665,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23428,27 +22665,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7054,7 +7051,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23457,7 +22678,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23457,7 +22678,7 @@
eval "$as_ac_var=no"
fi
@@ -7063,7 +7060,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23522,27 +22743,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23522,27 +22743,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7096,7 +7093,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23551,7 +22756,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23551,7 +22756,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -7105,7 +7102,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23600,27 +22805,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23600,27 +22805,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7138,7 +7135,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23629,7 +22818,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23629,7 +22818,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -7147,7 +7144,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23678,27 +22867,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23678,27 +22867,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7180,7 +7177,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23707,7 +22880,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23707,7 +22880,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -7189,7 +7186,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23769,27 +22942,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23769,27 +22942,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7222,7 +7219,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23798,7 +22955,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23798,7 +22955,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -7231,7 +7228,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23847,27 +23004,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23847,27 +23004,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7264,7 +7261,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23876,7 +23017,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23876,7 +23017,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -7273,7 +7270,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23971,27 +23112,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23971,27 +23112,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7306,7 +7303,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24000,7 +23125,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24000,7 +23125,7 @@
eval "$as_ac_var=no"
fi
@@ -7315,7 +7312,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24147,27 +23272,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24147,27 +23272,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7348,7 +7345,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24176,7 +23285,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24176,7 +23285,7 @@
eval "$as_ac_var=no"
fi
@@ -7357,7 +7354,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24206,8 +23315,8 @@ msgstr ""
+@@ -24206,8 +23315,8 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -7368,7 +7365,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -24237,7 +23346,7 @@ do
+@@ -24237,7 +23346,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7377,7 +7374,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -24325,27 +23434,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24325,27 +23434,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7410,7 +7407,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24417,27 +23510,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24417,27 +23510,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7443,7 +7440,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24446,7 +23523,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24446,7 +23523,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -7452,7 +7449,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24467,7 +23544,7 @@ fi
+@@ -24467,7 +23544,7 @@
esac
fi
@@ -7461,7 +7458,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24775,27 +23852,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24775,27 +23852,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7493,7 +7490,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24832,27 +23892,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24832,27 +23892,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7525,7 +7522,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24926,7 +23969,7 @@ do
+@@ -24926,7 +23969,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7534,7 +7531,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -24969,7 +24012,7 @@ do
+@@ -24969,7 +24012,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7543,7 +7540,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -25238,27 +24281,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25238,27 +24281,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7576,7 +7573,7 @@
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -25276,7 +24303,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25276,7 +24303,7 @@
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -7585,7 +7582,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25380,27 +24407,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25380,27 +24407,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7618,7 +7615,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25409,7 +24420,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25409,7 +24420,7 @@
eval "$as_ac_var=no"
fi
@@ -7627,7 +7624,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25464,27 +24475,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25464,27 +24475,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7659,7 +7656,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25520,17 +24514,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25520,17 +24514,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7681,7 +7678,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25636,27 +24623,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25636,27 +24623,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7713,7 +7710,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25692,17 +24662,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25692,17 +24662,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7735,7 +7732,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25808,27 +24771,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25808,27 +24771,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7767,7 +7764,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25864,17 +24810,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25864,17 +24810,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7789,7 +7786,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25980,27 +24919,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25980,27 +24919,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7821,7 +7818,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26036,17 +24958,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26036,17 +24958,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7843,7 +7840,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26146,27 +25061,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26146,27 +25061,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7875,7 +7872,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26231,27 +25129,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26231,27 +25129,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7907,7 +7904,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26406,10 +25287,10 @@ main ()
+@@ -26406,10 +25287,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -7921,7 +7918,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26418,11 +25299,11 @@ main ()
+@@ -26418,11 +25299,11 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -7937,7 +7934,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26449,7 +25330,7 @@ main ()
+@@ -26449,7 +25330,7 @@
const int foo = 10;
if (!foo) return 0;
}
@@ -7946,7 +7943,7 @@
#endif
;
-@@ -26469,27 +25350,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26469,27 +25350,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7978,7 +7975,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26547,27 +25411,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26547,27 +25411,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8010,7 +8007,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26626,27 +25473,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26626,27 +25473,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8042,7 +8039,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26682,17 +25512,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26682,17 +25512,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8064,7 +8061,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26823,27 +25646,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26823,27 +25646,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8097,7 +8094,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26852,7 +25659,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26852,7 +25659,7 @@
eval "$as_ac_var=no"
fi
@@ -8106,7 +8103,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26909,21 +25716,21 @@ $ac_includes_default
+@@ -26909,21 +25716,21 @@
#include <fcntl.h>
#include <sys/mman.h>
@@ -8132,7 +8129,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -27120,27 +25927,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27120,27 +25927,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8165,7 +8162,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27149,7 +25940,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27149,7 +25940,7 @@
eval "$as_ac_var=no"
fi
@@ -8174,7 +8171,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27230,27 +26021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27230,27 +26021,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8207,7 +8204,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27259,7 +26034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27259,7 +26034,7 @@
eval "$as_ac_var=no"
fi
@@ -8216,7 +8213,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27343,27 +26118,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27343,27 +26118,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8248,7 +8245,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27432,17 +26190,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27432,17 +26190,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8270,7 +8267,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27485,17 +26236,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27485,17 +26236,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8292,7 +8289,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27580,27 +26324,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27580,27 +26324,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8325,7 +8322,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27609,7 +26337,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27609,7 +26337,7 @@
ac_cv_func_iswalnum=no
fi
@@ -8334,7 +8331,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27659,27 +26387,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27659,27 +26387,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8367,7 +8364,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27688,7 +26400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27688,7 +26400,7 @@
ac_cv_lib_w_iswalnum=no
fi
@@ -8376,7 +8373,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27747,27 +26459,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27747,27 +26459,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8409,7 +8406,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27776,7 +26472,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27776,7 +26472,7 @@
gdk_working_wctype=no
fi
@@ -8418,7 +8415,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27815,17 +26511,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27815,17 +26511,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8440,7 +8437,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27885,27 +26574,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27885,27 +26574,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8472,7 +8469,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27941,17 +26613,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27941,17 +26613,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8494,7 +8491,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28082,27 +26747,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28082,27 +26747,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8527,7 +8524,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -28111,7 +26760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28111,7 +26760,7 @@
eval "$as_ac_var=no"
fi
@@ -8536,7 +8533,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -28259,27 +26908,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28259,27 +26908,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8569,7 +8566,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28288,7 +26921,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28288,7 +26921,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
@@ -8578,7 +8575,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28329,27 +26962,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28329,27 +26962,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8610,7 +8607,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28385,17 +27001,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28385,17 +27001,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8632,7 +8629,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28500,27 +27109,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28500,27 +27109,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8665,7 +8662,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28529,7 +27122,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28529,7 +27122,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -8674,7 +8671,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28570,27 +27163,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28570,27 +27163,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8706,7 +8703,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28626,17 +27202,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28626,17 +27202,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8728,7 +8725,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28741,27 +27310,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28741,27 +27310,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8761,7 +8758,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28770,7 +27323,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28770,7 +27323,7 @@
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -8770,7 +8767,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28811,27 +27364,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28811,27 +27364,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8802,7 +8799,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28867,17 +27403,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28867,17 +27403,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8824,7 +8821,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29005,27 +27534,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29005,27 +27534,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8857,7 +8854,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29034,7 +27547,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29034,7 +27547,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -8866,7 +8863,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29075,17 +27588,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29075,17 +27588,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8888,7 +8885,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29141,27 +27647,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29141,27 +27647,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8921,7 +8918,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29170,7 +27660,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29170,7 +27660,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -8930,7 +8927,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29259,27 +27749,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29259,27 +27749,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8963,7 +8960,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29288,7 +27762,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29288,7 +27762,7 @@
ac_cv_lib_png_png_read_info=no
fi
@@ -8972,7 +8969,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29329,27 +27803,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29329,27 +27803,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9004,7 +9001,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29385,17 +27842,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29385,17 +27842,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9026,7 +9023,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29492,27 +27942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29492,27 +27942,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9058,7 +9055,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29805,27 +28238,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29805,27 +28238,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9090,7 +9087,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29882,27 +28298,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29882,27 +28298,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9122,7 +9119,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -30005,27 +28404,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30005,27 +28404,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9154,7 +9151,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30061,17 +28443,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30061,17 +28443,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9176,7 +9173,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30167,27 +28542,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30167,27 +28542,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9208,7 +9205,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30223,17 +28581,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30223,17 +28581,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9230,7 +9227,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30343,27 +28694,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30343,27 +28694,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9263,7 +9260,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30372,7 +28707,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30372,7 +28707,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=no
fi
@@ -9272,7 +9269,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30437,27 +28772,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30437,27 +28772,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9305,7 +9302,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30466,7 +28785,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30466,7 +28785,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
fi
@@ -9314,7 +9311,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30603,7 +28922,7 @@ do
+@@ -30603,7 +28922,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9323,7 +9320,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30644,7 +28963,7 @@ do
+@@ -30644,7 +28963,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9332,7 +9329,7 @@
ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30867,17 +29186,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30867,17 +29186,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9354,7 +9351,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -30900,7 +29212,7 @@ if test "$ac_x_libraries" = no; then
+@@ -30900,7 +29212,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -9363,7 +9360,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30929,27 +29241,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30929,27 +29241,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9396,7 +9393,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -30962,7 +29258,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
+@@ -30962,7 +29258,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -9405,7 +9402,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -30970,7 +29266,7 @@ do
+@@ -30970,7 +29266,7 @@
done
fi
@@ -9414,7 +9411,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -31025,12 +29321,12 @@ else
+@@ -31025,12 +29321,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -9432,7 +9429,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31058,44 +29354,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31058,44 +29354,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9486,7 +9483,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31123,48 +29395,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31123,48 +29395,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9552,7 +9549,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -31213,27 +29467,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31213,27 +29467,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9585,7 +9582,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -31281,27 +29519,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31281,27 +29519,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9618,7 +9615,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31310,7 +29532,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31310,7 +29532,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -9627,7 +9624,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31363,27 +29585,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31363,27 +29585,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9660,7 +9657,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31392,7 +29598,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31392,7 +29598,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -9669,7 +9666,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31405,7 +29611,7 @@ fi
+@@ -31405,7 +29611,7 @@
fi
fi
@@ -9678,7 +9675,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -31480,27 +29686,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31480,27 +29686,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9711,7 +9708,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31509,7 +29699,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31509,7 +29699,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -9720,7 +9717,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -31558,27 +29748,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31558,27 +29748,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9753,7 +9750,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31587,7 +29761,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31587,7 +29761,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -9762,7 +9759,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31640,27 +29814,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31640,27 +29814,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9795,7 +9792,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31669,7 +29827,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31669,7 +29827,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -9804,7 +9801,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31752,27 +29910,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31752,27 +29910,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9837,7 +9834,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31781,7 +29923,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31781,7 +29923,7 @@
ac_cv_func_connect=no
fi
@@ -9846,7 +9843,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -31830,27 +29972,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31830,27 +29972,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9879,7 +9876,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31859,7 +29985,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31859,7 +29985,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -9888,7 +9885,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31935,27 +30061,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31935,27 +30061,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9921,7 +9918,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31964,7 +30074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31964,7 +30074,7 @@
ac_cv_func_remove=no
fi
@@ -9930,7 +9927,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -32013,27 +30123,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32013,27 +30123,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -9963,7 +9960,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32042,7 +30136,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32042,7 +30136,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -9972,7 +9969,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32118,27 +30212,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32118,27 +30212,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10005,7 +10002,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32147,7 +30225,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32147,7 +30225,7 @@
ac_cv_func_shmat=no
fi
@@ -10014,7 +10011,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -32196,27 +30274,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32196,27 +30274,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10047,7 +10044,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32225,7 +30287,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32225,7 +30287,7 @@
ac_cv_lib_ipc_shmat=no
fi
@@ -10056,7 +10053,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32289,27 +30351,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32289,27 +30351,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10089,7 +10086,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32318,7 +30364,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32318,7 +30364,7 @@
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -10098,7 +10095,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32417,31 +30463,15 @@ esac
+@@ -32417,31 +30463,15 @@
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
@@ -10138,7 +10135,7 @@
ac_cv_func_XOpenDisplay=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32450,7 +30480,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32450,7 +30480,7 @@
ac_cv_func_XOpenDisplay=no
fi
@@ -10147,7 +10144,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
-@@ -32526,27 +30556,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32526,27 +30556,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10180,7 +10177,7 @@
ac_cv_func_XextFindDisplay=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32555,7 +30569,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32555,7 +30569,7 @@
ac_cv_func_XextFindDisplay=no
fi
@@ -10189,7 +10186,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
-@@ -32631,27 +30645,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32631,27 +30645,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10222,7 +10219,7 @@
ac_cv_func_XRenderQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32660,7 +30658,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32660,7 +30658,7 @@
ac_cv_func_XRenderQueryExtension=no
fi
@@ -10231,7 +10228,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
-@@ -32706,27 +30704,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32706,27 +30704,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10263,7 +10260,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
else
-@@ -32762,27 +30743,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32762,27 +30743,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10295,7 +10292,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-@@ -32876,27 +30840,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32876,27 +30840,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10328,7 +10325,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -32905,7 +30853,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32905,7 +30853,7 @@
eval "$as_ac_var=no"
fi
@@ -10337,7 +10334,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -32989,27 +30937,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32989,27 +30937,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10370,7 +10367,7 @@
ac_cv_func_XAddConnectionWatch=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33018,7 +30950,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33018,7 +30950,7 @@
ac_cv_func_XAddConnectionWatch=no
fi
@@ -10379,7 +10376,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
-@@ -33119,27 +31051,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33119,27 +31051,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10412,7 +10409,7 @@
ac_cv_func_XkbQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33148,7 +31064,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33148,7 +31064,7 @@
ac_cv_func_XkbQueryExtension=no
fi
@@ -10421,7 +10418,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
-@@ -33230,27 +31146,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33230,27 +31146,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10454,7 +10451,7 @@
ac_cv_func_XShapeCombineMask=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33259,7 +31159,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33259,7 +31159,7 @@
ac_cv_func_XShapeCombineMask=no
fi
@@ -10463,7 +10460,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
-@@ -33339,27 +31239,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33339,27 +31239,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10496,7 +10493,7 @@
ac_cv_func_XSyncQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33368,7 +31252,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33368,7 +31252,7 @@
ac_cv_func_XSyncQueryExtension=no
fi
@@ -10505,7 +10502,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
-@@ -33402,27 +31286,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33402,27 +31286,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10537,7 +10534,7 @@
ac_cv_header_X11_extensions_sync_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33518,27 +31385,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33518,27 +31385,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10570,7 +10567,7 @@
ac_cv_func_XShmAttach=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33547,7 +31398,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33547,7 +31398,7 @@
ac_cv_func_XShmAttach=no
fi
@@ -10579,7 +10576,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
-@@ -33598,27 +31449,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33598,27 +31449,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10612,7 +10609,7 @@
ac_cv_lib_XextSam_XShmAttach=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33627,7 +31462,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33627,7 +31462,7 @@
ac_cv_lib_XextSam_XShmAttach=no
fi
@@ -10621,7 +10618,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33681,27 +31516,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33681,27 +31516,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10653,7 +10650,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33737,17 +31555,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33737,17 +31555,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10675,7 +10672,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33845,27 +31656,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33845,27 +31656,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10707,7 +10704,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33901,17 +31695,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33901,17 +31695,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10729,7 +10726,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34021,27 +31808,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34021,27 +31808,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10761,7 +10758,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34138,27 +31908,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34138,27 +31908,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10794,7 +10791,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34167,7 +31921,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34167,7 +31921,7 @@
ac_cv_func_XineramaGetInfo=no
fi
@@ -10803,7 +10800,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -34201,27 +31955,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34201,27 +31955,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10835,7 +10832,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34312,27 +32049,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34312,27 +32049,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10868,7 +10865,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34341,7 +32062,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34341,7 +32062,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -10877,7 +10874,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34376,27 +32097,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34376,27 +32097,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10909,7 +10906,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34528,27 +32232,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34528,27 +32232,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10942,7 +10939,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34557,7 +32245,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34557,7 +32245,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -10951,7 +10948,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34592,27 +32280,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34592,27 +32280,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -10983,7 +10980,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34825,8 +32496,18 @@ echo $ECHO_N "checking for DirectFB... $
+@@ -34825,8 +32496,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
{ echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6; }
@@ -11004,7 +11001,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -34935,27 +32616,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34935,27 +32616,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11037,7 +11034,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34970,7 +32635,7 @@ echo "$as_me: error:
+@@ -34970,7 +32635,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -11046,7 +11043,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34978,7 +32643,7 @@ fi
+@@ -34978,7 +32643,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -11055,7 +11052,7 @@
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
-@@ -35066,27 +32731,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35066,27 +32731,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11088,7 +11085,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -35101,7 +32750,7 @@ echo "$as_me: error:
+@@ -35101,7 +32750,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -11097,7 +11094,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -35167,7 +32816,7 @@ do
+@@ -35167,7 +32816,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11106,7 +11103,7 @@
ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35259,27 +32908,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35259,27 +32908,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11138,7 +11135,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35315,17 +32947,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35315,17 +32947,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11160,7 +11157,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35428,27 +33053,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35428,27 +33053,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11192,7 +11189,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35484,17 +33092,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35484,17 +33092,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -11214,7 +11211,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35653,7 +33254,7 @@ do
+@@ -35653,7 +33254,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11223,7 +11220,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
-@@ -35738,7 +33339,7 @@ do
+@@ -35738,7 +33339,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11232,7 +11229,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35798,7 +33399,7 @@ do
+@@ -35798,7 +33399,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11241,7 +11238,7 @@
ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35867,7 +33468,7 @@ do
+@@ -35867,7 +33468,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11250,7 +11247,7 @@
ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -36068,6 +33669,13 @@ echo "$as_me: error: conditional \"am__f
+@@ -36068,6 +33669,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11264,7 +11261,7 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36442,7 +34050,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -36442,7 +34050,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -11274,7 +11271,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -36451,10 +34060,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -36451,10 +34060,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -11291,7 +11288,7 @@
# PATH needs CR
-@@ -36678,19 +34290,28 @@ else
+@@ -36678,19 +34290,28 @@
as_mkdir_p=false
fi
@@ -11331,7 +11328,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'"
-@@ -36706,7 +34327,7 @@ exec 6>&1
+@@ -36706,7 +34327,7 @@
# values after options handling.
ac_log="
This file was extended by gtk+ $as_me 2.11.6, which was
@@ -11340,7 +11337,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -36735,7 +34356,7 @@ current configuration.
+@@ -36735,7 +34356,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -11349,7 +11346,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -36759,7 +34380,7 @@ _ACEOF
+@@ -36759,7 +34380,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
gtk+ config.status 2.11.6
@@ -11358,7 +11355,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -37125,9 +34746,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+@@ -37125,9 +34746,9 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -11370,7 +11367,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37169,6 +34790,8 @@ _ACEOF
+@@ -37169,6 +34790,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -11379,7 +11376,7 @@
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -37176,6 +34799,7 @@ HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim
+@@ -37176,6 +34799,7 @@
HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim
HAVE_OBJC_TRUE!$HAVE_OBJC_TRUE$ac_delim
HAVE_OBJC_FALSE!$HAVE_OBJC_FALSE$ac_delim
@@ -11387,7 +11384,7 @@
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
-@@ -37263,9 +34887,6 @@ INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_
+@@ -37263,9 +34887,6 @@
INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
@@ -11397,7 +11394,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37307,6 +34928,9 @@ _ACEOF
+@@ -37307,6 +34928,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -11407,7 +11404,7 @@
INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
-@@ -37401,11 +35025,9 @@ XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_de
+@@ -37401,11 +35025,9 @@
XMLCATALOG!$XMLCATALOG$ac_delim
ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
@@ -11420,7 +11417,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -37441,6 +35063,51 @@ CEOF$ac_eof
+@@ -37441,6 +35063,51 @@
_ACEOF
@@ -11472,7 +11469,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -37684,7 +35351,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+@@ -37684,7 +35351,7 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -11481,10 +11478,9 @@
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/contrib/Makefile.in gtk+2.0-2.11.6/contrib/Makefile.in
--- gtk+2.0-2.11.6.orig/contrib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/contrib/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/contrib/Makefile.in 2007-07-24 10:36:26.000000000 +0200
+@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11493,7 +11489,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -245,6 +247,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11501,10 +11497,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in
--- gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-24 10:36:26.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11513,7 +11508,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11521,10 +11516,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/demos/Makefile.in gtk+2.0-2.11.6/demos/Makefile.in
--- gtk+2.0-2.11.6.orig/demos/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/demos/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/demos/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11533,7 +11527,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -245,6 +247,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11541,10 +11535,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in
--- gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11553,7 +11546,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11561,10 +11554,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/Makefile.in gtk+2.0-2.11.6/docs/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/Makefile.in 2007-07-20 22:21:31.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11573,7 +11565,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11581,10 +11573,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/faq/Makefile.in gtk+2.0-2.11.6/docs/faq/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/faq/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/faq/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/faq/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11593,7 +11584,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11601,10 +11592,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/Makefile.in gtk+2.0-2.11.6/docs/reference/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/reference/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/Makefile.in 2007-07-23 22:02:59.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/reference/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11613,7 +11603,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11621,10 +11611,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11633,7 +11622,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -250,6 +252,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11641,10 +11630,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11653,7 +11641,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -250,6 +252,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11661,10 +11649,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11673,7 +11660,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -250,6 +252,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11681,10 +11668,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/tools/Makefile.in gtk+2.0-2.11.6/docs/tools/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/tools/Makefile.in 2007-07-20 22:21:32.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/tools/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/tools/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11693,7 +11679,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11701,10 +11687,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.6/docs/tutorial/Makefile.in
--- gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/docs/tutorial/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/docs/tutorial/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11713,7 +11698,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11721,10 +11706,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/Makefile.in gtk+2.0-2.11.6/gdk/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11733,7 +11717,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11741,10 +11725,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.6/gdk/directfb/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/directfb/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/directfb/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11753,7 +11736,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11761,10 +11744,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.6/gdk/quartz/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/quartz/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/quartz/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11773,7 +11755,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11781,10 +11763,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in gtk+2.0-2.11.6/gdk/win32/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/win32/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/win32/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11793,7 +11774,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11801,10 +11782,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in 2007-07-20 22:21:34.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11813,7 +11793,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11821,10 +11801,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in gtk+2.0-2.11.6/gdk/x11/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in 2007-07-20 22:21:35.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk/x11/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk/x11/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11833,7 +11812,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -246,6 +248,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -246,6 +248,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11841,10 +11820,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11853,7 +11831,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11861,10 +11839,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in
--- gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-20 22:21:33.000000000 +0200
-+++ gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in 2007-07-23 22:03:00.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11873,7 +11850,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11881,10 +11858,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/Makefile.in gtk+2.0-2.11.6/gtk/Makefile.in
--- gtk+2.0-2.11.6.orig/gtk/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/Makefile.in 2007-07-23 22:03:01.000000000 +0200
-@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gtk/Makefile.in 2007-07-24 10:37:34.000000000 +0200
+@@ -113,6 +113,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11893,7 +11869,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -268,6 +270,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -268,6 +270,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11901,7 +11877,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -376,6 +379,8 @@ INCLUDES = \
+@@ -376,6 +379,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -11910,7 +11886,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -631,7 +636,10 @@ gtk_public_h_sources = \
+@@ -631,13 +636,16 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -11918,11 +11894,19 @@
+ gtkfilesystem.h \
+ gtkfilesystemmodel.h \
+ gtkfilechooserprivate.h \
-+ gtkfilechooserutils.h
++ gtkfilechooserutils.h \
++ gtkquery.h \
++ gtksearchengine.h
# GTK+ header files that don't get installed
-@@ -647,10 +655,7 @@ gtk_private_h_sources = \
+ gtk_private_h_sources = \
+- gtkquery.h \
+- gtksearchengine.h \
+ gtksearchenginebeagle.h \
+ gtksearchenginetracker.h\
+ gtksearchenginesimple.h \
+@@ -647,10 +655,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -11933,10 +11917,9 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in
--- gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11945,7 +11928,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11953,10 +11936,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in
--- gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -11965,7 +11947,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -11973,9 +11955,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/ltmain.sh gtk+2.0-2.11.6/ltmain.sh
--- gtk+2.0-2.11.6.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.6/ltmain.sh 2007-07-11 23:11:42.000000000 +0200
++++ gtk+2.0-2.11.6/ltmain.sh 2007-07-24 10:36:27.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -11987,7 +11968,7 @@
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@ EXIT_FAILURE=1
+@@ -43,14 +43,22 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -12015,7 +11996,7 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@ esac
+@@ -105,12 +113,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
@@ -12036,7 +12017,7 @@
# Make sure IFS has a sensible default
lt_nl='
-@@ -136,6 +146,8 @@ duplicate_deps=no
+@@ -136,6 +146,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -12045,7 +12026,7 @@
#####################################
# Shell function definitions:
-@@ -196,7 +208,13 @@ func_win32_libid ()
+@@ -196,7 +208,13 @@
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
@@ -12060,7 +12041,7 @@
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@ func_extract_archives ()
+@@ -327,7 +345,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
@@ -12079,7 +12060,7 @@
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@ do
+@@ -454,11 +482,12 @@
;;
--version)
@@ -12097,7 +12078,7 @@
exit $?
;;
-@@ -755,9 +784,10 @@ if test -z "$show_help"; then
+@@ -755,9 +784,10 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -12109,7 +12090,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@ EOF
+@@ -1138,8 +1168,9 @@
for arg
do
case $arg in
@@ -12121,7 +12102,7 @@
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
-@@ -1147,12 +1178,20 @@ EOF
+@@ -1147,12 +1178,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
@@ -12144,7 +12125,7 @@
build_libtool_libs=no
build_old_libs=yes
break
-@@ -1600,7 +1639,7 @@ EOF
+@@ -1600,7 +1639,7 @@
continue
;;
@@ -12153,7 +12134,7 @@
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@ EOF
+@@ -1620,10 +1659,11 @@
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
@@ -12168,7 +12149,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@ EOF
+@@ -1651,9 +1691,9 @@
-no-install)
case $host in
@@ -12180,7 +12161,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1712,7 +1752,7 @@ EOF
+@@ -1712,7 +1752,7 @@
continue
;;
@@ -12189,7 +12170,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -2082,7 +2122,10 @@ EOF
+@@ -2082,7 +2122,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -12201,7 +12182,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -2094,7 +2137,7 @@ EOF
+@@ -2094,7 +2137,7 @@
lib=
found=no
case $deplib in
@@ -12210,7 +12191,7 @@
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2490,7 +2533,9 @@ EOF
+@@ -2490,7 +2533,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -12221,7 +12202,7 @@
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
-@@ -3186,7 +3231,7 @@ EOF
+@@ -3186,7 +3231,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
@@ -12230,7 +12211,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -3197,9 +3242,15 @@ EOF
+@@ -3197,9 +3242,15 @@
age="0"
;;
irix|nonstopux)
@@ -12247,7 +12228,7 @@
;;
esac
;;
-@@ -3258,7 +3309,8 @@ EOF
+@@ -3258,7 +3309,8 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -12257,7 +12238,7 @@
;;
freebsd-aout)
-@@ -3272,8 +3324,11 @@ EOF
+@@ -3272,8 +3324,11 @@
;;
irix | nonstopux)
@@ -12271,7 +12252,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3410,11 +3465,11 @@ EOF
+@@ -3410,11 +3465,11 @@
fi
# Eliminate all temporary directories.
@@ -12288,7 +12269,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3515,13 +3570,12 @@ EOF
+@@ -3515,13 +3570,12 @@
int main() { return 0; }
EOF
$rm conftest
@@ -12304,7 +12285,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3560,9 +3614,7 @@ EOF
+@@ -3560,9 +3614,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
@@ -12315,7 +12296,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3594,7 +3646,7 @@ EOF
+@@ -3594,7 +3646,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -12324,7 +12305,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3880,7 +3932,10 @@ EOF
+@@ -3880,7 +3932,10 @@
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -12336,7 +12317,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -4239,12 +4294,14 @@ EOF
+@@ -4239,12 +4294,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -12353,7 +12334,7 @@
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
-@@ -4692,16 +4749,16 @@ static const void *lt_preloaded_setup()
+@@ -4692,16 +4749,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
@@ -12376,7 +12357,7 @@
;;
esac
;;
-@@ -4716,13 +4773,13 @@ static const void *lt_preloaded_setup()
+@@ -4716,13 +4773,13 @@
# really was required.
# Nullify the symbol file.
@@ -12393,7 +12374,7 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -4809,7 +4866,7 @@ static const void *lt_preloaded_setup()
+@@ -4809,7 +4866,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -12402,7 +12383,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4846,7 +4903,7 @@ static const void *lt_preloaded_setup()
+@@ -4846,7 +4903,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -12411,7 +12392,7 @@
fi
# Quote $echo for shipping.
-@@ -5253,6 +5310,20 @@ EOF
+@@ -5253,6 +5310,20 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -12432,7 +12413,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5395,7 +5466,7 @@ else
+@@ -5395,7 +5466,7 @@
;;
esac
$echo >> $output "\
@@ -12441,7 +12422,7 @@
exit $EXIT_FAILURE
fi
else
-@@ -5581,7 +5652,7 @@ fi\
+@@ -5581,7 +5652,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -12450,7 +12431,7 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -5926,9 +5997,9 @@ relink_command=\"$relink_command\""
+@@ -5926,9 +5997,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -12462,7 +12443,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6137,7 +6208,7 @@ relink_command=\"$relink_command\""
+@@ -6137,7 +6208,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -12471,7 +12452,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -6348,8 +6419,10 @@ relink_command=\"$relink_command\""
+@@ -6348,8 +6419,10 @@
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -12484,7 +12465,7 @@
fi
;;
-@@ -6413,12 +6486,12 @@ relink_command=\"$relink_command\""
+@@ -6413,12 +6486,12 @@
fi
# Restore saved environment variables
@@ -12503,7 +12484,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -6775,9 +6848,9 @@ The following components of LINK-COMMAND
+@@ -6775,9 +6848,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -12515,7 +12496,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6791,9 +6864,11 @@ The following components of LINK-COMMAND
+@@ -6791,9 +6864,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
@@ -12529,10 +12510,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/m4macros/Makefile.in gtk+2.0-2.11.6/m4macros/Makefile.in
--- gtk+2.0-2.11.6.orig/m4macros/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/m4macros/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/m4macros/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12541,7 +12521,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12549,10 +12529,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/Makefile.in gtk+2.0-2.11.6/modules/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12561,7 +12540,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12569,10 +12548,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/Makefile.in gtk+2.0-2.11.6/modules/engines/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/engines/Makefile.in 2007-07-20 22:21:36.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/engines/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12581,7 +12559,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12589,10 +12567,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12601,7 +12578,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12609,10 +12586,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12621,7 +12597,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12629,10 +12605,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12641,7 +12616,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12649,10 +12624,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12661,7 +12635,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12669,10 +12643,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/input/Makefile.in gtk+2.0-2.11.6/modules/input/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/input/Makefile.in 2007-07-20 22:21:37.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/input/Makefile.in 2007-07-23 22:03:02.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/input/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12681,7 +12654,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12689,7 +12662,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -428,9 +431,10 @@ im_multipress_la_LIBADD = $(LDADDS)
+@@ -428,9 +431,10 @@
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -12701,7 +12674,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -983,7 +987,18 @@ uninstall-local:
+@@ -983,7 +987,18 @@
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -12721,10 +12694,9 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.6/modules/printbackends/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/printbackends/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12733,7 +12705,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -246,6 +248,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -246,6 +248,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12741,10 +12713,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12753,7 +12724,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12761,10 +12732,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12773,7 +12743,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12781,10 +12751,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12793,7 +12762,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12801,10 +12770,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in
--- gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in 2007-07-20 22:21:38.000000000 +0200
-+++ gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12813,7 +12781,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12821,10 +12789,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/perf/Makefile.in gtk+2.0-2.11.6/perf/Makefile.in
--- gtk+2.0-2.11.6.orig/perf/Makefile.in 2007-07-20 22:21:39.000000000 +0200
-+++ gtk+2.0-2.11.6/perf/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/perf/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12833,7 +12800,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
@@ -12841,10 +12808,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/tests/Makefile.in gtk+2.0-2.11.6/tests/Makefile.in
--- gtk+2.0-2.11.6.orig/tests/Makefile.in 2007-07-20 22:21:39.000000000 +0200
-+++ gtk+2.0-2.11.6/tests/Makefile.in 2007-07-23 22:03:03.000000000 +0200
-@@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
++++ gtk+2.0-2.11.6/tests/Makefile.in 2007-07-24 10:36:27.000000000 +0200
+@@ -92,6 +92,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -12853,7 +12819,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -247,6 +249,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -247,6 +249,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
REBUILD_PNGS = @REBUILD_PNGS@
More information about the pkg-gnome-commits
mailing list