--- gtk+2.0-2.11.6.orig/debian/patches/series
+++ gtk+2.0-2.11.6/debian/patches/series
@@ -0,0 +1,20 @@
+001_static-linking-dont-query-immodules.patch
+002_static-linking-dont-build-perf.patch
+004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
+005_xpmico.patch
+006_proper-directfb-modules.patch
+007_implicit_pointer_conversion_gdkdrawable_directfb.patch
+008_implicit_pointer_conversion_gdkgc_directfb.patch
+009_gtk-export-filechooser.patch
+015_default-fallback-icon-theme.patch
+020_immodules-files-d.patch
+021_loader-files-d.patch
+030_gtkentry_password-char-circle.patch
+033_treeview_resizing.patch
+040_filechooser_single-click.patch
+041_ia32-libs.patch
+070_mandatory-relibtoolize.patch
+080_from_svn_fix_dangling_tooltip.patch
+081_from_bugzilla_fix_cups1.3_build.patch
+090_from_fedora_better_tooltip_compat.patch
+091_workaround_no_gtk_init_incorrect_display.patch
--- gtk+2.0-2.11.6.orig/debian/patches/081_from_bugzilla_fix_cups1.3_build.patch
+++ gtk+2.0-2.11.6/debian/patches/081_from_bugzilla_fix_cups1.3_build.patch
@@ -0,0 +1,22 @@
+Index: gtk+2.0-2.11.6/modules/printbackends/cups/gtkcupsutils.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/modules/printbackends/cups/gtkcupsutils.c	2007-08-31 17:20:40.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/cups/gtkcupsutils.c	2007-08-31 17:21:37.000000000 +0200
+@@ -635,7 +635,7 @@
+   httpSetField (request->http, HTTP_FIELD_CONTENT_LENGTH, length);
+   httpSetField (request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+ #ifdef HAVE_HTTP_AUTHSTRING
+-  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
++  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
+ #endif
+ 
+   if (httpPost (request->http, request->resource))
+@@ -974,7 +974,7 @@
+ 
+   httpClearFields (request->http);
+ #ifdef HAVE_HTTP_AUTHSTRING
+-  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
++  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
+ #endif
+ 
+   if (httpGet (request->http, request->resource))
--- gtk+2.0-2.11.6.orig/debian/patches/090_from_fedora_better_tooltip_compat.patch
+++ gtk+2.0-2.11.6/debian/patches/090_from_fedora_better_tooltip_compat.patch
@@ -0,0 +1,44 @@
+--- trunk/gtk/gtktooltips.c	2007/07/21 13:19:11	18520
++++ trunk/gtk/gtktooltips.c	2007/08/07 13:32:19	18587
+@@ -103,6 +103,8 @@
+   private->tips_data_table =
+     g_hash_table_new_full (NULL, NULL, NULL,
+                            (GDestroyNotify) gtk_tooltips_destroy_data);
++
++  gtk_tooltips_force_window (tooltips);
+ }
+ 
+ static void
+@@ -144,6 +146,12 @@
+ 
+   g_return_if_fail (tooltips != NULL);
+ 
++  if (tooltips->tip_window)
++    {
++      gtk_widget_destroy (tooltips->tip_window);
++      tooltips->tip_window = NULL;
++    }
++
+   g_hash_table_remove_all (private->tips_data_table);
+ 
+   GTK_OBJECT_CLASS (gtk_tooltips_parent_class)->destroy (object);
+@@ -154,7 +162,18 @@
+ {
+   g_return_if_fail (GTK_IS_TOOLTIPS (tooltips));
+ 
+-  /* nop */
++  if (!tooltips->tip_window)
++    {
++      tooltips->tip_window = gtk_window_new (GTK_WINDOW_POPUP);
++      g_signal_connect (tooltips->tip_window,
++			"destroy",
++			G_CALLBACK (gtk_widget_destroyed),
++			&tooltips->tip_window);
++
++      tooltips->tip_label = gtk_label_new (NULL);
++      gtk_container_add (GTK_CONTAINER (tooltips->tip_window),
++			 tooltips->tip_label);
++    }
+ }
+ 
+ void
--- gtk+2.0-2.11.6.orig/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch
+++ gtk+2.0-2.11.6/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch
@@ -0,0 +1,12 @@
+Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
+@@ -287,6 +287,7 @@
+ gtk_clipboard_get_for_display (GdkDisplay *display, 
+ 			       GdkAtom     selection)
+ {
++  g_return_val_if_fail (display != NULL, NULL);
+   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+   g_return_val_if_fail (!display->closed, NULL);
+ 
--- gtk+2.0-2.11.6.orig/debian/patches/080_from_svn_fix_dangling_tooltip.patch
+++ gtk+2.0-2.11.6/debian/patches/080_from_svn_fix_dangling_tooltip.patch
@@ -0,0 +1,11 @@
+--- trunk/gtk/gtktooltip.c	2007/07/25 16:19:36	18543
++++ trunk/gtk/gtktooltip.c	2007/07/25 17:45:22	18544
+@@ -1118,7 +1118,7 @@
+   /* Hide the tooltip when there's no new tooltip widget */
+   if (!has_tooltip_widget)
+     {
+-      if (current_tooltip && GTK_TOOLTIP_VISIBLE (current_tooltip))
++      if (current_tooltip)
+ 	gtk_tooltip_hide_tooltip (current_tooltip);
+ 
+       return;
--- gtk+2.0-2.11.6.orig/debian/patches/030_gtkentry_password-char-circle.patch
+++ gtk+2.0-2.11.6/debian/patches/030_gtkentry_password-char-circle.patch
@@ -0,0 +1,35 @@
+Index: gtk+2.0-2.11.3/gtk/gtkentry.c
+===================================================================
+--- gtk+2.0-2.11.3.orig/gtk/gtkentry.c	2007-06-15 20:07:37.000000000 +0200
++++ gtk+2.0-2.11.3/gtk/gtkentry.c	2007-06-16 14:25:47.000000000 +0200
+@@ -537,7 +537,7 @@
+                                    g_param_spec_unichar ("invisible-char",
+ 							 P_("Invisible character"),
+ 							 P_("The character to use when masking entry contents (in \"password mode\")"),
+-							 '*',
++							 (gunichar) 0x25CF,
+ 							 GTK_PARAM_READWRITE));
+ 
+   g_object_class_install_property (gobject_class,
+@@ -1101,7 +1101,7 @@
+ 
+   entry->editable = TRUE;
+   entry->visible = TRUE;
+-  entry->invisible_char = '*';
++  entry->invisible_char = (gunichar) 0x25CF;
+   entry->dnd_position = -1;
+   entry->width_chars = -1;
+   entry->is_cell_renderer = FALSE;
+@@ -4550,9 +4550,9 @@
+  * gtk_entry_set_visibility() has been called to set text visibility
+  * to %FALSE. i.e. this is the character used in "password mode" to
+  * show the user how many characters have been typed. The default
+- * invisible char is an asterisk ('*').  If you set the invisible char
+- * to 0, then the user will get no feedback at all; there will be
+- * no text on the screen as they type.
++ * invisible char is a black circle (Unicode character 25CF).  If
++ * you set the invisible char to 0, then the user will get no
++ * feedback at all; there will be no text on the screen as they type.
+  **/
+ void
+ gtk_entry_set_invisible_char (GtkEntry *entry,
--- gtk+2.0-2.11.6.orig/debian/patches/006_proper-directfb-modules.patch
+++ gtk+2.0-2.11.6/debian/patches/006_proper-directfb-modules.patch
@@ -0,0 +1,34 @@
+GNOME #447118; related to Debian #381081
+
+--- gtk+2.0-2.11.6.orig/configure.in	2007-07-23 21:59:10.000000000 +0200
++++ gtk+2.0-2.11.6/configure.in	2007-07-23 21:59:13.000000000 +0200
+@@ -1404,8 +1404,18 @@
+ 
+   if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
+       AC_MSG_RESULT(found)
+-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
+-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
++      # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before
++      # cairo's if both are available (cairo is required by pango); this is
++      # enough to build gdk/
++      GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES"
++      # you'd think this isn't needed, but as soon as cairo-directfb or
++      # directfb requires a "rpath" and you want to build binaries (for
++      # example gtk-query-immodules), you need the CFLAGS and LDFLAGS
++      # everywhere; this trick abuses the fact that GTK_DEP_LIBS and
++      # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the
++      # necessary rpath flags
++      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`"
++      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS"
+   else
+       AC_MSG_ERROR([
+ *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
+@@ -1457,7 +1467,7 @@
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+ 
+-GDK_PACKAGES="$PANGO_PACKAGES"
++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
+ if test "x$gdktarget" = "xx11"; then
+   GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
+ fi
--- gtk+2.0-2.11.6.orig/debian/patches/005_xpmico.patch
+++ gtk+2.0-2.11.6/debian/patches/005_xpmico.patch
@@ -0,0 +1,19 @@
+Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c
+===================================================================
+--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c	2007-06-06 13:43:15.000000000 +0200
++++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c	2007-06-13 11:07:11.000000000 +0200
+@@ -208,6 +208,14 @@
+ 	
+  	State->HeaderSize = 6 + IconCount*16;
+ 
++	if (State->HeaderSize < 0) {
++		g_set_error (error,
++			     GDK_PIXBUF_ERROR,
++			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
++			     _("Invalid header in icon"));
++		return;
++	}
++
+  	if (State->HeaderSize>State->BytesInHeaderBuf) {
+  		guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
+ 		if (!tmp) {
--- gtk+2.0-2.11.6.orig/debian/patches/070_mandatory-relibtoolize.patch
+++ gtk+2.0-2.11.6/debian/patches/070_mandatory-relibtoolize.patch
@@ -0,0 +1,12829 @@
+Classical relibtoolizing patch generated with:
+libtoolize --force --copy
+aclocal-1.7 -I m4macros
+autoconf
+automake-1.7
+rm -rf autom4te.cache
+exclude config.guess and sub with diff -urN -x config.guess -x config.sub
+
+--- gtk+2.0-2.11.6.orig/Makefile.in	2007-07-20 22:21:30.000000000 +0200
++++ gtk+2.0-2.11.6/Makefile.in	2007-07-24 10:36:26.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -245,6 +247,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -327,7 +330,10 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++# don't build perf measurement tools in static builds
++@ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
+@@ -478,13 +484,14 @@
+ DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ 	COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
+ 	acinclude.m4 aclocal.m4 compile config.guess config.h.in \
+-	config.h.win32.in config.sub configure.in depcomp \
++	config.h.win32.in config.sub configure configure.in depcomp \
+ 	gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \
+ 	gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \
+ 	gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \
+ 	gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \
+ 	missing mkinstalldirs
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
++	perf contrib docs m4macros
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -736,7 +743,7 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d $(distdir)/$$subdir \
+ 	    || mkdir $(distdir)/$$subdir \
+--- gtk+2.0-2.11.6.orig/aclocal.m4	2007-07-20 22:21:07.000000000 +0200
++++ gtk+2.0-2.11.6/aclocal.m4	2007-07-24 10:36:26.000000000 +0200
+@@ -941,7 +941,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 48 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -1104,7 +1104,7 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+@@ -1191,8 +1191,9 @@
+ # Check for compiler boilerplate output or warnings with
+ # the simple compiler test code.
+ AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -1204,8 +1205,9 @@
+ # Check for linker boilerplate output or warnings with
+ # the simple link test code.
+ AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -1221,12 +1223,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+@@ -1457,13 +1467,17 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case `/usr/bin/file conftest.o` in
+     *32-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -1480,6 +1494,9 @@
+       ;;
+     *64-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -1551,7 +1568,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -1592,11 +1609,12 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -1710,24 +1728,27 @@
+     fi
+     ;;
+   *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ 	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ ])
+@@ -1954,7 +1975,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -1962,7 +1984,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -2102,6 +2124,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+@@ -2119,7 +2142,8 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -2133,20 +2157,58 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
+ if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -2303,12 +2365,8 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -2325,18 +2383,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -2374,7 +2420,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -2437,7 +2483,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[[3-9]]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2492,7 +2538,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2506,27 +2552,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-    if AC_TRY_EVAL(ac_compile); then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2538,7 +2567,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2547,7 +2576,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -2631,6 +2660,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -2736,7 +2769,8 @@
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+@@ -2997,7 +3031,7 @@
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -3060,7 +3094,7 @@
+ 
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -3207,7 +3241,7 @@
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -3246,16 +3280,22 @@
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -3293,7 +3333,7 @@
+   esac
+   ;;
+ 
+-interix3*)
++interix[[3-9]]*)
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+   ;;
+@@ -3309,11 +3349,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -3343,6 +3383,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -3395,7 +3439,7 @@
+   lt_cv_path_NM="$NM"
+ else
+   lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+     lt_nm_to_check="$lt_nm_to_check nm"
+   fi
+   for lt_tmp_nm in $lt_nm_to_check; do
+@@ -3611,10 +3655,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ _LT_AC_SYS_COMPILER
+ 
+@@ -3716,10 +3760,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -3865,7 +3909,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -4024,10 +4068,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -4061,7 +4105,7 @@
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -4110,9 +4154,7 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
++      hppa*64*|ia64*) ;;
+       *)
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+@@ -4180,7 +4222,7 @@
+ 	;;
+     esac
+     ;;
+-  interix3*)
++  interix[[3-9]]*)
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -4220,7 +4262,7 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+       KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -4300,6 +4342,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -4322,7 +4387,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -4338,16 +4403,20 @@
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+-    output_verbose_link_cmd='echo'
+     ;;
+   osf3*)
+     case $cc_basename in
+@@ -4509,15 +4578,10 @@
+ 	case $host_os in
+ 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -4564,6 +4628,12 @@
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+@@ -4807,7 +4877,7 @@
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+-interix3*)
++interix[[3-9]]*)
+   # Interix 3.5 installs completely hosed .la files for C++, so rather than
+   # hack all around it, let's just trust "g++" to DTRT.
+   _LT_AC_TAGVAR(predep_objects,$1)=
+@@ -4815,13 +4885,46 @@
+   _LT_AC_TAGVAR(postdeps,$1)=
+   ;;
+ 
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
+ solaris*)
+   case $cc_basename in
+   CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
+     # Adding this requires a known-good setup of shared libraries for
+     # Sun compiler versions before 5.6, else PIC objects from an old
+     # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
+     ;;
+   esac
+   ;;
+@@ -4870,10 +4973,17 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4952,10 +5062,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -5008,7 +5118,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -5097,6 +5207,7 @@
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+@@ -5143,7 +5254,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5468,7 +5579,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -5551,6 +5662,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -5587,7 +5699,7 @@
+   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'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   if test "$host_cpu" = ia64; then
+     symcode='[[ABCDGIRSTW]]'
+     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -5777,12 +5889,14 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -5794,7 +5908,7 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+-    interix3*)
++    interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -5860,7 +5974,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -5903,7 +6017,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -5930,6 +6044,14 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -5946,7 +6068,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -6050,13 +6172,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+@@ -6066,7 +6190,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -6124,7 +6248,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -6157,7 +6281,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -6176,6 +6300,22 @@
+         # All Alpha code is PIC.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -6185,6 +6325,10 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
+     solaris*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -6279,7 +6423,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -6296,7 +6441,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -6435,7 +6583,7 @@
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -6453,7 +6601,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[[3-9]]*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -6468,7 +6616,7 @@
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -6486,20 +6634,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -6532,7 +6690,7 @@
+ 
+     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+       case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<_LT_EOF 1>&2
+ 
+@@ -6651,7 +6809,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -6744,7 +6902,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+@@ -6786,10 +6944,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -6829,7 +6987,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       _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_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -6951,24 +7109,28 @@
+       ;;
+ 
+     openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+@@ -7027,17 +7189,16 @@
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -7094,7 +7255,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -7169,7 +7330,7 @@
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+@@ -7272,6 +7433,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+ 
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+@@ -7292,12 +7477,13 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -7330,6 +7516,7 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+@@ -7650,7 +7837,8 @@
+ 
+ _PKG_TEXT
+ ])],
+-		[$4])
++		[AC_MSG_RESULT([no])
++                $4])
+ 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 @@
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ 		[$4])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+@@ -7879,7 +8067,7 @@
+ 	  AC_CHECK_FUNCS(dcgettext)
+ 	  MSGFMT_OPTS=
+ 	  AC_MSG_CHECKING([if msgfmt accepts -c])
+-	  GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
++	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+ msgid ""
+ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -8323,22 +8511,22 @@
+   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+   dnl for overriding the documentation installation directory
+-  AC_ARG_WITH(html-dir,
+-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++  AC_ARG_WITH([html-dir],
++    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+     [with_html_dir='${datadir}/gtk-doc/html'])
+   HTML_DIR="$with_html_dir"
+-  AC_SUBST(HTML_DIR)
++  AC_SUBST([HTML_DIR])
+ 
+   dnl enable/disable documentation building
+-  AC_ARG_ENABLE(gtk-doc,
+-    AC_HELP_STRING([--enable-gtk-doc],
+-                   [use gtk-doc to build documentation [default=no]]),,
+-    enable_gtk_doc=no)
++  AC_ARG_ENABLE([gtk-doc],
++    AS_HELP_STRING([--enable-gtk-doc],
++                   [use gtk-doc to build documentation [[default=no]]]),,
++    [enable_gtk_doc=no])
+ 
+   have_gtk_doc=no
+   if test x$enable_gtk_doc = xyes; then
+     if test -z "$PKG_CONFIG"; then
+-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++      AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+     fi
+     if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+       have_gtk_doc=yes
+@@ -8350,9 +8538,9 @@
+     if test "$have_gtk_doc" = yes; then
+       AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+       if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+-        AC_MSG_RESULT(yes)
++        AC_MSG_RESULT([yes])
+       else
+-        AC_MSG_RESULT(no)
++        AC_MSG_RESULT([no])
+         have_gtk_doc=no
+       fi
+     fi
+@@ -8362,7 +8550,7 @@
+     fi
+   fi
+ 
+-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ ])
+ 
+--- gtk+2.0-2.11.6.orig/configure	2007-07-20 22:21:42.000000000 +0200
++++ gtk+2.0-2.11.6/configure	2007-07-24 10:36:26.000000000 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.6.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.6.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
+ #
+@@ -12,7 +12,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -21,10 +22,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -217,7 +221,7 @@
+ else
+   as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -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
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -244,10 +247,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ _ASEOF
+@@ -255,7 +260,6 @@
+   CONFIG_SHELL=$as_shell
+ 	       as_have_required=yes
+ 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -264,10 +268,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ (as_func_return () {
+@@ -514,19 +520,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # 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 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+-#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
+@@ -848,6 +863,8 @@
+ CCDEPMODE
+ am__fastdepCC_TRUE
+ am__fastdepCC_FALSE
++ENABLE_STATIC_TRUE
++ENABLE_STATIC_FALSE
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -858,6 +875,7 @@
+ HAVE_CXX_FALSE
+ HAVE_OBJC_TRUE
+ HAVE_OBJC_FALSE
++SED
+ GREP
+ EGREP
+ LN_S
+@@ -1051,6 +1069,7 @@
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+@@ -1168,10 +1187,10 @@
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+@@ -1187,10 +1206,10 @@
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+@@ -1384,19 +1403,19 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=no ;;
+ 
+   --x)
+@@ -1671,7 +1690,7 @@
+   --disable-modules       disable dynamic module loading
+   --enable-test-print-backend
+                           build test print backend
+-  --enable-gtk-doc        use gtk-doc to build documentation default=no
++  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
+   --enable-man            regenerate man pages from Docbook [default=no]
+ 
+ Optional Packages:
+@@ -1698,6 +1717,7 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CXX         C++ compiler command
+@@ -1778,7 +1798,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ gtk+ configure 2.11.6
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.61
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1792,7 +1812,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by gtk+ $as_me 2.11.6, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2218,7 +2238,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2481,7 +2501,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2521,7 +2541,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2762,7 +2782,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2802,7 +2822,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2859,7 +2879,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2900,7 +2920,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2958,7 +2978,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -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.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+@@ -3171,6 +3191,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ 
+ else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+@@ -3182,8 +3208,6 @@
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+ 
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -3361,27 +3385,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3436,27 +3443,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3491,27 +3481,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3547,27 +3520,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3683,27 +3639,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3933,6 +3872,16 @@
+ 
+ 
+ 
++
++if test "$enable_static" = yes; then
++  ENABLE_STATIC_TRUE=
++  ENABLE_STATIC_FALSE='#'
++else
++  ENABLE_STATIC_TRUE='#'
++  ENABLE_STATIC_FALSE=
++fi
++
++
+ 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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4012,7 +3961,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4056,7 +4005,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4169,27 +4118,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4244,27 +4176,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4299,27 +4214,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4355,27 +4253,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4547,27 +4428,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4618,27 +4482,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   OBJC=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4743,12 +4590,13 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -4783,6 +4631,7 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+ 
+@@ -4807,7 +4656,7 @@
+   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"
+-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+     # 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 @@
+   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"
+-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+     # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -5144,8 +4993,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5186,16 +5035,22 @@
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -5233,7 +5088,7 @@
+   esac
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+   ;;
+@@ -5249,11 +5104,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -5283,6 +5138,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -5370,7 +5229,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5373 "configure"' > conftest.$ac_ext
++  echo '#line 5232 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -5405,7 +5264,8 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -5416,6 +5276,9 @@
+     case `/usr/bin/file conftest.o` in
+     *32-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -5432,6 +5295,9 @@
+       ;;
+     *64-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -5494,27 +5360,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5523,7 +5373,7 @@
+ 	lt_cv_cc_needs_belf=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5577,7 +5427,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5617,7 +5467,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5673,7 +5523,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AS="${ac_tool_prefix}as"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5713,7 +5563,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AS="as"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5769,7 +5619,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5809,7 +5659,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5907,17 +5757,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5951,17 +5794,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6026,17 +5862,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6070,17 +5899,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6151,27 +5973,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6347,27 +6152,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6430,27 +6218,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6486,17 +6257,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6613,17 +6377,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6657,17 +6414,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6732,17 +6482,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6776,17 +6519,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -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
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+@@ -6844,7 +6580,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_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
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -6888,7 +6624,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_F77="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6995,27 +6731,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -7058,27 +6777,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_f77_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -7205,24 +6907,27 @@
+     fi
+     ;;
+   *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ 	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ 
+@@ -7239,6 +6944,7 @@
+ 
+ 
+ 
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7276,7 +6982,7 @@
+   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'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7573,7 +7279,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7629,7 +7335,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7669,7 +7375,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7725,7 +7431,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7765,7 +7471,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7827,7 +7533,7 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+@@ -8027,10 +7733,10 @@
+ objext=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ 
+ # If no C compiler was specified, use CC.
+@@ -8045,13 +7751,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -8071,7 +7777,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8082,11 +7788,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7791: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8089: \$? = $ac_status" >&5
++   echo "$as_me:7795: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8137,13 +7843,15 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
+ 
+@@ -8153,7 +7861,7 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -8211,7 +7919,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -8244,7 +7952,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+@@ -8263,6 +7971,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -8272,6 +7996,10 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
+@@ -8339,7 +8067,7 @@
+ else
+   lt_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8350,11 +8078,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8353: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8081: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8357: \$? = $ac_status" >&5
++   echo "$as_me:8085: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8403,7 +8131,7 @@
+   lt_prog_compiler_static_works=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -8443,7 +8171,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -8454,11 +8182,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8457: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8185: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8461: \$? = $ac_status" >&5
++   echo "$as_me:8189: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8650,7 +8378,7 @@
+       allow_undefined_flag=unsupported
+       always_export_symbols=no
+       enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -8668,7 +8396,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -8683,7 +8411,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -8701,20 +8429,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -8866,7 +8604,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct=unsupported
+@@ -8934,33 +8672,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8968,7 +8697,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -9009,33 +8738,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9043,7 +8763,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -9089,7 +8809,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes=yes
+       ;;
+@@ -9131,10 +8851,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -9174,7 +8894,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+@@ -9276,7 +8996,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -9296,24 +9016,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs=no
+       fi
+       ;;
+ 
+@@ -9372,17 +9096,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -9439,7 +9162,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag='${wl}-z,text'
+       archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+@@ -9516,7 +9239,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -9574,17 +9297,55 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9744,12 +9505,8 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -9766,18 +9523,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -9815,7 +9560,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -9878,7 +9623,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9933,7 +9678,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9947,31 +9692,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 9954 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -9983,7 +9707,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9992,7 +9716,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -10076,6 +9800,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -10229,6 +9957,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+        else
+@@ -10312,27 +10041,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10341,7 +10054,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10423,27 +10136,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10452,7 +10149,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -10502,27 +10199,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10531,7 +10212,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10603,27 +10284,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10632,7 +10297,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -10682,27 +10347,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10711,7 +10360,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10762,27 +10411,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_svld_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10791,7 +10424,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10842,27 +10475,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_dld_link=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -10871,7 +10488,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10927,7 +10544,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10930 "configure"
++#line 10547 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11027,7 +10644,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11030 "configure"
++#line 10647 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11225,6 +10842,7 @@
+     module_cmds \
+     module_expsym_cmds \
+     lt_cv_prog_compiler_c_o \
++    fix_srcfile_path \
+     exclude_expsyms \
+     include_expsyms; do
+ 
+@@ -11269,7 +10887,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11593,7 +11211,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -11762,10 +11380,10 @@
+ objext_CXX=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -11781,13 +11399,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -12046,7 +11664,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  hardcode_direct_CXX=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  hardcode_direct_CXX=unsupported
+@@ -12114,33 +11732,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12148,7 +11757,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -12190,33 +11799,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12224,7 +11824,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -12335,10 +11935,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -12372,7 +11972,7 @@
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -12421,9 +12021,7 @@
+       hardcode_libdir_separator_CXX=:
+ 
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-        ;;
++      hppa*64*|ia64*) ;;
+       *)
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
+@@ -12491,7 +12089,7 @@
+ 	;;
+     esac
+     ;;
+-  interix3*)
++  interix[3-9]*)
+     hardcode_direct_CXX=no
+     hardcode_shlibpath_var_CXX=no
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -12531,7 +12129,7 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+       KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -12611,6 +12209,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  no_undefined_flag_CXX=' -zdefs'
++	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -12633,7 +12254,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -12649,16 +12270,20 @@
+     ld_shlibs_CXX=no
+     ;;
+   openbsd*)
+-    hardcode_direct_CXX=yes
+-    hardcode_shlibpath_var_CXX=no
+-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      export_dynamic_flag_spec_CXX='${wl}-E'
+-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      ld_shlibs_CXX=no
+     fi
+-    output_verbose_link_cmd='echo'
+     ;;
+   osf3*)
+     case $cc_basename in
+@@ -12820,15 +12445,10 @@
+ 	case $host_os in
+ 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+@@ -12875,6 +12495,12 @@
+ 	  fi
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+@@ -13066,7 +12692,7 @@
+ 
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+   # Interix 3.5 installs completely hosed .la files for C++, so rather than
+   # hack all around it, let's just trust "g++" to DTRT.
+   predep_objects_CXX=
+@@ -13074,13 +12700,46 @@
+   postdeps_CXX=
+   ;;
+ 
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
+ solaris*)
+   case $cc_basename in
+   CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
+     # Adding this requires a known-good setup of shared libraries for
+     # Sun compiler versions before 5.6, else PIC objects from an old
+     # archive will be linked into the output, leading to subtle bugs.
+-    postdeps_CXX='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
+     ;;
+   esac
+   ;;
+@@ -13117,12 +12776,14 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -13134,7 +12795,7 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -13200,7 +12861,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -13243,7 +12904,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -13270,6 +12931,14 @@
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -13286,7 +12955,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -13384,7 +13053,7 @@
+ else
+   lt_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -13395,11 +13064,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13398: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13067: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13402: \$? = $ac_status" >&5
++   echo "$as_me:13071: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -13448,7 +13117,7 @@
+   lt_prog_compiler_static_works_CXX=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -13488,7 +13157,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -13499,11 +13168,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13502: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13171: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13506: \$? = $ac_status" >&5
++   echo "$as_me:13175: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -13569,7 +13238,10 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
+   ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -13600,7 +13272,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -13658,20 +13330,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -13828,12 +13487,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -13850,18 +13504,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -13899,7 +13541,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -13962,7 +13604,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14017,7 +13659,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14031,31 +13673,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 14038 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14067,7 +13688,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14076,7 +13697,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -14160,6 +13781,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -14354,6 +13979,7 @@
+     module_cmds_CXX \
+     module_expsym_cmds_CXX \
+     lt_cv_prog_compiler_c_o_CXX \
++    fix_srcfile_path_CXX \
+     exclude_expsyms_CXX \
+     include_expsyms_CXX; do
+ 
+@@ -14674,7 +14300,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -14765,10 +14391,17 @@
+ objext_F77=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -14784,13 +14417,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -14877,13 +14510,15 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+       ;;
+ 
+@@ -14893,7 +14528,7 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -14951,7 +14586,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -14984,7 +14619,7 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+@@ -15003,6 +14638,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_F77='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -15012,6 +14663,10 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -15079,7 +14734,7 @@
+ else
+   lt_prog_compiler_pic_works_F77=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_F77"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -15090,11 +14745,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15093: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14748: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15097: \$? = $ac_status" >&5
++   echo "$as_me:14752: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -15143,7 +14798,7 @@
+   lt_prog_compiler_static_works_F77=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -15183,7 +14838,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -15194,11 +14849,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15197: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14852: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15201: \$? = $ac_status" >&5
++   echo "$as_me:14856: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15390,7 +15045,7 @@
+       allow_undefined_flag_F77=unsupported
+       always_export_symbols_F77=no
+       enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -15408,7 +15063,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_F77=no
+       hardcode_shlibpath_var_F77=no
+       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -15423,7 +15078,7 @@
+       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -15441,20 +15096,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_F77=no
+       else
+ 	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -15606,7 +15271,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_F77=unsupported
+@@ -15664,33 +15329,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15698,7 +15354,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -15729,33 +15385,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15763,7 +15410,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -15809,7 +15456,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_F77='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+@@ -15851,10 +15498,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -15894,7 +15541,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       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 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -16016,24 +15663,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_F77='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+@@ -16092,17 +15743,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -16159,7 +15809,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_F77='${wl}-z,text'
+       archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
+@@ -16236,7 +15886,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -16294,20 +15944,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -16464,12 +16101,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -16486,18 +16118,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -16535,7 +16155,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -16598,7 +16218,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16653,7 +16273,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16667,31 +16287,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 16674 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -16703,7 +16302,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16712,7 +16311,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -16796,6 +16395,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -16990,6 +16593,7 @@
+     module_cmds_F77 \
+     module_expsym_cmds_F77 \
+     lt_cv_prog_compiler_c_o_F77 \
++    fix_srcfile_path_F77 \
+     exclude_expsyms_F77 \
+     include_expsyms_F77; do
+ 
+@@ -17310,7 +16914,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -17368,10 +16972,10 @@
+ objext_GCJ=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -17387,13 +16991,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -17434,7 +17038,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17445,11 +17049,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17448: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17052: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17452: \$? = $ac_status" >&5
++   echo "$as_me:17056: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17500,13 +17104,15 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+       ;;
+ 
+@@ -17516,7 +17122,7 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -17574,7 +17180,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+@@ -17607,7 +17213,7 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -17626,6 +17232,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_GCJ='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -17635,6 +17257,10 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -17702,7 +17328,7 @@
+ else
+   lt_prog_compiler_pic_works_GCJ=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17713,11 +17339,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17716: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17342: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17720: \$? = $ac_status" >&5
++   echo "$as_me:17346: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17766,7 +17392,7 @@
+   lt_prog_compiler_static_works_GCJ=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -17806,7 +17432,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -17817,11 +17443,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17820: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17446: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17824: \$? = $ac_status" >&5
++   echo "$as_me:17450: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18013,7 +17639,7 @@
+       allow_undefined_flag_GCJ=unsupported
+       always_export_symbols_GCJ=no
+       enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -18031,7 +17657,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -18046,7 +17672,7 @@
+       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -18064,20 +17690,30 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
++	link_all_deplibs_GCJ=no
+       else
+ 	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -18229,7 +17865,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_GCJ=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_GCJ=unsupported
+@@ -18297,33 +17933,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18331,7 +17958,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -18372,33 +17999,24 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18406,7 +18024,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -18452,7 +18070,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_GCJ='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+@@ -18494,10 +18112,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -18537,7 +18155,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       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 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -18659,24 +18277,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+@@ -18735,17 +18357,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -18802,7 +18423,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_GCJ='${wl}-z,text'
+       archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+@@ -18879,7 +18500,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -18937,20 +18558,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19107,12 +18715,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -19129,18 +18732,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -19178,7 +18769,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -19241,7 +18832,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19296,7 +18887,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19310,31 +18901,10 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # find out which ABI we are using
+-  libsuff=
+-  case "$host_cpu" in
+-  x86_64*|s390x*|powerpc64*)
+-    echo '#line 19317 "configure"' > conftest.$ac_ext
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      case `/usr/bin/file conftest.$ac_objext` in
+-      *64-bit*)
+-        libsuff=64
+-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+-        ;;
+-      esac
+-    fi
+-    rm -rf conftest*
+-    ;;
+-  esac
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19346,7 +18916,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -19355,7 +18925,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -19439,6 +19009,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -19633,6 +19207,7 @@
+     module_cmds_GCJ \
+     module_expsym_cmds_GCJ \
+     lt_cv_prog_compiler_c_o_GCJ \
++    fix_srcfile_path_GCJ \
+     exclude_expsyms_GCJ \
+     include_expsyms_GCJ; do
+ 
+@@ -19953,7 +19528,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -20010,7 +19585,7 @@
+ objext_RC=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -20029,13 +19604,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -20113,6 +19688,7 @@
+     module_cmds_RC \
+     module_expsym_cmds_RC \
+     lt_cv_prog_compiler_c_o_RC \
++    fix_srcfile_path_RC \
+     exclude_expsyms_RC \
+     include_expsyms_RC; do
+ 
+@@ -20433,7 +20009,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -20588,27 +20164,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -20632,27 +20191,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -20680,7 +20222,6 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+-  ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20717,28 +20258,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_sys_file_offset_bits=no; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20784,27 +20308,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -20814,26 +20321,28 @@
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_file_offset_bits=unknown
+   break
+ done
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+-if test "$ac_cv_sys_file_offset_bits" != no; then
+-
++case $ac_cv_sys_file_offset_bits in #(
++  no | unknown) ;;
++  *)
+ cat >>confdefs.h <<_ACEOF
+ #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+ _ACEOF
+-
+-fi
++;;
++esac
+ rm -f conftest*
+-  { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++  if test $ac_cv_sys_file_offset_bits = unknown; then
++    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   while :; do
+-  ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -20870,28 +20379,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_sys_large_files=no; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20937,27 +20429,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_sys_large_files=1; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -20967,19 +20442,22 @@
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_large_files=unknown
+   break
+ done
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+-if test "$ac_cv_sys_large_files" != no; then
+-
++case $ac_cv_sys_large_files in #(
++  no | unknown) ;;
++  *)
+ cat >>confdefs.h <<_ACEOF
+ #define _LARGE_FILES $ac_cv_sys_large_files
+ _ACEOF
+-
+-fi
++;;
++esac
+ rm -f conftest*
++  fi
+ fi
+ 
+ 
+@@ -21008,7 +20486,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -21169,7 +20647,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_WINDRES="windres"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -21229,7 +20707,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ms_librarian="yes"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -21461,27 +20939,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_search_strerror=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -21490,7 +20952,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_strerror+set}" = set; then
+   break
+@@ -21590,27 +21052,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -21673,7 +21118,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22036,7 +21481,7 @@
+ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+@@ -22122,7 +21567,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_INDENT="indent"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -22265,27 +21710,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22294,7 +21723,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -22375,27 +21804,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22404,7 +21817,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -22453,27 +21866,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22482,7 +21879,7 @@
+ 	gtk_ok=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $gtk_ok" >&5
+ echo "${ECHO_T}$gtk_ok" >&6; }
+@@ -22528,27 +21925,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22557,7 +21938,7 @@
+ 	gtk_ok=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $gtk_ok" >&5
+ echo "${ECHO_T}$gtk_ok" >&6; }
+@@ -22603,27 +21984,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22632,7 +21997,7 @@
+ 	gtk_ok=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $gtk_ok" >&5
+ echo "${ECHO_T}$gtk_ok" >&6; }
+@@ -22678,27 +22043,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22707,7 +22056,7 @@
+ 	gtk_ok=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $gtk_ok" >&5
+ echo "${ECHO_T}$gtk_ok" >&6; }
+@@ -22753,27 +22102,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22782,7 +22115,7 @@
+ 	gtk_ok=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $gtk_ok" >&5
+ echo "${ECHO_T}$gtk_ok" >&6; }
+@@ -22840,27 +22173,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22896,17 +22212,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23004,27 +22313,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   am_cv_val_LC_MESSAGES=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23033,7 +22326,7 @@
+ 	am_cv_val_LC_MESSAGES=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+@@ -23089,27 +22382,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23145,17 +22421,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23251,27 +22520,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gt_cv_func_ngettext_libc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23280,7 +22533,7 @@
+ 	gt_cv_func_ngettext_libc=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+@@ -23323,27 +22576,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gt_cv_func_dgettext_libc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23352,7 +22589,7 @@
+ 	gt_cv_func_dgettext_libc=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+@@ -23428,27 +22665,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23457,7 +22678,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -23522,27 +22743,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_bindtextdomain=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23551,7 +22756,7 @@
+ 	ac_cv_lib_intl_bindtextdomain=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -23600,27 +22805,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_ngettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23629,7 +22818,7 @@
+ 	ac_cv_lib_intl_ngettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -23678,27 +22867,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_dgettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23707,7 +22880,7 @@
+ 	ac_cv_lib_intl_dgettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -23769,27 +22942,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_ngettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23798,7 +22955,7 @@
+ 	ac_cv_lib_intl_ngettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -23847,27 +23004,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_dcgettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23876,7 +23017,7 @@
+ 	ac_cv_lib_intl_dcgettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -23971,27 +23112,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24000,7 +23125,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -24147,27 +23272,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24176,7 +23285,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -24206,8 +23315,8 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ _ACEOF
+-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
+-  (msgfmt -c -o /dev/null conftest.foo) 2>&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -24237,7 +23346,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   CATOBJEXT=.gmo
+              DATADIRNAME=share
+ else
+@@ -24417,27 +23510,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_bind_textdomain_codeset=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24446,7 +23523,7 @@
+ 	ac_cv_func_bind_textdomain_codeset=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+@@ -24467,7 +23544,7 @@
+ 	    esac
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+           LIBS="$glib_save_LIBS"
+ 	  INSTOBJEXT=.mo
+@@ -24775,27 +23852,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6; }
+ else
+@@ -24832,27 +23892,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: -posix" >&5
+ echo "${ECHO_T}-posix" >&6; }
+ else
+@@ -24926,7 +23969,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+    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 @@
+           echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -25380,27 +24407,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25409,7 +24420,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25464,27 +24475,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25520,17 +24514,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25636,27 +24623,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25692,17 +24662,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25808,27 +24771,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25864,17 +24810,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25980,27 +24919,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26036,17 +24958,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26146,27 +25061,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26231,27 +25129,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26406,10 +25287,10 @@
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+-  const charset x;
++  const charset cs;
+   /* SunOS 4.1.1 cc rejects this.  */
+-  char const *const *ccp;
+-  char **p;
++  char const *const *pcpcc;
++  char **ppc;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+   static struct point const zero = {0,0};
+@@ -26418,11 +25299,11 @@
+      an arm of an if-expression whose if-part is not a constant
+      expression */
+   const char *g = "string";
+-  ccp = &g + (g ? g-g : 0);
++  pcpcc = &g + (g ? g-g : 0);
+   /* HPUX 7.0 cc rejects these. */
+-  ++ccp;
+-  p = (char**) ccp;
+-  ccp = (char const *const *) p;
++  ++pcpcc;
++  ppc = (char**) pcpcc;
++  pcpcc = (char const *const *) ppc;
+   { /* SCO 3.2v4 cc rejects this.  */
+     char *t;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+@@ -26449,7 +25330,7 @@
+     const int foo = 10;
+     if (!foo) return 0;
+   }
+-  return !x[0] && !zero.x;
++  return !cs[0] && !zero.x;
+ #endif
+ 
+   ;
+@@ -26469,27 +25350,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26547,27 +25411,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=int
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26626,27 +25473,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26682,17 +25512,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26823,27 +25646,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26852,7 +25659,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -26909,21 +25716,21 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+ char *malloc ();
+ #endif
+ 
+ /* This mess was copied from the GNU getpagesize.h.  */
+-#if !HAVE_GETPAGESIZE
++#ifndef HAVE_GETPAGESIZE
+ /* Assume that all systems that can run configure have sys/param.h.  */
+-# if !HAVE_SYS_PARAM_H
++# ifndef HAVE_SYS_PARAM_H
+ #  define HAVE_SYS_PARAM_H 1
+ # endif
+ 
+ # ifdef _SC_PAGESIZE
+ #  define getpagesize() sysconf(_SC_PAGESIZE)
+ # else /* no _SC_PAGESIZE */
+-#  if HAVE_SYS_PARAM_H
++#  ifdef HAVE_SYS_PARAM_H
+ #   include <sys/param.h>
+ #   ifdef EXEC_PAGESIZE
+ #    define getpagesize() EXEC_PAGESIZE
+@@ -27120,27 +25927,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27149,7 +25940,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -27230,27 +26021,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27259,7 +26034,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -27343,27 +26118,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   gtk_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27432,17 +26190,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   gdk_wchar_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27485,17 +26236,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   gdk_wctype_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27580,27 +26324,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_iswalnum=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27609,7 +26337,7 @@
+ 	ac_cv_func_iswalnum=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
+@@ -27659,27 +26387,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_w_iswalnum=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27688,7 +26400,7 @@
+ 	ac_cv_lib_w_iswalnum=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -27747,27 +26459,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gdk_working_wctype=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27776,7 +26472,7 @@
+ 	gdk_working_wctype=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$oLIBS"
+ 
+@@ -27815,17 +26511,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   gtk_uxtheme_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27885,27 +26574,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27941,17 +26613,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28082,27 +26747,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28111,7 +26760,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -28259,27 +26908,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28288,7 +26921,7 @@
+ 	ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28329,27 +26962,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28385,17 +27001,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28500,27 +27109,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_tiff_TIFFWriteScanline=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28529,7 +27122,7 @@
+ 	ac_cv_lib_tiff_TIFFWriteScanline=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28570,27 +27163,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28626,17 +27202,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28741,27 +27310,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_tiff34_TIFFFlushData=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28770,7 +27323,7 @@
+ 	ac_cv_lib_tiff34_TIFFFlushData=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28811,27 +27364,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28867,17 +27403,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29005,27 +27534,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29034,7 +27547,7 @@
+ 	ac_cv_lib_jpeg_jpeg_destroy_decompress=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29075,17 +27588,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   jpeg_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29141,27 +27647,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_jpeg_jpeg_simple_progression=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29170,7 +27660,7 @@
+ 	ac_cv_lib_jpeg_jpeg_simple_progression=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29259,27 +27749,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_png_png_read_info=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29288,7 +27762,7 @@
+ 	ac_cv_lib_png_png_read_info=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29329,27 +27803,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29385,17 +27842,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29492,27 +27942,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   png_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29805,27 +28238,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_sys_wait_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29882,27 +28298,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=int
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30005,27 +28404,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30061,17 +28443,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30167,27 +28542,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30223,17 +28581,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30343,27 +28694,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_mlib_mlib_ImageSetStruct=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30372,7 +28707,7 @@
+ 	ac_cv_lib_mlib_mlib_ImageSetStruct=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30437,27 +28772,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30466,7 +28785,7 @@
+ 	ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30603,7 +28922,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+@@ -30900,7 +29212,7 @@
+   # See if we find them without any special options.
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+-  LIBS="-lXt $LIBS"
++  LIBS="-lX11 $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30929,27 +29241,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -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
+-    if test -r "$ac_dir/libXt.$ac_extension"; then
++    if test -r "$ac_dir/libX11.$ac_extension"; then
+       ac_x_libraries=$ac_dir
+       break 2
+     fi
+@@ -30970,7 +29266,7 @@
+ done
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+ 
+@@ -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 . . . .
+-    case `(uname -sr) 2>/dev/null` in
+-    "SunOS 5"*)
+-      { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+-      cat >conftest.$ac_ext <<_ACEOF
++    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++    ac_xsave_c_werror_flag=$ac_c_werror_flag
++    ac_c_werror_flag=yes
++    cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -31058,44 +29354,20 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_R_nospace=yes
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++       X_LIBS="$X_LIBS -R$x_libraries"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_R_nospace=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-      if test $ac_R_nospace = yes; then
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-	X_LIBS="$X_LIBS -R$x_libraries"
+-      else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-	cat >conftest.$ac_ext <<_ACEOF
++       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -31123,48 +29395,30 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_R_space=yes
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	  X_LIBS="$X_LIBS -R $x_libraries"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_R_space=no
++	{ echo "$as_me:$LINENO: result: neither works" >&5
++echo "${ECHO_T}neither works" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-	if test $ac_R_space = yes; then
+-	  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-	  X_LIBS="$X_LIBS -R $x_libraries"
+-	else
+-	  { echo "$as_me:$LINENO: result: neither works" >&5
+-echo "${ECHO_T}neither works" >&6; }
+-	fi
+-      fi
+-      LIBS=$ac_xsave_LIBS
+-    esac
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++    ac_c_werror_flag=$ac_xsave_c_werror_flag
++    LIBS=$ac_xsave_LIBS
+   fi
+ 
+   # Check for system-dependent libraries X programs must link with.
+@@ -31213,27 +29467,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31281,27 +29519,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31310,7 +29532,7 @@
+ 	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31363,27 +29585,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31392,7 +29598,7 @@
+ 	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31405,7 +29611,7 @@
+     fi
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_xsave_LIBS"
+ 
+@@ -31480,27 +29686,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31509,7 +29699,7 @@
+ 	ac_cv_func_gethostbyname=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+@@ -31558,27 +29748,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31587,7 +29761,7 @@
+ 	ac_cv_lib_nsl_gethostbyname=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31640,27 +29814,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31669,7 +29827,7 @@
+ 	ac_cv_lib_bsd_gethostbyname=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31752,27 +29910,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31781,7 +29923,7 @@
+ 	ac_cv_func_connect=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+@@ -31830,27 +29972,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_socket_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31859,7 +29985,7 @@
+ 	ac_cv_lib_socket_connect=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31935,27 +30061,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31964,7 +30074,7 @@
+ 	ac_cv_func_remove=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+@@ -32013,27 +30123,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_posix_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32042,7 +30136,7 @@
+ 	ac_cv_lib_posix_remove=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32118,27 +30212,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32147,7 +30225,7 @@
+ 	ac_cv_func_shmat=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+@@ -32196,27 +30274,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32225,7 +30287,7 @@
+ 	ac_cv_lib_ipc_shmat=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32289,27 +30351,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32318,7 +30364,7 @@
+ 	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32417,31 +30463,15 @@
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32450,7 +30480,7 @@
+ 	ac_cv_func_XOpenDisplay=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
+@@ -32526,27 +30556,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XextFindDisplay=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32555,7 +30569,7 @@
+ 	ac_cv_func_XextFindDisplay=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
+@@ -32631,27 +30645,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XRenderQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32660,7 +30658,7 @@
+ 	ac_cv_func_XRenderQueryExtension=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
+@@ -32706,27 +30704,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ else
+@@ -32762,27 +30743,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 
+@@ -32876,27 +30840,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32905,7 +30853,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -32989,27 +30937,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XAddConnectionWatch=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33018,7 +30950,7 @@
+ 	ac_cv_func_XAddConnectionWatch=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
+@@ -33119,27 +31051,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XkbQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33148,7 +31064,7 @@
+ 	ac_cv_func_XkbQueryExtension=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
+@@ -33230,27 +31146,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XShapeCombineMask=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33259,7 +31159,7 @@
+ 	ac_cv_func_XShapeCombineMask=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
+@@ -33339,27 +31239,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XSyncQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33368,7 +31252,7 @@
+ 	ac_cv_func_XSyncQueryExtension=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
+@@ -33402,27 +31286,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_X11_extensions_sync_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33518,27 +31385,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XShmAttach=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33547,7 +31398,7 @@
+ 	ac_cv_func_XShmAttach=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
+@@ -33598,27 +31449,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_XextSam_XShmAttach=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33627,7 +31462,7 @@
+ 	ac_cv_lib_XextSam_XShmAttach=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33681,27 +31516,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33737,17 +31555,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33845,27 +31656,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33901,17 +31695,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34021,27 +31808,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   have_xshm=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34138,27 +31908,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_XineramaGetInfo=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34167,7 +31921,7 @@
+ 	ac_cv_func_XineramaGetInfo=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
+@@ -34201,27 +31955,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_X11_extensions_xinerama_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34312,27 +32049,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_Xinerama_XineramaQueryExtension=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34341,7 +32062,7 @@
+ 	ac_cv_lib_Xinerama_XineramaQueryExtension=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -34376,27 +32097,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_X11_extensions_Xinerama_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34528,27 +32232,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34557,7 +32245,7 @@
+ 	ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -34592,27 +32280,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_X11_extensions_Xrandr_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -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; }
+-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
+-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
++      # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before
++      # cairo's if both are available (cairo is required by pango); this is
++      # enough to build gdk/
++      GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES"
++      # you'd think this isn't needed, but as soon as cairo-directfb or
++      # directfb requires a "rpath" and you want to build binaries (for
++      # example gtk-query-immodules), you need the CFLAGS and LDFLAGS
++      # everywhere; this trick abuses the fact that GTK_DEP_LIBS and
++      # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the
++      # necessary rpath flags
++      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`"
++      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS"
+   else
+       { { echo "$as_me:$LINENO: error:
+ *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
+@@ -34935,27 +32616,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -34970,7 +32635,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+         LIBS="$gtk_save_LIBS"
+ fi
+@@ -34978,7 +32643,7 @@
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+ 
+-GDK_PACKAGES="$PANGO_PACKAGES"
++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
+ if test "x$gdktarget" = "xx11"; then
+   GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
+ fi
+@@ -35066,27 +32731,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35101,7 +32750,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+         LIBS="$gtk_save_LIBS"
+ fi
+@@ -35167,7 +32816,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35315,17 +32947,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35428,27 +33053,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35484,17 +33092,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35653,7 +33254,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DB2HTML="true"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -35798,7 +33399,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_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 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 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 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -36451,10 +34060,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -36678,19 +34290,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # 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 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by gtk+ $as_me 2.11.6, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -36735,7 +34356,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -36759,7 +34380,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ gtk+ config.status 2.11.6
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.61,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -37125,9 +34746,9 @@
+ CCDEPMODE!$CCDEPMODE$ac_delim
+ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim
++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim
+ CXX!$CXX$ac_delim
+-CXXFLAGS!$CXXFLAGS$ac_delim
+-ac_ct_CXX!$ac_ct_CXX$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37169,6 +34790,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
+ CXXDEPMODE!$CXXDEPMODE$ac_delim
+ am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+ am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+@@ -37176,6 +34799,7 @@
+ HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim
+ HAVE_OBJC_TRUE!$HAVE_OBJC_TRUE$ac_delim
+ HAVE_OBJC_FALSE!$HAVE_OBJC_FALSE$ac_delim
++SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ LN_S!$LN_S$ac_delim
+@@ -37263,9 +34887,6 @@
+ INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
+ INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
+ INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
+-INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
+-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
+-INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -37307,6 +34928,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
++INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
++INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
+ INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
+ INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
+ INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
+@@ -37401,11 +35025,9 @@
+ XMLCATALOG!$XMLCATALOG$ac_delim
+ ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
+ ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
+-LIBOBJS!$LIBOBJS$ac_delim
+-LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -37441,6 +35063,51 @@
+ _ACEOF
+ 
+ 
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
++_ACEOF
++
++
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+@@ -37684,7 +35351,7 @@
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
+ $ac_datarootdir_hack
+-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+--- gtk+2.0-2.11.6.orig/contrib/Makefile.in	2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/contrib/Makefile.in	2007-07-24 10:36:26.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -245,6 +247,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in	2007-07-24 10:36:26.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/demos/Makefile.in	2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/demos/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -245,6 +247,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in	2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/Makefile.in	2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/docs/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/faq/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/faq/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/reference/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -250,6 +252,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -250,6 +252,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -250,6 +252,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/tools/Makefile.in	2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/tools/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in	2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/docs/tutorial/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/Makefile.in	2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in	2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/directfb/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in	2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/quartz/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in	2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/win32/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in	2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in	2007-07-20 22:21:35.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/x11/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -91,6 +91,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -246,6 +248,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in	2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in	2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gtk/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/Makefile.in	2007-07-24 10:37:34.000000000 +0200
+@@ -113,6 +113,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -268,6 +270,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -376,6 +379,8 @@
+ 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+ 	-DGDK_DISABLE_DEPRECATED			\
++	-DMAEMO_CHANGES					\
++	-DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED		\
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+ 	$(GTK_DEBUG_FLAGS)				\
+@@ -631,13 +636,16 @@
+ # that are not included in gtk/gtk.h
+ gtk_semi_private_h_sources = \
+ 	gtktextlayout.h		\
+-	gtkfilesystem.h
++	gtkfilesystem.h		\
++	gtkfilesystemmodel.h	\
++	gtkfilechooserprivate.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	\
+@@ -647,10 +655,7 @@
+ 	gtkfilechooserdefault.h	\
+ 	gtkfilechooserembed.h	\
+ 	gtkfilechooserentry.h	\
+-	gtkfilechooserprivate.h	\
+ 	gtkfilechoosersettings.h \
+-	gtkfilechooserutils.h	\
+-	gtkfilesystemmodel.h	\
+ 	gtkfilesystemunix.h	\
+ 	gtkhsv.h		\
+ 	gtkiconcache.h		\
+--- gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/ltmain.sh	2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.6/ltmain.sh	2007-07-24 10:36:27.000000000 +0200
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007  Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -43,14 +43,22 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.5.22
+-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+ 
+-# See if we are running on zsh, and set the options which allow our
+-# commands through without removal of \ escapes.
+-if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -105,12 +113,14 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+-  save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++	  save_$lt_var=\$$lt_var
++	  $lt_var=C
++	  export $lt_var
++	fi"
++done
+ 
+ # Make sure IFS has a sensible default
+ lt_nl='
+@@ -136,6 +146,8 @@
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+ 
+ #####################################
+ # Shell function definitions:
+@@ -196,7 +208,13 @@
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++	$SED -n -e '1,100{
++		/ I /{
++			s,.*,import,
++			p
++			q
++			}
++		}'`
+       case $win32_nmres in
+       import*)  win32_libid_type="x86 archive import";;
+       *)        win32_libid_type="x86 archive static";;
+@@ -327,7 +345,17 @@
+ 	*) my_xabs=`pwd`"/$my_xlib" ;;
+       esac
+       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+-      my_xdir="$my_gentop/$my_xlib"
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
+ 
+       $show "${rm}r $my_xdir"
+       $run ${rm}r "$my_xdir"
+@@ -454,11 +482,12 @@
+     ;;
+ 
+   --version)
+-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    $echo
+-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+-    $echo "This is free software; see the source for copying conditions.  There is NO"
+-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+     exit $?
+     ;;
+ 
+@@ -755,9 +784,10 @@
+     *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+-    *.f90) xform=f90 ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
+     *.for) xform=for ;;
+     *.java) xform=java ;;
++    *.obj) xform=obj ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -1138,8 +1168,9 @@
+     for arg
+     do
+       case $arg in
+-      -all-static | -static)
+-	if test "X$arg" = "X-all-static"; then
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
+@@ -1147,12 +1178,20 @@
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	  prefer_static_libs=yes
+-	else
++	  ;;
++	-static)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	  prefer_static_libs=built
+-	fi
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	break
+@@ -1600,7 +1639,7 @@
+ 	continue
+ 	;;
+ 
+-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	compiler_flags="$compiler_flags $arg"
+ 	compile_command="$compile_command $arg"
+ 	finalize_command="$finalize_command $arg"
+@@ -1620,10 +1659,11 @@
+       # -m* pass through architecture-specific compiler args for GCC
+       # -m*, -t[45]*, -txscale* pass through architecture-specific
+       # compiler args for GCC
+-      # -pg pass through profiling flag for GCC
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+-      -t[45]*|-txscale*|@*)
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+@@ -1651,9 +1691,9 @@
+ 
+       -no-install)
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # in order for the loader to find any dlls it needs.
++	  # and Darwin in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+@@ -1712,7 +1752,7 @@
+ 	continue
+ 	;;
+ 
+-      -static)
++      -static | -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+@@ -2082,7 +2122,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -2094,7 +2137,7 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+@@ -2490,7 +2533,9 @@
+ 
+ 	if test "$linkmode,$pass" = "prog,link"; then
+ 	  if test -n "$library_names" &&
+-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+ 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+@@ -3186,7 +3231,7 @@
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+-	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|none)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+@@ -3197,9 +3242,15 @@
+ 	    age="0"
+ 	    ;;
+ 	  irix|nonstopux)
+-	    current=`expr $number_major + $number_minor - 1`
++	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
++	    lt_irix_increment=no
++	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  ;;
+@@ -3258,7 +3309,8 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3272,8 +3324,11 @@
+ 	  ;;
+ 
+ 	irix | nonstopux)
+-	  major=`expr $current - $age + 1`
+-
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+@@ -3410,11 +3465,11 @@
+       fi
+ 
+       # Eliminate all temporary directories.
+-      for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+-      done
++      #for path in $notinst_path; do
++      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++      #done
+ 
+       if test -n "$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+@@ -3515,13 +3570,12 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+-	  if test "$?" -eq 0 ; then
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+-              if test "$name" != "" && test "$name" -ne "0"; then
++              if test "$name" != "" && test "$name" != "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		  case " $predeps $postdeps " in
+ 		  *" $i "*)
+@@ -3560,9 +3614,7 @@
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+-		$LTCC $LTCFLAGS -o conftest conftest.c $i
+-		# Did it work?
+-		if test "$?" -eq 0 ; then
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ 		  ldd_output=`ldd conftest`
+ 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		    case " $predeps $postdeps " in
+@@ -3594,7 +3646,7 @@
+ 		  droppeddeps=yes
+ 		  $echo
+ 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** make it link in!  You will probably need to install it or some"
+ 		  $echo "*** library that it depends on before this library will be fully"
+ 		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+@@ -3880,7 +3932,10 @@
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
+ 	    else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+@@ -4239,12 +4294,14 @@
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+ 	  generated="$generated $gentop"
+@@ -4692,16 +4749,16 @@
+           case $host in
+           *cygwin* | *mingw* )
+             if test -f "$output_objdir/${outputname}.def" ; then
+-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             else
+-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              fi
+             ;;
+           * )
+-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             ;;
+           esac
+ 	  ;;
+@@ -4716,13 +4773,13 @@
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+       fi
+ 
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ 	link_command="$compile_command$compile_rpath"
+ 
+ 	# We have no uninstalled library dependencies, so finalize right now.
+@@ -4809,7 +4866,7 @@
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+@@ -4846,7 +4903,7 @@
+ 	  fi
+ 	done
+ 	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       fi
+ 
+       # Quote $echo for shipping.
+@@ -5253,6 +5310,20 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+@@ -5395,7 +5466,7 @@
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++      \$echo \"\$0: cannot exec \$program \$*\"
+       exit $EXIT_FAILURE
+     fi
+   else
+@@ -5581,7 +5652,7 @@
+       done
+       # Quote the link command for shipping.
+       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       if test "$hardcode_automatic" = yes ; then
+ 	relink_command=
+       fi
+@@ -5926,9 +5997,9 @@
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ 	  else
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ 	  fi
+ 
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -6137,7 +6208,7 @@
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+@@ -6348,8 +6419,10 @@
+ 	if test -f "$dir/$objdir/$dlname"; then
+ 	  dir="$dir/$objdir"
+ 	else
+-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit $EXIT_FAILURE
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 	fi
+ 	;;
+ 
+@@ -6413,12 +6486,12 @@
+       fi
+ 
+       # Restore saved environment variables
+-      if test "${save_LC_ALL+set}" = set; then
+-	LC_ALL="$save_LC_ALL"; export LC_ALL
+-      fi
+-      if test "${save_LANG+set}" = set; then
+-	LANG="$save_LANG"; export LANG
+-      fi
++      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+@@ -6775,9 +6848,9 @@
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+-		    try to export only the symbols listed in SYMFILE
++                    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+-		    try to export only the symbols matching REGEX
++                    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+@@ -6791,9 +6864,11 @@
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+-  -static           do not do any dynamic linking of libtool libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+-		    specify library version info [each variable defaults to 0]
++                    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+--- gtk+2.0-2.11.6.orig/m4macros/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/m4macros/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/modules/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/engines/Makefile.in	2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in	2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in	2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/input/Makefile.in	2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/input/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -428,9 +431,10 @@
+ 
+ imconffiledir = $(sysconfdir)/gtk-2.0
+ dist_imconffile_DATA = im-multipress.conf
++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
+ 
+ @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false
+-@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false
+ 
+ module_LTLIBRARIES = \
+ 	$(IM_XIM_MODULE)			\
+@@ -983,7 +987,18 @@
+ 	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ 
+ gtk.immodules: Makefile.am $(module_LTLIBRARIES)
+-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
++	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
++	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++	else \
++	  echo "***" ; \
++	  echo "*** Warning: gtk.immodules not built" ; \
++	  echo "***" ; \
++	  echo "*** Generate this file manually on host" ; \
++	  echo "*** system using gtk-query-immodules-2.0" ; \
++	  echo "***" ; \
++	  touch gtk.immodules; \
++        fi
+ 
+ @CROSS_COMPILING_FALSE@all-local: gtk.immodules
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in	2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -91,6 +91,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -246,6 +248,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in	2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in	2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in	2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in	2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/perf/Makefile.in	2007-07-20 22:21:39.000000000 +0200
++++ gtk+2.0-2.11.6/perf/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -244,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+--- gtk+2.0-2.11.6.orig/tests/Makefile.in	2007-07-20 22:21:39.000000000 +0200
++++ gtk+2.0-2.11.6/tests/Makefile.in	2007-07-24 10:36:27.000000000 +0200
+@@ -92,6 +92,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -247,6 +249,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
--- gtk+2.0-2.11.6.orig/debian/patches/033_treeview_resizing.patch
+++ gtk+2.0-2.11.6/debian/patches/033_treeview_resizing.patch
@@ -0,0 +1,158 @@
+Index: gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeviewcolumn.c	2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c	2007-07-23 13:04:14.000000000 +0200
+@@ -2142,6 +2142,7 @@
+       tree_column->tree_view != NULL &&
+       GTK_WIDGET_REALIZED (tree_column->tree_view))
+     {
++      tree_column->use_resized_width = FALSE;
+       gtk_widget_queue_resize (tree_column->tree_view);
+     }
+ 
+Index: gtk+2.0-2.11.6/gtk/gtktreeview.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeview.c	2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeview.c	2007-07-23 13:04:14.000000000 +0200
+@@ -2162,18 +2162,20 @@
+ 
+ /* GtkWidget::size_allocate helper */
+ static void
+-gtk_tree_view_size_allocate_columns (GtkWidget *widget)
++gtk_tree_view_size_allocate_columns (GtkWidget *widget,
++				     gboolean   width_changed)
+ {
+   GtkTreeView *tree_view;
+   GList *list, *first_column, *last_column;
+   GtkTreeViewColumn *column;
+   GtkAllocation allocation;
+   gint width = 0;
+-  gint extra, extra_per_column;
++  gint extra, extra_per_column, extra_for_last;
+   gint full_requested_width = 0;
+   gint number_of_expand_columns = 0;
+   gboolean column_changed = FALSE;
+   gboolean rtl;
++  gboolean update_expand;
+   
+   tree_view = GTK_TREE_VIEW (widget);
+ 
+@@ -2208,12 +2210,38 @@
+ 	number_of_expand_columns++;
+     }
+ 
+-  extra = MAX (widget->allocation.width - full_requested_width, 0);
++  /* Only update the expand value if the width of the widget changed,
++   * the number of expand columns are if there are no expand
++   * columns.
++   */
++  update_expand = width_changed ||
++                  number_of_expand_columns != tree_view->priv->last_number_of_expand_columns ||
++		  number_of_expand_columns == 0;
++
++  if (!update_expand)
++    {
++      extra = tree_view->priv->last_extra_space;
++      extra_for_last = MAX (widget->allocation.width - full_requested_width - extra, 0);
++    }
++  else
++    {
++      extra = MAX (widget->allocation.width - full_requested_width, 0);
++      extra_for_last = 0;
++
++      tree_view->priv->last_extra_space = extra;
++    }
++
+   if (number_of_expand_columns > 0)
+     extra_per_column = extra/number_of_expand_columns;
+   else
+     extra_per_column = 0;
+ 
++  if (update_expand)
++    {
++      tree_view->priv->last_extra_space_per_column = extra_per_column;
++      tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
++    }
++
+   for (list = (rtl ? last_column : first_column); 
+        list != (rtl ? first_column->prev : last_column->next);
+        list = (rtl ? list->prev : list->next)) 
+@@ -2268,6 +2296,10 @@
+ 	{
+ 	  column->width += extra;
+ 	}
++      else if (extra_for_last > 0 && list == last_column)
++        {
++	  column->width += extra_for_last;
++	}
+ 
+       g_object_notify (G_OBJECT (column), "width");
+ 
+@@ -2302,13 +2334,13 @@
+ 
+   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
+ 
+-  if (allocation->width != widget->allocation.width)
+-    width_changed = TRUE;
+-  
+   widget->allocation = *allocation;
+ 
+   tree_view = GTK_TREE_VIEW (widget);
+ 
++  if (tree_view->priv->prev_width != widget->allocation.width)
++    width_changed = TRUE;
++
+   tmp_list = tree_view->priv->children;
+ 
+   while (tmp_list)
+@@ -2395,7 +2427,7 @@
+ 			      allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
+     }
+ 
+-  gtk_tree_view_size_allocate_columns (widget);
++  gtk_tree_view_size_allocate_columns (widget, width_changed);
+ 
+   if (tree_view->priv->tree == NULL)
+     invalidate_empty_focus (tree_view);
+@@ -2806,7 +2838,7 @@
+ 
+ 	  gtk_grab_add (widget);
+ 	  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
+-	  column->resized_width = column->width;
++	  column->resized_width = column->width - tree_view->priv->last_extra_space_per_column;
+ 
+ 	  /* block attached dnd signal handler */
+ 	  drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
+@@ -3515,6 +3547,8 @@
+     {
+       column->use_resized_width = TRUE;
+       column->resized_width = new_width;
++      if (column->expand)
++	column->resized_width -= tree_view->priv->last_extra_space_per_column;
+       gtk_widget_queue_resize (widget);
+     }
+ 
+@@ -11317,7 +11351,7 @@
+   if (GTK_WIDGET_REALIZED (tree_view))
+     {
+       gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+-      gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view));
++      gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), FALSE);
+     }
+ 
+   g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
+Index: gtk+2.0-2.11.6/gtk/gtktreeprivate.h
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeprivate.h	2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeprivate.h	2007-07-23 13:04:59.000000000 +0200
+@@ -265,6 +265,10 @@
+   gboolean tree_lines_enabled;
+   GdkGC *tree_line_gc;
+ 
++  gint last_extra_space;
++  gint last_extra_space_per_column;
++  gint last_number_of_expand_columns;
++
+   gint tooltip_column;
+ };
+ 
--- gtk+2.0-2.11.6.orig/debian/patches/002_static-linking-dont-build-perf.patch
+++ gtk+2.0-2.11.6/debian/patches/002_static-linking-dont-build-perf.patch
@@ -0,0 +1,17 @@
+Index: gtk+2.0-2.10.10/Makefile.am
+===================================================================
+--- gtk+2.0-2.10.10.orig/Makefile.am	2007-03-12 15:12:11.000000000 +0100
++++ gtk+2.0-2.10.10/Makefile.am	2007-03-13 14:10:07.000000000 +0100
+@@ -1,6 +1,11 @@
+ ## Makefile.am for GTK+
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++# don't build perf measurement tools in static builds
++if !ENABLE_STATIC
++MAYBE_PERF = perf
++endif
++
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
--- gtk+2.0-2.11.6.orig/debian/patches/015_default-fallback-icon-theme.patch
+++ gtk+2.0-2.11.6/debian/patches/015_default-fallback-icon-theme.patch
@@ -0,0 +1,11 @@
+--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c	2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtksettings.c	2007-07-23 22:00:25.000000000 +0200
+@@ -290,7 +290,7 @@
+                                              g_param_spec_string ("gtk-fallback-icon-theme",
+ 								  P_("Fallback Icon Theme Name"),
+ 								  P_("Name of a icon theme to fall back to"),
+-								  NULL,
++								  "gnome",
+ 								  GTK_PARAM_READWRITE),
+                                              NULL);
+   g_assert (result == PROP_FALLBACK_ICON_THEME);
--- gtk+2.0-2.11.6.orig/debian/patches/009_gtk-export-filechooser.patch
+++ gtk+2.0-2.11.6/debian/patches/009_gtk-export-filechooser.patch
@@ -0,0 +1,225 @@
+2007-06-24  Loic Minier  <lool@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@imendio.com>
+    
+    	* gtk/gtkfilechooserutils.[ch]
+    	(hildon_gtk_file_chooser_install_properties): conditionalize with
+    	MAEMO_CHANGES, port over doc comment.
+
+2006-12-04  Tommi Komulainen  <tommi.komulainen@nokia.com>
+    
+    	Export enough symbols for implementing GtkFileChooser interface
+    	outside gtk.
+    
+    	* gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties
+    	* gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+    	(gtk_private_h_sources, gtk_semi_private_h_sources): export
+    	gtkfilesystemmodel.h, gtkfilechooserprivate.h, and
+    	gtkfilechooserutils.h as semi-private
+    	* gtk/gtkfilechooserutils.c
+    	(hildon_gtk_file_chooser_install_properties): add exported version of
+    	_gtk_file_chooser_install_properties
+    	* gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+    	#ifdef guard
+    	* gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+    	#ifdef guard
+    	* gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+    	#ifdef guard, declare hildon_gtk_file_chooser_install_properties
+    
+    	* tests/autotestfilechooser.c: build with
+    	GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+--- 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-24 10:31:52.000000000 +0200
+@@ -33,6 +33,8 @@
+ 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+ 	-DGDK_DISABLE_DEPRECATED			\
++	-DMAEMO_CHANGES					\
++	-DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED		\
+ 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
+ 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
+ 	$(GTK_DEBUG_FLAGS)				\
+@@ -335,12 +337,15 @@
+ # that are not included in gtk/gtk.h
+ gtk_semi_private_h_sources =    \
+ 	gtktextlayout.h		\
+-	gtkfilesystem.h
++	gtkfilesystem.h		\
++	gtkfilesystemmodel.h	\
++	gtkfilechooserprivate.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	\
+ 	gtkfilechooserentry.h	\
+-	gtkfilechooserprivate.h	\
+ 	gtkfilechoosersettings.h \
+-	gtkfilechooserutils.h	\
+-	gtkfilesystemmodel.h	\
+ 	gtkfilesystemunix.h	\
+ 	gtkhsv.h		\
+ 	gtkiconcache.h		\
+--- 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-24 09:09:13.000000000 +0200
+@@ -1416,6 +1416,12 @@
+ #endif
+ #endif
+ 
++#if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__)
++#if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__)
++hildon_gtk_file_chooser_install_properties
++#endif
++#endif
++
+ #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
+--- 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-24 09:09:14.000000000 +0200
+@@ -21,6 +21,14 @@
+ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
+ #define __GTK_FILE_CHOOSER_PRIVATE_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 "gtkfilechooser.h"
+ #include "gtkfilesystem.h"
+ #include "gtkfilesystemmodel.h"
+--- 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-24 09:09:14.000000000 +0200
+@@ -119,6 +119,22 @@
+ 				    "do-overwrite-confirmation");
+ }
+ 
++#ifdef MAEMO_CHANGES
++/**
++ * hildon_gtk_file_chooser_install_properties:
++ *
++ * Exactly the same as the private _gtk_file_chooser_install_properties()
++ * but exported for hildon-fm.
++ *
++ * Since: maemo 2.0
++ */
++void
++hildon_gtk_file_chooser_install_properties (GObjectClass *klass)
++{
++  _gtk_file_chooser_install_properties (klass);
++}
++#endif /* MAEMO_CHANGES */
++
+ /**
+  * _gtk_file_chooser_delegate_iface_init:
+  * @iface: a #GtkFileChoserIface structure
+@@ -360,3 +376,6 @@
+   g_signal_emit_by_name (data, "confirm-overwrite", &conf);
+   return conf;
+ }
++
++#define __GTK_FILE_CHOOSER_UTILS_C__
++#include "gtkaliasdef.c"
+--- 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-24 09:09:14.000000000 +0200
+@@ -22,6 +22,14 @@
+ #ifndef __GTK_FILE_CHOOSER_UTILS_H__
+ #define __GTK_FILE_CHOOSER_UTILS_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 "gtkfilechooserutils.h is not supported API for general use"
++#endif
++
+ #include "gtkfilechooserprivate.h"
+ 
+ G_BEGIN_DECLS
+@@ -45,6 +53,9 @@
+ } GtkFileChooserProp;
+ 
+ void _gtk_file_chooser_install_properties (GObjectClass *klass);
++#ifdef MAEMO_CHANGES
++void hildon_gtk_file_chooser_install_properties (GObjectClass *klass);
++#endif /* MAEMO_CHANGES */
+ 
+ void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
+ void _gtk_file_chooser_set_delegate        (GtkFileChooser *receiver,
+--- 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-24 09:09:14.000000000 +0200
+@@ -21,6 +21,10 @@
+ #ifndef __GTK_FILE_SYSTEM_MODEL_H__
+ #define __GTK_FILE_SYSTEM_MODEL_H__
+ 
++#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
++#error "GtkFileSystemModel is not supported API for general use"
++#endif
++
+ #include <glib-object.h>
+ #include "gtkfilesystem.h"
+ #include <gtk/gtktreemodel.h>
+--- 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-24 09:09:14.000000000 +0200
+@@ -30,6 +30,7 @@
+  */
+ 
+ #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
++#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+ #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"
+ 
--- gtk+2.0-2.11.6.orig/debian/patches/020_immodules-files-d.patch
+++ gtk+2.0-2.11.6/debian/patches/020_immodules-files-d.patch
@@ -0,0 +1,126 @@
+Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
+===================================================================
+--- gtk+2.0-2.10.10.orig/gtk/gtkimmodule.c	2007-03-12 14:51:28.000000000 +0100
++++ gtk+2.0-2.10.10/gtk/gtkimmodule.c	2007-03-13 14:10:33.000000000 +0100
+@@ -59,6 +59,9 @@
+ #define GTK_IM_MODULE(im_module)    (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))
+ #define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE))
+ 
++#define IMMODULEFILEEXT ".immodules"
++#define IMMODULEFILEEXT_LEN ((int) strlen (IMMODULEFILEEXT))
++
+ struct _GtkIMModule
+ {
+   GTypeModule parent_instance;
+@@ -261,31 +264,15 @@
+ 
+ 
+ static void
+-gtk_im_module_initialize (void)
++process_module_file (const gchar *filename, FILE *file)
+ {
+   GString *line_buf = g_string_new (NULL);
+   GString *tmp_buf = g_string_new (NULL);
+-  gchar *filename = gtk_rc_get_im_module_file();
+-  FILE *file;
+   gboolean have_error = FALSE;
+ 
+   GtkIMModule *module = NULL;
+   GSList *infos = NULL;
+ 
+-  contexts_hash = g_hash_table_new (g_str_hash, g_str_equal);
+-
+-  file = g_fopen (filename, "r");
+-  if (!file)
+-    {
+-      /* In case someone wants only the default input method,
+-       * we allow no file at all.
+-       */
+-      g_string_free (line_buf, TRUE);
+-      g_string_free (tmp_buf, TRUE);
+-      g_free (filename);
+-      return;
+-    }
+-
+   while (!have_error && pango_read_line (file, line_buf))
+     {
+       const char *p;
+@@ -383,10 +370,76 @@
+   else if (module)
+     add_module (module, infos);
+ 
+-  fclose (file);
+   g_string_free (line_buf, TRUE);
+   g_string_free (tmp_buf, TRUE);
+-  g_free (filename);
++}
++
++static void
++gtk_im_module_initialize (void)
++{
++  gchar *im_module_file_str = gtk_rc_get_im_module_file();
++  gchar *im_module_files_d_str = g_build_filename (GTK_LIBDIR,
++						   "gtk-2.0",
++						   GTK_BINARY_VERSION,
++						   "immodule-files.d",
++						   NULL);
++  FILE *file;
++  gchar *list_str;
++  char **files;
++  int n;
++
++  list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++			im_module_file_str,
++			im_module_files_d_str,
++			NULL);
++
++  files = pango_split_file_list (list_str);
++
++  contexts_hash = g_hash_table_new (g_str_hash, g_str_equal);
++
++  n = 0;
++  while (files[n])
++    n++;
++
++  while (n-- > 0)
++    {
++      GDir *dir = g_dir_open (files[n], 0, NULL);
++      if (dir)
++	{
++	  const char *dent;
++
++	  while ((dent = g_dir_read_name (dir)))
++	    {
++	      int len = strlen (dent);
++	      if (len > IMMODULEFILEEXT_LEN && strcmp (dent + len - IMMODULEFILEEXT_LEN, IMMODULEFILEEXT) == 0)
++		{
++		  gchar *pathname = g_build_filename (files[n], dent, NULL);
++		  file = g_fopen (pathname, "r");
++		  if (file)
++		    {
++		      process_module_file(pathname, file);
++		      fclose(file);
++		    }
++		  g_free (pathname);
++		}
++	    }
++	  g_dir_close (dir);
++	}
++      else
++	{
++	  file = g_fopen (files[n], "r");
++	  if (file)
++	    {
++	      process_module_file(files[n], file);
++	      fclose (file);
++	    }
++	}
++    }
++
++  g_strfreev (files);
++  g_free (list_str);
++  g_free (im_module_files_d_str);
++  g_free (im_module_file_str);
+ }
+ 
+ static gint
--- gtk+2.0-2.11.6.orig/debian/patches/021_loader-files-d.patch
+++ gtk+2.0-2.11.6/debian/patches/021_loader-files-d.patch
@@ -0,0 +1,319 @@
+Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-06 13:43:15.000000000 +0200
++++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-13 11:57:45.000000000 +0200
+@@ -45,6 +45,9 @@
+ #undef STRICT
+ #endif
+ 
++#define LOADERFILEEXT ".loaders"
++#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT))
++
+ static gint 
+ format_check (GdkPixbufModule *module, guchar *buffer, int size)
+ {
+@@ -284,87 +287,93 @@
+ 
+ #endif	/* USE_GMODULE */
+ 
++/* FIXME this is a static copy of a public pango function which should really
++ * livein glib */
++static char *
++_ugly_copy_of_pango_trim_string (const char *str)
++{
++  int len;
++
++  g_return_val_if_fail (str != NULL, NULL);
++  
++  while (*str && g_ascii_isspace (*str))
++    str++;
++
++  len = strlen (str);
++  while (len > 0 && g_ascii_isspace (str[len-1]))
++    len--;
++
++  return g_strndup (str, len);
++}
++
++/* FIXME this is a static copy of a public pango function which should really
++ * livein glib */
++char **
++_ugly_copy_of_pango_split_file_list (const char *str)
++{
++  int i = 0;
++  int j;
++  char **files;
++
++  files = g_strsplit (str, G_SEARCHPATH_SEPARATOR_S, -1);
++
++  while (files[i])
++    {
++      char *file = _ugly_copy_of_pango_trim_string (files[i]);
++
++      /* If the resulting file is empty, skip it */
++      if (file[0] == '\0')
++	{
++	  g_free(file);
++	  g_free (files[i]);
++	  
++	  for (j = i + 1; files[j]; j++)
++	    files[j - 1] = files[j];
++	  
++	  files[j - 1] = NULL;
++
++	  continue;
++	}
++#ifndef G_OS_WIN32
++      /* '~' is a quite normal and common character in file names on
++       * Windows, especially in the 8.3 versions of long file names, which
++       * still occur now and then. Also, few Windows user are aware of the
++       * Unix shell convention that '~' stands for the home directory,
++       * even if they happen to have a home directory.
++       */
++      if (file[0] == '~' && file[1] == G_DIR_SEPARATOR)
++	{
++	  char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL);
++	  g_free (file);
++	  file = tmp;
++	}
++      else if (file[0] == '~' && file[1] == '\0')
++	{
++	  g_free (file);
++	  file = g_strdup (g_get_home_dir());
++	}
++#endif
++      g_free (files[i]);
++      files[i] = file;
++	
++      i++;
++    }
++
++  return files;
++}
++
+ static void 
+-gdk_pixbuf_io_init (void)
++process_module_file (const gchar *filename, GIOChannel *channel)
+ {
+-#ifdef USE_GMODULE
+-	GIOChannel *channel;
+ 	gchar *line_buf;
+ 	gsize term;
+ 	GString *tmp_buf = g_string_new (NULL);
+ 	gboolean have_error = FALSE;
+ 	GdkPixbufModule *module = NULL;
+-	gchar *filename = gdk_pixbuf_get_module_file ();
+ 	int flags;
+ 	int n_patterns = 0;
+ 	GdkPixbufModulePattern *pattern;
+-	GError *error = NULL;
+-#endif
+-	GdkPixbufModule *builtin_module = NULL;
+-
+-#define load_one_builtin_module(format)					\
+-	builtin_module = g_new0 (GdkPixbufModule, 1);			\
+-	builtin_module->module_name = #format;				\
+-	if (_gdk_pixbuf_load_module (builtin_module, NULL))		\
+-		file_formats = g_slist_prepend (file_formats, builtin_module);\
+-	else								\
+-		g_free (builtin_module)
+-
+-#ifdef INCLUDE_ani
+-	load_one_builtin_module (ani);
+-#endif
+-#ifdef INCLUDE_png
+-	load_one_builtin_module (png);
+-#endif
+-#ifdef INCLUDE_bmp
+-	load_one_builtin_module (bmp);
+-#endif
+-#ifdef INCLUDE_wbmp
+-	load_one_builtin_module (wbmp);
+-#endif
+-#ifdef INCLUDE_gif
+-	load_one_builtin_module (gif);
+-#endif
+-#ifdef INCLUDE_ico
+-	load_one_builtin_module (ico);
+-#endif
+-#ifdef INCLUDE_jpeg
+-	load_one_builtin_module (jpeg);
+-#endif
+-#ifdef INCLUDE_pnm
+-	load_one_builtin_module (pnm);
+-#endif
+-#ifdef INCLUDE_ras
+-	load_one_builtin_module (ras);
+-#endif
+-#ifdef INCLUDE_tiff
+-	load_one_builtin_module (tiff);
+-#endif
+-#ifdef INCLUDE_xpm
+-	load_one_builtin_module (xpm);
+-#endif
+-#ifdef INCLUDE_xbm
+-	load_one_builtin_module (xbm);
+-#endif
+-#ifdef INCLUDE_tga
+-	load_one_builtin_module (tga);
+-#endif
+-#ifdef INCLUDE_pcx
+-	load_one_builtin_module (pcx);
+-#endif
+-
+-#undef load_one_builtin_module
+ 
+-#ifdef USE_GMODULE
+-	channel = g_io_channel_new_file (filename, "r",  &error);
+-	if (!channel) {
+-		/* Don't bother warning if we have some built-in loaders */
+-		if (file_formats == NULL)
+-			g_warning ("Cannot open pixbuf loader module file '%s': %s",
+-				   filename, error->message);
+-		return;
+-	}
+-	
+ 	while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
+ 		const char *p;
+ 		
+@@ -497,8 +506,138 @@
+ 		g_free (line_buf);
+ 	}
+ 	g_string_free (tmp_buf, TRUE);
+-	g_io_channel_unref (channel);
+-	g_free (filename);
++}
++
++static void 
++gdk_pixbuf_io_init (void)
++{
++#ifdef USE_GMODULE
++	GIOChannel *channel;
++	gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
++	/* FIXME: using an absolute path requires patching Makefile.am */
++	gchar *gdkpixbuf_module_files_d_str = g_build_filename (PIXBUF_LIBDIR,
++							 "..",
++							 "loader-files.d",
++							 NULL);
++	gchar *list_str;
++	char **files;
++	GError *error = NULL;
++	int n;
++#endif
++	GdkPixbufModule *builtin_module = NULL;
++
++#define load_one_builtin_module(format)					\
++	builtin_module = g_new0 (GdkPixbufModule, 1);			\
++	builtin_module->module_name = #format;				\
++	if (_gdk_pixbuf_load_module (builtin_module, NULL))		\
++		file_formats = g_slist_prepend (file_formats, builtin_module);\
++	else								\
++		g_free (builtin_module)
++
++#ifdef INCLUDE_ani
++	load_one_builtin_module (ani);
++#endif
++#ifdef INCLUDE_png
++	load_one_builtin_module (png);
++#endif
++#ifdef INCLUDE_bmp
++	load_one_builtin_module (bmp);
++#endif
++#ifdef INCLUDE_wbmp
++	load_one_builtin_module (wbmp);
++#endif
++#ifdef INCLUDE_gif
++	load_one_builtin_module (gif);
++#endif
++#ifdef INCLUDE_ico
++	load_one_builtin_module (ico);
++#endif
++#ifdef INCLUDE_jpeg
++	load_one_builtin_module (jpeg);
++#endif
++#ifdef INCLUDE_pnm
++	load_one_builtin_module (pnm);
++#endif
++#ifdef INCLUDE_ras
++	load_one_builtin_module (ras);
++#endif
++#ifdef INCLUDE_tiff
++	load_one_builtin_module (tiff);
++#endif
++#ifdef INCLUDE_xpm
++	load_one_builtin_module (xpm);
++#endif
++#ifdef INCLUDE_xbm
++	load_one_builtin_module (xbm);
++#endif
++#ifdef INCLUDE_tga
++	load_one_builtin_module (tga);
++#endif
++#ifdef INCLUDE_pcx
++	load_one_builtin_module (pcx);
++#endif
++
++#undef load_one_builtin_module
++
++#ifdef USE_GMODULE
++	list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++			      gdkpixbuf_module_file_str,
++			      gdkpixbuf_module_files_d_str,
++			      NULL);
++
++	files = _ugly_copy_of_pango_split_file_list (list_str);
++
++	n = 0;
++	while (files[n])
++		n++;
++
++	while (n-- > 0) {
++		GDir *dir = g_dir_open (files[n], 0, NULL);
++		if (dir) {
++			const char *dent;
++
++			while ((dent = g_dir_read_name (dir))) {
++				int len = strlen (dent);
++				if (len > LOADERFILEEXT_LEN && strcmp (dent + len - LOADERFILEEXT_LEN, LOADERFILEEXT) == 0) {
++					gchar *pathname = g_build_filename (files[n], dent, NULL);
++					channel = g_io_channel_new_file (pathname, "r",  &error);
++					if (!channel) {
++						/* we don't care about issuing a warning
++						 * g_warning ("Cannot open pixbuf loader module file '%s': %s",
++						 *	   pathname,
++						 *	   error->message);
++						 */
++						g_error_free (error);
++						error = NULL;
++					} else {
++						process_module_file (pathname, channel);
++						g_io_channel_unref (channel);
++					}
++					g_free (pathname);
++				}
++			}
++			g_dir_close (dir);
++		} else {
++			channel = g_io_channel_new_file (files[n], "r", &error);
++			if (!channel) {
++				/* we don't care about issuing a warning
++				 * g_warning ("Cannot open pixbuf loader module file '%s': %s",
++				 *	   files[n],
++				 *	   error->message);
++				 */
++				g_error_free (error);
++				error = NULL;
++			} else {
++				process_module_file (files[n], channel);
++				g_io_channel_unref (channel);
++			}
++		}
++	}
++
++	g_strfreev (files);
++	g_free (list_str);
++	g_free (gdkpixbuf_module_files_d_str);
++	g_free (gdkpixbuf_module_file_str);
+ #endif
+ }
+ 
--- gtk+2.0-2.11.6.orig/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch
+++ gtk+2.0-2.11.6/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch
@@ -0,0 +1,14 @@
+Debian #381081; GNOME #447118
+
+Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c
+===================================================================
+--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c	2007-03-12 15:06:54.000000000 +0100
++++ gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c	2007-03-13 14:10:23.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include "gdkregion-generic.h"
+ #include "gdkalias.h"
+ 
++#include <cairo.h>
+ #include "cairo-directfb.h"
+ 
+ #define WARN_UNIMPLEMENTED(func)\
--- gtk+2.0-2.11.6.orig/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch
+++ gtk+2.0-2.11.6/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch
@@ -0,0 +1,14 @@
+GNOME #447163; Debian 381082
+
+Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c
+===================================================================
+--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c	2007-06-15 20:08:17.000000000 +0200
++++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c	2007-06-16 14:25:00.000000000 +0200
+@@ -33,6 +33,7 @@
+ #undef GDK_DISABLE_DEPRECATED
+ 
+ #include <config.h>
++#undef GDK_DISABLE_DEPRECATED
+ #include "gdk.h"
+ 
+ #include <string.h>
--- gtk+2.0-2.11.6.orig/debian/patches/001_static-linking-dont-query-immodules.patch
+++ gtk+2.0-2.11.6/debian/patches/001_static-linking-dont-query-immodules.patch
@@ -0,0 +1,49 @@
+Index: gtk+2.0-2.11.5/configure.in
+===================================================================
+--- gtk+2.0-2.11.5.orig/configure.in	2007-07-02 17:04:27.000000000 +0200
++++ gtk+2.0-2.11.5/configure.in	2007-07-03 11:34:03.000000000 +0200
+@@ -134,6 +134,7 @@
+ dnl Initialize libtool
+ AC_PROG_CC
+ AM_DISABLE_STATIC
++AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
+ 
+ dnl 
+ dnl Check for a working C++ compiler, but do not bail out, if none is found.
+Index: gtk+2.0-2.11.5/modules/input/Makefile.am
+===================================================================
+--- gtk+2.0-2.11.5.orig/modules/input/Makefile.am	2007-07-02 17:04:10.000000000 +0200
++++ gtk+2.0-2.11.5/modules/input/Makefile.am	2007-07-03 11:34:03.000000000 +0200
+@@ -106,8 +106,12 @@
+ if CROSS_COMPILING
+ RUN_QUERY_IMMODULES_TEST=false
+ else
++if ENABLE_STATIC
++RUN_QUERY_IMMODULES_TEST=false
++else
+ RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
+ endif
++endif
+ 
+ # Running this if cross compiling or if DESTDIR is set is going to
+ # not work at all, so skip it.
+@@ -148,7 +152,18 @@
+ 	$(IM_IME_MODULE)
+ 
+ gtk.immodules: Makefile.am $(module_LTLIBRARIES)
+-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
++	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
++	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++	else \
++	  echo "***" ; \
++	  echo "*** Warning: gtk.immodules not built" ; \
++	  echo "***" ; \
++	  echo "*** Generate this file manually on host" ; \
++	  echo "*** system using gtk-query-immodules-2.0" ; \
++	  echo "***" ; \
++	  touch gtk.immodules; \
++        fi
+ 
+ CLEANFILES = gtk.immodules
+ 
--- gtk+2.0-2.11.6.orig/debian/patches/000_gtk+-2.0.6-exportsymbols.patch
+++ gtk+2.0-2.11.6/debian/patches/000_gtk+-2.0.6-exportsymbols.patch
@@ -0,0 +1,14 @@
+Index: gtk+2.0-2.10.10/configure.in
+===================================================================
+--- gtk+2.0-2.10.10.orig/configure.in	2007-03-12 15:07:22.000000000 +0100
++++ gtk+2.0-2.10.10/configure.in	2007-03-13 14:10:00.000000000 +0100
+@@ -351,7 +351,8 @@
+ if test "$os_win32" != yes; then
+     # libtool option to control which symbols are exported
+     # right now, symbols starting with _ are not exported
+-    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
++    # Disabled until -export-symbols-regex works (RH patch)
++    LIBTOOL_EXPORT_OPTIONS=
+ else
+     # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+     LIBTOOL_EXPORT_OPTIONS=
--- gtk+2.0-2.11.6.orig/debian/patches/040_filechooser_single-click.patch
+++ gtk+2.0-2.11.6/debian/patches/040_filechooser_single-click.patch
@@ -0,0 +1,101 @@
+Debian #405296; GNOME #148828; permit single click in filechooser instead of
+requiring double-click.
+
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserdefault.c	2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserdefault.c	2007-07-23 22:01:15.000000000 +0200
+@@ -390,10 +390,6 @@
+ 
+ static void filter_combo_changed       (GtkComboBox           *combo_box,
+ 					GtkFileChooserDefault *impl);
+-static void     shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-					    GtkTreePath           *path,
+-					    GtkTreeViewColumn     *column,
+-					    GtkFileChooserDefault *impl);
+ 
+ static gboolean shortcuts_key_press_event_cb (GtkWidget             *widget,
+ 					      GdkEventKey           *event,
+@@ -3639,8 +3635,22 @@
+ shortcuts_selection_changed_cb (GtkTreeSelection      *selection,
+ 				GtkFileChooserDefault *impl)
+ {
++  GtkTreeIter iter;
++  GtkTreeIter child_iter;
++
+   bookmarks_check_remove_sensitivity (impl);
+   shortcuts_check_popup_sensitivity (impl);
++
++  if (impl->changing_folder)
++    return;
++
++  if (gtk_tree_selection_get_selected(selection, NULL, &iter))
++    {
++      gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
++							&child_iter,
++							&iter);
++      shortcuts_activate_iter (impl, &child_iter);
++    }
+ }
+ 
+ static gboolean
+@@ -3920,9 +3930,6 @@
+   g_signal_connect (selection, "changed",
+ 		    G_CALLBACK (shortcuts_selection_changed_cb), impl);
+ 
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated",
+-		    G_CALLBACK (shortcuts_row_activated_cb), impl);
+-
+   g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
+ 		    G_CALLBACK (shortcuts_key_press_event_cb), impl);
+ 
+@@ -8601,25 +8608,6 @@
+       gtk_file_path_free (path);
+       return retval;
+     }
+-  else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view)
+-    {
+-      /* The focus is on a dialog's action area button, *and* the widget that
+-       * was focused immediately before it is the shortcuts list.  Switch to the
+-       * selected shortcut and tell the caller not to respond.
+-       */
+-      GtkTreeIter iter;
+-
+-      if (shortcuts_get_selected (impl, &iter))
+-	{
+-	  shortcuts_activate_iter (impl, &iter);
+-	  
+-	  focus_browse_tree_view_if_possible (impl);
+-	}
+-      else
+-	goto file_list;
+-
+-      return FALSE;
+-    }
+   else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
+     {
+       /* The focus is on a dialog's action area button, *and* the widget that
+@@ -10471,25 +10459,6 @@
+     }
+ }
+ 
+-/* Callback used when a row in the shortcuts list is activated */
+-static void
+-shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-			    GtkTreePath           *path,
+-			    GtkTreeViewColumn     *column,
+-			    GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  GtkTreeIter child_iter;
+-
+-  if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path))
+-    return;
+-
+-  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
+-						    &child_iter,
+-						    &iter);
+-  shortcuts_activate_iter (impl, &child_iter);
+-}
+-
+ /* Handler for GtkWidget::key-press-event on the shortcuts list */
+ static gboolean
+ shortcuts_key_press_event_cb (GtkWidget             *widget,
--- gtk+2.0-2.11.6.orig/debian/patches/041_ia32-libs.patch
+++ gtk+2.0-2.11.6/debian/patches/041_ia32-libs.patch
@@ -0,0 +1,99 @@
+Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-16 14:25:47.000000000 +0200
++++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-16 14:26:24.000000000 +0200
+@@ -280,8 +280,20 @@
+   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
+ 
+   if (!result)
+-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+-
++    {
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++# if defined (__i386__)
++      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
++# else
++      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.64", NULL);
++#endif
++      /* Prefer compat gdk-pixbuf.loaders file if it's usable. */
++      if (g_file_test(result, G_FILE_TEST_EXISTS))
++        return result;
++      g_free (result);
++#endif
++      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
++    }
+   return result;
+ }
+ 
+Index: gtk+2.0-2.11.3/gtk/gtkrc.c
+===================================================================
+--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c	2007-06-15 20:07:37.000000000 +0200
++++ gtk+2.0-2.11.3/gtk/gtkrc.c	2007-06-16 14:26:24.000000000 +0200
+@@ -450,7 +450,20 @@
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++        {
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++# if defined (__i386__)
++         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
++# else
++         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.64", NULL);
++# endif
++          /* Prefer compat gtk.immodules file if it's usable. */
++          if (g_file_test(result, G_FILE_TEST_EXISTS))
++            return result;
++          g_free (result);
++#endif
++          result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++        }
+     }
+ 
+   return result;
+@@ -522,7 +535,21 @@
+   else
+     {
+       const gchar *home;
+-      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++# if defined (__i386__)
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL);
++# else
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL);
++# endif
++      /* Prefer compat gtkrc if it's usable. */
++      if (!g_file_test(str, G_FILE_TEST_EXISTS))
++        {
++          g_free (str), /* continue in next line */
++#endif
++          str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++        }
++#endif
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
+@@ -530,7 +557,21 @@
+       home = g_get_home_dir ();
+       if (home)
+ 	{
+-	  str = g_build_filename (home, ".gtkrc-2.0", NULL);
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++# if defined (__i386__)
++          str = g_build_filename (home, ".gtkrc-2.0.32", NULL);
++# else
++          str = g_build_filename (home, ".gtkrc-2.0.64", NULL);
++# endif
++          /* Prefer compat .gtkrc-2.0 if it's usable. */
++          if (!g_file_test(str, G_FILE_TEST_EXISTS))
++            {
++              g_free (str), /* continue in next line */
++#endif
++              str = g_build_filename (home, ".gtkrc-2.0", NULL);
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++            }
++#endif
+ 	  gtk_rc_add_default_file (str);
+ 	  g_free (str);
+ 	}
--- gtk+2.0-2.11.6.orig/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
+++ gtk+2.0-2.11.6/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
@@ -0,0 +1,1220 @@
+Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
+===================================================================
+--- gtk+2.0-2.10.10.orig/gtk/gtkfilesel.c	2007-03-12 14:51:01.000000000 +0100
++++ gtk+2.0-2.10.10/gtk/gtkfilesel.c	2007-03-13 14:10:10.000000000 +0100
+@@ -79,9 +79,13 @@
+ #undef GTK_DISABLE_DEPRECATED
+ #include "gtkoptionmenu.h"
+ 
++#include "gtkimage.h"
++
+ #define WANT_HPANED 1
+ #include "gtkhpaned.h"
+ 
++#include "stock-icons/ximian-icons.h"
++
+ #include "gtkalias.h"
+ 
+ #ifdef G_OS_WIN32
+@@ -317,6 +321,9 @@
+  */
+ static gchar*              cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state);
+ 
++static void home_clicked (GtkWidget *widget, gpointer data);
++static void desktop_clicked (GtkWidget *widget, gpointer data);
++static void documents_clicked (GtkWidget *widget, gpointer data);
+ 
+ /* Directory operations. */
+ static CompletionDir* open_ref_dir         (gchar* text_to_complete,
+@@ -626,6 +633,10 @@
+   GtkWidget *spacer;
+   GtkDialog *dialog;
+ 
++  GdkPixbuf *ipixbuf;
++  GtkWidget *bbox, *home_button, *desk_button, *docs_button, *xbox;
++  GtkWidget *lbox;
++
+   GtkListStore *model;
+   GtkTreeViewColumn *column;
+   
+@@ -639,18 +650,9 @@
+   filesel->main_vbox = dialog->vbox;
+   gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
+ 
+-  /* The horizontal box containing create, rename etc. buttons */
+-  filesel->button_area = gtk_hbutton_box_new ();
+-  gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
+-  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
+-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
+-		      FALSE, FALSE, 0);
+-  gtk_widget_show (filesel->button_area);
+-  
+-  gtk_file_selection_show_fileop_buttons (filesel);
+-
+   /* hbox for pulldown menu */
+   pulldown_hbox = gtk_hbox_new (TRUE, 5);
++  gtk_container_set_border_width (GTK_CONTAINER (pulldown_hbox), 4);
+   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
+   gtk_widget_show (pulldown_hbox);
+   
+@@ -662,14 +664,27 @@
+     
+   /*  The horizontal box containing the directory and file listboxes  */
+ 
++  xbox = gtk_hbox_new (FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), xbox, TRUE, TRUE, 0);
++  gtk_widget_show (xbox);
++
++  bbox = gtk_vbox_new (FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (xbox), bbox, FALSE, FALSE, 5);
++  gtk_widget_show (bbox);
++
++  lbox = gtk_vbox_new (FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (xbox), lbox, TRUE, TRUE, 5);
++  gtk_widget_show (lbox);
++
+   spacer = gtk_hbox_new (FALSE, 0);
+   gtk_widget_set_size_request (spacer, -1, 5);
+-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0);
+   gtk_widget_show (spacer);
+   
+   list_hbox = gtk_hbox_new (FALSE, 5);
+-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (lbox), list_hbox, TRUE, TRUE, 0);
+   gtk_widget_show (list_hbox);
++
+   if (WANT_HPANED)
+     list_container = g_object_new (GTK_TYPE_HPANED,
+ 				   "visible", TRUE,
+@@ -681,9 +696,78 @@
+ 
+   spacer = gtk_hbox_new (FALSE, 0);
+   gtk_widget_set_size_request (spacer, -1, 5);
+-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0);  
++  gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0);  
+   gtk_widget_show (spacer);
+   
++
++  /* The Pretty Icons */
++  
++  home_button = gtk_button_new ();
++  gtk_container_set_border_width (GTK_CONTAINER (home_button), 4);
++  gtk_box_pack_start (GTK_BOX (bbox), home_button, FALSE, FALSE, 0);
++  gtk_widget_show (home_button);
++
++  g_signal_connect (G_OBJECT (home_button), "clicked",
++		    G_CALLBACK (home_clicked), filesel);
++
++  xbox = gtk_vbox_new (FALSE, 0);
++  gtk_container_add (GTK_CONTAINER (home_button), xbox);
++  gtk_widget_show (xbox);
++
++  ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_home_48, FALSE, NULL);
++  label = gtk_image_new_from_pixbuf (ipixbuf);
++  gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
++  label = gtk_label_new_with_mnemonic ("_Home");
++  gtk_label_set_mnemonic_widget (GTK_LABEL (label), home_button);
++  gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
++  desk_button = gtk_button_new ();
++  gtk_container_set_border_width (GTK_CONTAINER (desk_button), 4);
++  gtk_box_pack_start (GTK_BOX (bbox), desk_button, FALSE, FALSE, 0);
++  gtk_widget_show (desk_button);
++
++  g_signal_connect (G_OBJECT (desk_button), "clicked",
++		    G_CALLBACK (desktop_clicked), filesel);
++
++  xbox = gtk_vbox_new (FALSE, 0);
++  gtk_container_add (GTK_CONTAINER (desk_button), xbox);
++  gtk_widget_show (xbox);
++
++  ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_desktop_48, FALSE, NULL);
++  label = gtk_image_new_from_pixbuf (ipixbuf);
++  gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
++  label = gtk_label_new_with_mnemonic ("D_esktop");
++  gtk_label_set_mnemonic_widget (GTK_LABEL (label), desk_button);
++  gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
++  docs_button = gtk_button_new ();
++  gtk_container_set_border_width (GTK_CONTAINER (docs_button), 4);
++  gtk_box_pack_start (GTK_BOX (bbox), docs_button, FALSE, FALSE, 0);
++  gtk_widget_show (docs_button);
++
++  g_signal_connect (G_OBJECT (docs_button), "clicked",
++		    G_CALLBACK (documents_clicked), filesel);
++
++  xbox = gtk_vbox_new (FALSE, 0);
++  gtk_container_add (GTK_CONTAINER (docs_button), xbox);
++  gtk_widget_show (xbox);
++
++  ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_documents_48, FALSE, NULL);
++  label = gtk_image_new_from_pixbuf (ipixbuf);
++  gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
++  label = gtk_label_new_with_mnemonic ("Docu_ments");
++  gtk_label_set_mnemonic_widget (GTK_LABEL (label), docs_button);
++  gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0);
++  gtk_widget_show (label);
++
+   /* The directories list */
+ 
+   model = gtk_list_store_new (1, G_TYPE_STRING);
+@@ -756,6 +840,15 @@
+   gtk_widget_show (filesel->file_list);
+   gtk_widget_show (scrolled_win);
+ 
++  /* The horizontal box containing create, rename etc. buttons */
++  filesel->button_area = gtk_hbox_new (FALSE, 0);
++  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
++  gtk_box_pack_start (GTK_BOX (lbox), filesel->button_area, 
++		      FALSE, FALSE, 0);
++  gtk_widget_show (filesel->button_area);
++  
++  gtk_file_selection_show_fileop_buttons (filesel);
++
+   /* action area for packing buttons into. */
+   filesel->action_area = gtk_hbox_new (TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, 
+@@ -1071,39 +1164,94 @@
+ void
+ gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
+ {
++  GtkWidget *label;
++  GtkWidget *bbox;
++  
+   g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
+     
+   /* delete, create directory, and rename */
+   if (!filesel->fileop_c_dir) 
+     {
+-      filesel->fileop_c_dir = gtk_button_new_with_mnemonic (_("_New Folder"));
++      filesel->fileop_c_dir = gtk_button_new ();
++      gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_c_dir), 4);
++      
++      bbox = gtk_hbox_new (FALSE, 2);
++      gtk_container_add (GTK_CONTAINER (filesel->fileop_c_dir), bbox);
++      
++      label = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      label = gtk_label_new_with_mnemonic (_("_New Folder"));
++      gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_c_dir);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      gtk_widget_show (bbox);
++      
+       g_signal_connect (filesel->fileop_c_dir, "clicked",
+-			G_CALLBACK (gtk_file_selection_create_dir),
+-			filesel);
++			G_CALLBACK (gtk_file_selection_create_dir), 
++			(gpointer) filesel);
+       gtk_box_pack_start (GTK_BOX (filesel->button_area), 
+-			  filesel->fileop_c_dir, TRUE, TRUE, 0);
++			  filesel->fileop_c_dir, FALSE, FALSE, 0);
+       gtk_widget_show (filesel->fileop_c_dir);
+     }
+-	
++  
+   if (!filesel->fileop_del_file) 
+     {
+-      filesel->fileop_del_file = gtk_button_new_with_mnemonic (_("De_lete File"));
++      filesel->fileop_del_file = gtk_button_new ();
++      gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_del_file), 4);
++      
++      bbox = gtk_hbox_new (FALSE, 2);
++      gtk_container_add (GTK_CONTAINER (filesel->fileop_del_file), bbox);
++      
++      label = gtk_image_new_from_stock (GTK_STOCK_DELETE,
++ 					GTK_ICON_SIZE_BUTTON);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      label = gtk_label_new (_("De_lete File"));
++      gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
++      gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_del_file);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      gtk_widget_show (bbox);
++      
+       g_signal_connect (filesel->fileop_del_file, "clicked",
+ 			G_CALLBACK (gtk_file_selection_delete_file),
+-			filesel);
+-      gtk_box_pack_start (GTK_BOX (filesel->button_area), 
+-			  filesel->fileop_del_file, TRUE, TRUE, 0);
++			(gpointer) filesel);
++      gtk_box_pack_end (GTK_BOX (filesel->button_area), 
++			filesel->fileop_del_file, FALSE, FALSE, 0);
+       gtk_widget_show (filesel->fileop_del_file);
+     }
+-
++  
+   if (!filesel->fileop_ren_file)
+     {
+-      filesel->fileop_ren_file = gtk_button_new_with_mnemonic (_("_Rename File"));
++      filesel->fileop_ren_file = gtk_button_new ();
++      gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_ren_file), 4);
++      
++      bbox = gtk_hbox_new (FALSE, 2);
++      gtk_container_add (GTK_CONTAINER (filesel->fileop_ren_file), bbox);
++      
++      label = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS,
++ 					GTK_ICON_SIZE_BUTTON);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      label = gtk_label_new (_("_Rename File"));
++      gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
++      gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_ren_file);
++      gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0);
++      gtk_widget_show (label);
++      
++      gtk_widget_show (bbox);
++      
+       g_signal_connect (filesel->fileop_ren_file, "clicked",
+ 			G_CALLBACK (gtk_file_selection_rename_file),
+-			filesel);
+-      gtk_box_pack_start (GTK_BOX (filesel->button_area), 
+-			  filesel->fileop_ren_file, TRUE, TRUE, 0);
++			(gpointer) filesel);
++      gtk_box_pack_end (GTK_BOX (filesel->button_area), 
++			filesel->fileop_ren_file, FALSE, FALSE, 0);
+       gtk_widget_show (filesel->fileop_ren_file);
+     }
+   
+@@ -1805,6 +1953,95 @@
+     gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive);
+ }
+ 
++static void
++home_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  
++  dir = g_strdup_printf ("%s/", g_get_home_dir());
++  
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data), 
++			       dir, FALSE, FALSE);
++  g_free (dir);
++
++  gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry);
++}
++
++static char *
++get_desktop_directory (void)
++{
++  char *filename;
++  struct stat buf;
++
++  filename = g_build_filename (g_get_home_dir (), "Desktop", NULL);
++  if (lstat (filename, &buf) == 0) 
++    {
++      if (S_ISLNK (buf.st_mode)) 
++	{
++	  char link_target[MAXPATHLEN + 1];
++	  int len;
++
++	  len = readlink (filename, link_target, MAXPATHLEN);
++	  if (len > 0) 
++	    {
++	      char *desktop_filename;
++	      /* Add a trailing / if there isn't already one */
++	      link_target[len] = '\0';
++	      if (link_target[len - 1] == G_DIR_SEPARATOR) 
++		{
++		  link_target[len - 1] = '\0';
++		}
++
++	      if (!strcmp (link_target, "Desktop")) 
++		{
++		  g_free (filename);
++		  return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL);
++		}
++	      
++	      desktop_filename = g_build_filename (g_get_home_dir (), "Desktop", NULL);
++	      if (!strcmp (link_target, desktop_filename)) 
++		{
++		  g_free (desktop_filename);
++		  g_free (filename);
++		  return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL);
++		}
++	      g_free (desktop_filename);
++	    }
++	}
++    }
++  g_free (filename);
++
++  return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL);
++}
++
++
++static void
++desktop_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  
++  dir = get_desktop_directory ();
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data), 
++			       dir, FALSE, FALSE);
++  g_free (dir);
++
++  gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry);
++}
++
++static void 
++documents_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  dir = g_strdup_printf ("%s/Documents/", g_get_home_dir ());
++  
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data),
++			       dir, FALSE, FALSE);
++  
++  g_free (dir);
++
++  gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry);
++}
++
+ static gint
+ gtk_file_selection_key_press (GtkWidget   *widget,
+ 			      GdkEventKey *event,
+Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h	2007-03-13 14:10:10.000000000 +0100
+@@ -0,0 +1,825 @@
++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
++
++static const guint8 stock_desktop_48[] = 
++{ ""
++  /* Pixbuf magic (0x47646b50) */
++  "GdkP"
++  /* length: header (24) + pixel_data (6692) */
++  "\0\0\32<"
++  /* pixdata_type (0x2010002) */
++  "\2\1\0\2"
++  /* rowstride (276) */
++  "\0\0\1\24"
++  /* width (69) */
++  "\0\0\0E"
++  /* height (45) */
++  "\0\0\0-"
++  /* pixel_data: */
++  "\377\0\0\0\0\332\0\0\0\0\204\0\0\0\1\252\0\0\0\0\204\0\0\0\1\221\0\0"
++  "\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\11\3\0\0\0\10\0\0\0\5\0\0\0"
++  "\3\245\0\0\0\1\4\0\0\0\2\0\0\0\3\0\0\0\6\0\0\0\10\202\0\0\0\11\3\0\0"
++  "\0\10\0\0\0\5\0\0\0\2\216\0\0\0\0\2\0\0\0\2\0\0\0_\204\0\0\0\377\4\0"
++  "\0\0m\0\0\0\26\0\0\0\17\0\0\0\13\244\0\0\0\12\2\0\0\0\14\0\0\0\202\204"
++  "\0\0\0\377\4\0\0\0l\0\0\0\23\0\0\0\10\0\0\0\2\215\0\0\0\0\3\0\0\0\5\0"
++  "\0\0\377\266\276\312\377\202\245\257\276\377\1s}\214\377\252\0\0\0\377"
++  "\1\266\276\312\377\202\220\234\257\377\5s}\214\377\0\0\0\377\0\0\0)\0"
++  "\0\0\23\0\0\0\5\214\0\0\0\0\11\0\0\0\1\0\0\0\10\0\0\0\377\220\234\257"
++  "\377Ug\204\377DRj\377MNA\377\310\311\274\377\333\334\314\377\231\323"
++  "\324\300\377\4\322\323\300\377\321\323\277\377\321\323\276\377\321\322"
++  "\276\377\203\320\321\275\377\4\317\320\274\377\316\320\274\377\315\320"
++  "\273\377\315\317\272\377\202\315\316\271\377\13\315\315\271\377\314\315"
++  "\271\377qr^\377\245\257\276\377Ug\204\377DRj\377\0\0\0\377\0\0\0<\0\0"
++  "\0\35\0\0\0\10\0\0\0\1\213\0\0\0\0\7\0\0\0\1\0\0\0\11\0\0\0\377\220\234"
++  "\257\377DRj\377abR\377\227\230\177\377\231\274\276\237\377\32\273\275"
++  "\236\377\273\275\235\377\272\274\235\377\271\273\234\377\270\273\233"
++  "\377\270\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377"
++  "\265\267\227\377\264\266\226\377\263\266\225\377\263\265\225\377\262"
++  "\264\224\377\261\264\223\377\260\263\222\377\260\262\221\377\257\262"
++  "\221\377or\\\377\220\234\257\377DRj\377\0\0\0\377\0\0\0E\0\0\0\"\0\0"
++  "\0\12\0\0\0\1\213\0\0\0\0\6\0\0\0\1\0\0\0\12\0\0\0\377s}\214\377abR\377"
++  "\227\230\177\377\231\274\276\237\377\33\273\275\236\377\272\274\235\377"
++  "\271\274\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267"
++  "\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377\264\266"
++  "\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261\263\223"
++  "\377\260\263\222\377\257\262\221\377\257\261\220\377\256\260\217\377"
++  "\255\260\217\377np[\377\220\234\257\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0"
++  "\12\0\0\0\1\213\0\0\0\0\5\0\0\0\1\0\0\0\10\0\0\0m\0\0\0\377\273\274\254"
++  "\377\230\274\276\237\377\35\273\275\236\377\272\275\235\377\272\274\235"
++  "\377\271\273\234\377\270\272\233\377\270\272\232\377\267\271\231\377"
++  "\266\270\231\377\265\270\230\377\265\267\227\377\264\266\226\377\263"
++  "\266\225\377\262\265\225\377\262\264\224\377\261\264\223\377\260\263"
++  "\222\377\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217"
++  "\377\255\257\216\377\254\257\215\377\226\231|\377\0\0\0\377\0\0\0\253"
++  "\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\214\0\0\0\0\4\0\0\0\6\0\0\0\26\0\0"
++  "\0\377\323\324\300\377\227\274\276\237\377\36\273\275\236\377\272\274"
++  "\235\377\271\273\234\377\271\273\233\377\270\272\233\377\267\271\232"
++  "\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377"
++  "\264\266\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261"
++  "\263\223\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260"
++  "\217\377\255\260\217\377\254\257\216\377\254\256\215\377\253\256\214"
++  "\377\226\230z\377\0\0\0\377\0\0\0V\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1"
++  "\214\0\0\0\0\4\0\0\0\3\0\0\0\17\0\0\0\377\323\324\300\377\211\274\276"
++  "\237\377\1z{g\377\214\0\0\0\377\36[\\L\377\267\271\232\377\271\273\234"
++  "\377\270\272\233\377\267\272\232\377\267\271\231\377\266\270\230\377"
++  "\265\270\230\377\265\267\227\377\264\266\226\377\263\266\225\377\262"
++  "\265\224\377\262\264\224\377\261\263\223\377\260\263\222\377\257\262"
++  "\221\377\257\261\220\377\256\261\220\377\255\260\217\377\255\257\216"
++  "\377\254\257\215\377\253\256\214\377\252\255\214\377\252\255\213\377"
++  "\225\227y\377\0\0\0\377\0\0\0O\0\0\0,\0\0\0\20\0\0\0\3\215\0\0\0\0\4"
++  "\0\0\0\2\0\0\0\14\0\0\0\377\323\324\300\377\211\274\276\237\377\3\0\0"
++  "\0\377\323\323\323\377\366\366\366\377\210\377\377\377\377\40\371\371"
++  "\371\377\332\332\332\377XXX\377,-%\377\263\265\226\377\266\270\231\377"
++  "\266\271\231\377\266\270\230\377\265\267\227\377\264\267\226\377\263"
++  "\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377\261\263"
++  "\222\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260\217"
++  "\377\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377"
++  "\252\255\213\377\251\254\212\377\251\253\212\377\224\226x\377\0\0\0\377"
++  "\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0"
++  "\377\323\324\300\377\211\274\276\237\377\2\0\0\0\377\366\366\366\377"
++  "\212\377\377\377\377\5\307\307\307\377\321\321\321\377\326\326\326\377"
++  "\0\0\0\377\260\262\223\377\202\264\267\227\377\30\264\266\226\377\263"
++  "\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377\260\263"
++  "\222\377\257\262\221\377\257\261\220\377\256\261\220\377\255\260\217"
++  "\377\254\257\216\377\254\257\215\377\253\256\214\377\252\255\214\377"
++  "\252\254\213\377\251\254\212\377\250\253\211\377\247\252\210\377\223"
++  "\226x\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0"
++  "\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0\0\377"
++  "\207\377\377\377\377#\376\376\376\377\377\377\377\377\376\376\376\377"
++  "\375\375\375\377\300\300\300\377\341\341\341\377\360\360\360\377\233"
++  "\233\233\377\0\0\0\377\255\257\220\377\262\265\225\377\263\265\225\377"
++  "\262\264\224\377\261\264\223\377\260\263\222\377\260\262\222\377\257"
++  "\262\221\377\256\261\220\377\256\260\217\377\255\260\216\377\254\257"
++  "\216\377\253\256\215\377\253\255\214\377\252\255\213\377\251\254\212"
++  "\377\250\253\212\377\250\253\211\377\247\252\210\377\246\251\207\377"
++  "\222\225v\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4"
++  "\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0"
++  "\0\377\205\377\377\377\377%\376\376\376\377\375\375\375\377\374\374\373"
++  "\377\375\375\375\377\374\374\373\377\373\373\373\377\257\257\256\377"
++  "\351\351\351\377\377\377\377\377\337\337\337\377\217\217\217\377\0\0"
++  "\0\377\253\256\216\377\260\263\222\377\261\263\223\377\260\263\222\377"
++  "\257\262\221\377\257\261\220\377\256\261\217\377\255\260\217\377\254"
++  "\257\216\377\254\256\215\377\253\256\214\377\252\255\213\377\251\254"
++  "\213\377\251\254\212\377\250\253\211\377\247\252\210\377\247\252\207"
++  "\377\246\251\207\377\245\250\206\377\220\224u\377\0\0\0\377\0\0\0I\0"
++  "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324"
++  "\300\377\211\274\276\237\377\1\0\0\0\377\203\377\377\377\377\32\376\376"
++  "\376\377\375\375\375\377\374\374\373\377\373\373\373\377\372\372\371"
++  "\377\373\373\373\377\372\372\371\377\371\371\370\377\244\244\243\377"
++  "\360\360\360\377\377\377\377\377\364\364\364\377\317\317\317\377\242"
++  "\242\242\37744+\377\252\255\215\377\257\261\220\377\257\262\221\377\256"
++  "\261\220\377\255\260\217\377\255\257\216\377\254\257\215\377\253\256"
++  "\215\377\253\255\214\377\252\255\213\377\251\254\212\377\202\250\253"
++  "\211\377\13\247\252\210\377\246\251\207\377\245\251\206\377\245\250\205"
++  "\377\244\247\205\377\220\222t\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0"
++  "\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274"
++  "\276\237\377\15\0\0\0\377\377\377\377\377\376\376\376\377\375\375\375"
++  "\377\374\374\373\377\373\373\373\377\372\372\371\377\371\371\370\377"
++  "\370\370\367\377\371\371\370\377\370\370\367\377\370\367\366\377\236"
++  "\236\236\377\206\0\0\0\377\30VWG\377\252\255\215\377\256\260\217\377"
++  "\255\260\217\377oq\\\377\15\15\13\3779.'\377\214\214p\377\245\247\207"
++  "\377\251\254\212\377\250\253\211\377\247\252\210\377\246\252\207\377"
++  "\246\251\207\377\245\250\206\377\244\247\205\377\244\247\204\377\243"
++  "\246\203\377\217\221s\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215"
++  "\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237"
++  "\377+\0\0\0\377\377\377\377\377\374\374\373\377\373\373\373\377\372\372"
++  "\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367\366\365"
++  "\377\370\367\366\377\367\366\365\377\366\366\364\377\364\363\362\377"
++  "\336\335\334\377\323\322\320\377\267\267\265\377\237\236\235\377poo\377"
++  "ebZ\377\0\0\0\377\242\244\206\377op[\377\24\24\21\377E\77\77\377\347"
++  "\254\243\377\302[K\377,\30\23\377\201\204i\377\250\253\211\377\247\252"
++  "\210\377\246\251\207\377\245\250\206\377\245\250\205\377\244\247\205"
++  "\377\243\246\204\377\242\246\203\377\242\245\202\377\216\220q\377\0\0"
++  "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12"
++  "\0\0\0\377\323\324\300\377\210\274\276\237\377,\273\275\236\377\0\0\0"
++  "\377\377\377\377\377\372\372\371\377\371\371\370\377\370\370\367\377"
++  "\370\367\366\377\367\366\365\377\366\366\364\377\365\364\363\377\366"
++  "\366\364\377\365\364\363\377\364\363\362\377\362\362\360\377\344\344"
++  "\342\377\332\331\327\377\330\330\326\377\315\314\312\377\257\256\254"
++  "\377\210\204{\377\0\0\0\377\21\21\14\377D@5\377\350\332\260\377\240\231"
++  "\223\377\235NB\377n#\26\377\40\17\12\377or[\377\246\251\207\377\246\251"
++  "\206\377\245\250\206\377\244\247\205\377\243\247\204\377\243\246\203"
++  "\377\242\245\202\377\241\245\202\377\241\244\201\377\215\220p\377\0\0"
++  "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12"
++  "\0\0\0\377\323\324\300\377\207\274\276\237\377-\273\275\236\377\272\274"
++  "\235\377\0\0\0\377\377\377\377\377\370\370\367\377\370\367\366\377\367"
++  "\366\365\377\366\366\364\377\365\364\363\377\364\363\362\377\363\363"
++  "\361\377\364\363\362\377\363\363\361\377\362\362\360\377\357\357\355"
++  "\377\356\355\353\377\355\354\352\377\351\350\346\377\325\324\323\377"
++  "\275\274\273\377\21\17\15\377,*#\377\360\337\253\377\320\264f\377\272"
++  "\214,\377x_2\3774\30\23\377\31\26\22\377\202\205j\377\242\245\203\377"
++  "\245\250\206\377\245\250\205\377\244\247\204\377\243\246\204\377\242"
++  "\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377\237\243"
++  "\200\377\214\217p\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0"
++  "\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\205\274\276\237\377"
++  "\202\273\275\236\377\6\272\274\235\377\271\273\234\377\0\0\0\377\377"
++  "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377%\363"
++  "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361"
++  "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\352\351\347"
++  "\377\332\326\315\377\26\25\21\377-,&\377\362\342\262\377\320\264e\377"
++  "\270\211+\377\244q\24\377O4\6\377\33\27\15\377su]\377\234\237\177\377"
++  "\244\247\204\377\243\246\204\377\244\247\205\377\243\247\204\377\243"
++  "\246\203\377\242\245\202\377\241\245\202\377\240\244\201\377\240\243"
++  "\200\377\237\242\177\377\236\242~\377\213\216o\377\0\0\0\377\0\0\0I\0"
++  "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324"
++  "\300\377\204\274\276\237\3770\273\275\236\377\272\274\235\377\272\274"
++  "\234\377\271\273\234\377\270\272\233\377\0\0\0\377\377\377\377\377\364"
++  "\363\362\377\363\362\361\377\362\362\360\377\360\360\356\377\357\357"
++  "\355\377\361\360\356\377\360\357\355\377\361\360\356\377\360\357\355"
++  "\377\357\356\354\377\354\353\351\377\305\303\274\377\25\24\16\377-,&"
++  "\377\362\343\263\377\320\265g\377\271\215/\377\247r\26\377Z=\11\377\33"
++  "\25\7\377[]J\377\233\236~\377\242\245\203\377\243\246\204\377\242\246"
++  "\203\377\244\247\204\377\243\246\204\377\242\246\203\377\242\245\202"
++  "\377\241\244\201\377\240\243\200\377\237\243\200\377\237\242\177\377"
++  "\236\241~\377\235\241}\377\211\215m\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0"
++  "\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377"
++  "\202\274\276\237\3772\273\275\236\377\273\275\235\377\272\274\235\377"
++  "\271\273\234\377\270\273\233\377\270\272\232\377\267\271\231\377\0\0"
++  "\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377"
++  "\360\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361"
++  "\360\356\377\360\357\355\377\351\350\346\377<8/\377+(\36\377\360\337"
++  "\247\377\320\264h\377\276\2202\377\260|\33\377`A\13\377\30\20\1\377="
++  ">1\377\225\230z\377\242\245\203\377\243\247\204\377\243\246\203\377\244"
++  "\247\205\377\243\247\204\377\243\246\203\377\242\245\202\377\241\244"
++  "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377"
++  "\235\241}\377\235\240}\377\234\240|\377\210\214l\377\0\0\0\377\0\0\0"
++  "I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\323"
++  "\324\300\377\274\276\237\377\273\275\236\377\272\274\235\377\271\274"
++  "\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267\271\231"
++  "\377\266\270\230\377\0\0\0\377\377\377\377\377\360\360\356\377\202\357"
++  "\357\355\377\2\357\356\354\377\356\355\353\377\203\355\354\352\377!\347"
++  "\346\344\377NJB\377\256\247\240\377\315\265\221\377\305\236@\377\267"
++  "\202\36\377bD\16\377\36\27\7\377:84\377\0\0\0\377\214\216q\377\244\247"
++  "\205\377\243\246\204\377\242\246\203\377\244\247\204\377\243\246\203"
++  "\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243\200\377"
++  "\237\243\177\377\237\242\177\377\236\241~\377\235\241}\377\234\240|\377"
++  "\234\237{\377\233\237{\377\207\213k\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0"
++  "\13\0\0\0\2\215\0\0\0\0\21\0\0\0\1\0\0\0\12\0\0\0\377\322\323\300\377"
++  "\272\275\235\377\272\274\235\377\271\273\234\377\270\272\233\377\270"
++  "\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377\265\267"
++  "\227\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352\377\203"
++  "\354\353\351\377$\353\352\350\377\351\350\345\377\353\352\350\377\37"
++  "\37\37\377&$\40\377\220~i\377\232zU\377{`3\377\26\20\7\377DDC\377\270"
++  "\267\264\377\233\225\212\377\0\0\0\377\216\220s\377\243\246\203\377\244"
++  "\247\205\377\243\246\204\377\242\246\203\377\242\245\202\377\241\244"
++  "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377"
++  "\235\241}\377\235\240}\377\234\240|\377\233\237{\377\232\236z\377\232"
++  "\235y\377\207\212j\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0"
++  "\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\323\277\377\271\273\234\377"
++  "\271\273\233\377\270\272\233\377\267\271\232\377\266\271\231\377\266"
++  "\270\230\377\265\267\227\377\264\267\227\377\264\266\226\377\0\0\0\377"
++  "\377\377\377\377\353\352\350\377\202\351\350\346\377\1\350\347\345\377"
++  "\202\350\347\344\377\2\347\346\343\377\36\35\35\377\202\24\24\24\377"
++  "\37\26\26\23\377\"!\37\377LLJ\377\261\260\255\377\322\321\315\377\331"
++  "\330\324\377\237\231\216\377\0\0\0\377\217\222t\377\244\247\204\377\243"
++  "\246\203\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243"
++  "\200\377\237\243\177\377\236\242\177\377\236\241~\377\235\241}\377\234"
++  "\240|\377\234\237{\377\233\236{\377\232\236z\377\231\235y\377\231\234"
++  "x\377\206\211i\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0"
++  "\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\322\276\377\270\272\233\377\267"
++  "\272\232\377\267\271\231\377\266\270\230\377\265\270\230\377\265\267"
++  "\227\377\264\266\226\377\263\266\225\377\262\265\224\377\0\0\0\377\377"
++  "\377\377\377\347\346\343\377\203\346\345\342\377%\345\344\341\377\346"
++  "\344\341\377\345\344\340\377\340\336\333\377\320\317\313\377\302\302"
++  "\276\377\303\303\277\377\320\317\313\377\330\327\323\377\331\330\324"
++  "\377\330\326\322\377\331\327\323\377\237\231\215\377\0\0\0\377\216\221"
++  "s\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377"
++  "\237\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240|\377"
++  "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235x\377\230"
++  "\234x\377\227\233w\377\205\210h\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13"
++  "\0\0\0\2\215\0\0\0\0\30\0\0\0\1\0\0\0\12\0\0\0\377\320\321\275\377\267"
++  "\271\232\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267"
++  "\226\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223"
++  "\377\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343\342"
++  "\336\377\344\342\337\377\344\343\337\377\342\341\335\377\343\342\336"
++  "\377\342\341\335\377\340\337\333\377\203\333\332\326\377\35\332\330\324"
++  "\377\334\332\326\377\331\327\323\377\330\326\322\377\236\230\215\377"
++  "\0\0\0\377\215\220q\377\241\245\202\377\241\244\201\377\240\243\200\377"
++  "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377"
++  "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\231\234x\377\230"
++  "\234w\377\227\233v\377\226\232v\377\204\207g\377\0\0\0\377\0\0\0I\0\0"
++  "\0%\0\0\0\13\0\0\0\2\215\0\0\0\0""8\0\0\0\1\0\0\0\12\0\0\0\377\320\321"
++  "\275\377\266\270\230\377\265\270\230\377\264\267\227\377\264\266\226"
++  "\377\263\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377"
++  "\260\263\222\377\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334"
++  "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377"
++  "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340"
++  "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326"
++  "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\214\217p\377\240\243"
++  "\200\377\237\243\200\377\237\242\177\377\236\241~\377\235\241}\377\234"
++  "\240|\377\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235"
++  "x\377\230\234x\377\227\233w\377\227\233v\377\226\232u\377\225\231t\377"
++  "\202\206f\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\30"
++  "\0\0\0\1\0\0\0\12\0\0\0\377\317\320\274\377\265\267\227\377\264\266\226"
++  "\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377"
++  "\260\263\222\377\260\262\222\377\257\262\221\377\0\0\0\377\321\321\321"
++  "\377\341\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377"
++  "\340\337\333\377\336\335\331\377\340\336\332\377\336\335\331\377\340"
++  "\336\332\377\202\336\334\330\377\202\334\332\326\377\34\330\326\322\377"
++  "\327\326\321\377\325\323\316\377\233\225\212\377\0\0\0\377\213\216o\377"
++  "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377"
++  "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\230\234x\377\230"
++  "\234w\377\227\233v\377\226\232v\377\226\231u\377\225\231t\377\224\230"
++  "s\377\202\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0"
++  "\0\32\0\0\0\1\0\0\0\12\0\0\0\377\315\320\273\377\264\266\226\377\263"
++  "\265\225\377\262\265\224\377\261\264\223\377\261\263\223\377\260\263"
++  "\222\377\257\262\221\377\257\261\220\377\256\261\217\377\0\0\0\377\231"
++  "\230\221\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235"
++  "\221\377\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220"
++  "\377\242\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215"
++  "\377\202\235\227\214\377\21\233\226\212\377gcY\377\0\0\0\377\213\215"
++  "o\377\236\241~\377\235\241}\377\234\240|\377\234\237{\377\233\237{\377"
++  "\232\236z\377\231\235y\377\231\235x\377\230\234w\377\227\233w\377\227"
++  "\232v\377\226\232u\377\225\231t\377\202\224\230s\377\7\224\227s\377\202"
++  "\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\16\0\0"
++  "\0\2\0\0\0\14\0\0\0\377\315\317\271\377\263\265\225\377\262\264\224\377"
++  "\261\264\223\377\260\263\222\377\260\262\221\377\257\262\221\377\256"
++  "\261\220\377\255\260\217\377\255\257\216\377moY\377\222\0\0\0\377\17"
++  "WZF\377\216\221q\377\235\240}\377\234\240|\377\233\237{\377\233\236z"
++  "\377\232\235y\377\231\235y\377\230\234x\377\230\233w\377\227\233v\377"
++  "\226\232u\377\225\231u\377\225\231t\377\224\230s\377\203\224\227s\377"
++  "\6\202\205e\377\0\0\0\377\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0"
++  "\34\0\0\0\3\0\0\0\202\0\0\0\377\326\327\306\377\261\264\223\377\261\263"
++  "\223\377\260\263\222\377\257\262\221\377\256\261\220\377\256\260\217"
++  "\377\255\260\217\377\254\257\216\377\254\256\215\377\251\254\212\377"
++  "\240\242\202\377\225\230{\377\224\227y\377\222\225w\377\222\224v\377"
++  "\221\224v\377\221\223v\377\220\222u\377\217\222t\377\217\222s\377\216"
++  "\221r\377\215\220r\377\214\220q\377\214\217p\377\202\213\216o\377\16"
++  "\212\215o\377\212\214n\377\216\221q\377\227\232x\377\234\237{\377\233"
++  "\236{\377\232\236z\377\231\235y\377\231\234x\377\230\234w\377\227\233"
++  "w\377\226\232v\377\226\232u\377\225\231t\377\202\224\230s\377\204\224"
++  "\227s\377\6\202\205e\377\0\0\0\377\0\0\0\243\0\0\0,\0\0\0\20\0\0\0\3"
++  "\215\0\0\0\0\17\0\0\0\6\0\0\0\377v\204\234\377rr^\377\260\263\222\377"
++  "\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217\377\255"
++  "\257\216\377\254\257\215\377\253\256\215\377\252\255\214\377\252\255"
++  "\213\377\251\254\212\377\202\250\253\211\377\33\247\252\210\377\246\251"
++  "\207\377\245\250\206\377\245\250\205\377\244\247\205\377\243\246\204"
++  "\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\201\377"
++  "\240\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240}\377"
++  "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235y\377\230"
++  "\234x\377\230\233w\377\227\233v\377\226\232u\377\225\231u\377\225\231"
++  "t\377\224\230s\377\206\224\227s\377\7z}_\377\222\230\242\377\0\0\0\377"
++  "\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1\213\0\0\0\0\15\0\0\0\1\0\0\0\10\0"
++  "\0\0\377Ug\204\377v\204\234\377pr]\377\256\261\220\377\256\260\217\377"
++  "\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377\252"
++  "\255\213\377\202\251\254\212\377\34\250\253\211\377\247\252\210\377\246"
++  "\251\207\377\246\251\206\377\245\250\206\377\244\247\205\377\243\247"
++  "\204\377\243\246\203\377\242\245\202\377\241\245\202\377\241\244\201"
++  "\377\240\243\200\377\237\243\177\377\236\242~\377\236\241~\377\235\240"
++  "}\377\234\240|\377\233\237{\377\233\236z\377\232\236z\377\231\235y\377"
++  "\231\234x\377\230\234w\377\227\233v\377\226\232v\377\226\232u\377\225"
++  "\231t\377\224\230s\377\210\224\227s\377\7\266\276\312\377DRj\377\0\0"
++  "\0\377\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0\12"
++  "\0\0\0\377\202Ug\204\377\11v\204\234\377\213\215r\377\217\220u\377\227"
++  "\232|\377\226\231{\377\226\230{\377\226\230z\377\225\227y\377\224\226"
++  "x\377\202\223\226x\377\32\222\225w\377\221\224v\377\221\224u\377\220"
++  "\223t\377\220\222t\377\217\222s\377\217\221r\377\216\220q\377\215\220"
++  "p\377\214\220p\377\214\217p\377\213\216o\377\212\216n\377\212\215m\377"
++  "\211\214m\377\210\214l\377\207\213k\377\207\212j\377\207\212i\377\206"
++  "\211i\377\205\210i\377\205\210h\377\204\207g\377\203\207f\377\203\206"
++  "f\377\202\206e\377\210\202\205e\377\10\245\257\276\377Ug\204\377DRj\377"
++  "\0\0\0\377\0\0\0G\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0"
++  "\12\0\0\0\377\2036AU\377\1KUd\377\252\0\0\0\377\1\204\214\230\377\202"
++  "6AU\377\6+4D\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0"
++  "\3\0\0\0\1\0\0\0\10\0\0\0\211\204\0\0\0\377\4\0\0\0\253\0\0\0V\0\0\0"
++  "O\0\0\0K\244\0\0\0I\2\0\0\0K\0\0\0\243\204\0\0\0\377\5\0\0\0\247\0\0"
++  "\0=\0\0\0\36\0\0\0\10\0\0\0\1\214\0\0\0\0\12\0\0\0\5\0\0\0\23\0\0\0*"
++  "\0\0\0=\0\0\0F\0\0\0G\0\0\0A\0\0\0""6\0\0\0,\0\0\0&\244\0\0\0%\13\0\0"
++  "\0&\0\0\0,\0\0\0""6\0\0\0A\0\0\0G\0\0\0F\0\0\0=\0\0\0*\0\0\0\24\0\0\0"
++  "\5\0\0\0\1\214\0\0\0\0\4\0\0\0\2\0\0\0\11\0\0\0\23\0\0\0\36\202\0\0\0"
++  "#\4\0\0\0\37\0\0\0\27\0\0\0\20\0\0\0\14\244\0\0\0\13\4\0\0\0\14\0\0\0"
++  "\20\0\0\0\27\0\0\0\37\202\0\0\0#\4\0\0\0\36\0\0\0\24\0\0\0\11\0\0\0\2"
++  "\216\0\0\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\12\3\0\0\0\11\0\0\0"
++  "\6\0\0\0\3\246\0\0\0\2\3\0\0\0\3\0\0\0\6\0\0\0\11\202\0\0\0\12\3\0\0"
++  "\0\10\0\0\0\6\0\0\0\2\221\0\0\0\0\205\0\0\0\1\251\0\0\0\0\205\0\0\0\1"
++  "\315\0\0\0\0"};
++
++
++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
++
++static const guint8 stock_home_48[] = 
++{ ""
++  /* Pixbuf magic (0x47646b50) */
++  "GdkP"
++  /* length: header (24) + pixel_data (6699) */
++  "\0\0\32C"
++  /* pixdata_type (0x2010002) */
++  "\2\1\0\2"
++  /* rowstride (280) */
++  "\0\0\1\30"
++  /* width (70) */
++  "\0\0\0F"
++  /* height (45) */
++  "\0\0\0-"
++  /* pixel_data: */
++  "\217\0\0\0\0\17\27\30\24A\40!\35|&&#\377$%!\377\"#\37\377!\"\36\377\37"
++  "\40\34\377\35\36\32\377\34\35\32\377\33\34\30\377\31\32\26\377\30\31"
++  "\25\377\27\30\24\374\27\30\24\255\27\30\24$\267\0\0\0\0\2\27\30\24\341"
++  "\330\331\323\377\212\365\365\360\377\3\361\362\354\377{|u\377\27\30\24"
++  "\227\267\0\0\0\0\3\27\30\24\345\353\353\345\377\361\362\353\377\211\345"
++  "\346\330\377\4\356\357\346\377\347\347\341\377\32\33\27\352\27\30\24"
++  "\4\266\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\212\336"
++  "\337\316\377\3\354\355\343\377qql\377\27\30\24N\266\0\0\0\0\3\27\30\24"
++  "\345\353\353\345\377\354\354\342\377\212\336\337\316\377\3\340\341\321"
++  "\377\324\325\317\377/0+\377\230\27\30\24\377\2\27\30\24\376\27\30\24"
++  "k\234\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\213\336"
++  "\337\316\377\2\346\347\332\377\364\364\357\377\227\365\365\360\377\4"
++  "\364\364\357\377\325\326\310\377\40!\34\377\27\30\24\25\233\0\0\0\0\3"
++  "\27\30\24\345\353\353\345\377\354\354\342\377\214\336\337\316\377\1\343"
++  "\344\325\377\227\347\350\333\377\4\343\344\325\377\336\337\316\377+,"
++  "'\377\27\30\24\32\233\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354"
++  "\342\377\246\336\337\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\6\27\30"
++  "\24\345\353\353\345\377\354\354\342\377\335\336\315\377\331\332\312\377"
++  "\324\325\305\377\212\323\324\305\377\212\323\324\304\377\1\322\323\303"
++  "\377\212\321\322\302\377\2\322\323\303\377\331\332\312\377\202\336\337"
++  "\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\13\27\30\24\345\353\353\345"
++  "\377\354\354\342\377\333\334\313\377\310\311\272\377\233\234\220\377"
++  "\213\214\206\377\214\214\210\377\215\215\210\377\215\216\210\377\216"
++  "\216\211\377\202\216\216\212\377\11\216\216\213\377\216\217\213\377\217"
++  "\220\213\377\220\220\214\377\220\221\214\377\221\221\214\377\221\221"
++  "\215\377\221\222\216\377\222\222\216\377\202\223\223\217\377\202\224"
++  "\224\220\377\2\224\224\221\377\224\225\221\377\202\224\224\221\377\1"
++  "\224\224\220\377\202\223\224\220\377\202\223\223\220\377\10\222\222\217"
++  "\377\221\221\216\377\202\202z\377\303\304\265\377\335\336\315\377\336"
++  "\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345"
++  "\377\354\354\342\377\332\333\312\377\266\267\251\377\234\234\231\377"
++  "\225\377\377\377\377\20\375\375\375\377\373\373\373\377\371\371\371\377"
++  "\367\367\367\377\366\366\366\377\364\364\364\377\362\362\362\377\360"
++  "\360\360\377\356\356\356\377\354\354\354\377\307\307\307\377\233\234"
++  "\221\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0"
++  "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260"
++  "\261\244\377\273\273\272\377\224\377\377\377\377\21\376\376\376\377\374"
++  "\374\374\377\372\372\372\377\370\370\370\377\366\366\366\377\364\364"
++  "\364\377\363\363\363\377\361\361\361\377\357\357\357\377\355\355\355"
++  "\377\353\353\353\377\343\343\343\377\210\210\177\377\333\334\313\377"
++  "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353"
++  "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272"
++  "\377\223\377\377\377\377\22\376\376\376\377\374\374\374\377\372\372\372"
++  "\377\370\370\370\377\366\366\366\377\364\364\364\377\363\363\363\377"
++  "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351"
++  "\351\351\377\341\341\341\377\210\210\177\377\333\334\313\377\336\337"
++  "\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345\377"
++  "\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\222"
++  "\377\377\377\377\23\376\376\376\377\374\374\374\377\372\372\372\377\370"
++  "\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377\361\361"
++  "\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351\351\351"
++  "\377\350\350\350\377\340\340\340\377\210\210\177\377\333\334\313\377"
++  "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353"
++  "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272"
++  "\377\221\377\377\377\377\24\376\376\376\377\374\374\374\377\372\372\372"
++  "\377\370\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377"
++  "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351"
++  "\351\351\377\350\350\350\377\346\346\346\377\336\336\336\377\210\210"
++  "\177\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0"
++  "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260"
++  "\261\244\377\273\273\272\377\221\377\377\377\377\24\375\375\375\377\373"
++  "\373\373\377\371\371\371\377\367\367\367\377\365\365\365\377\363\363"
++  "\363\377\362\362\362\377\360\360\360\377\356\356\356\377\354\354\354"
++  "\377\352\352\352\377\350\350\350\377\346\346\346\377\344\344\344\377"
++  "\334\334\334\377\207\207~\377\332\333\312\377\334\335\314\377+,&\377"
++  "\27\30\24\32\226\0\0\0\0\205\0\0\0\1\6\27\30\24\346\353\353\345\377\354"
++  "\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\220\377"
++  "\377\377\377\26\375\375\375\377\373\373\373\377\371\371\371\377\367\367"
++  "\367\377\365\365\365\377\363\363\363\377\362\362\362\377\360\360\360"
++  "\377\356\356\356\377\354\354\354\377\352\352\352\377\350\350\350\377"
++  "\346\346\346\377\344\344\344\377\342\342\342\377\332\332\332\377\205"
++  "\206~\377\330\331\311\377\333\334\313\377+,&\377\26\27\23\32\0\0\0\1"
++  "\223\0\0\0\0\202\0\0\0\1\2\25\26\22\12\26\27\23\32\203\25\26\23\33\6"
++  "\27\30\24\351\326\326\320\377\327\327\315\377\306\307\270\377\241\242"
++  "\226\377\253\253\251\377\217\350\350\347\377\26\346\346\346\377\344\344"
++  "\344\377\342\342\342\377\341\341\340\377\340\340\337\377\336\336\336"
++  "\377\334\334\334\377\332\332\332\377\330\331\330\377\327\327\326\377"
++  "\325\325\325\377\323\323\323\377\322\322\322\377\320\320\320\377\317"
++  "\317\316\377\315\315\314\377\306\306\305\377zzs\377\304\305\266\377\306"
++  "\307\270\377()$\377\26\27\23""2\203\26\27\23\32\1\0\0\0\1\217\0\0\0\0"
++  "\202\0\0\0\1\2\25\26\22\30\27\30\24\324\227-.(\377\203-.'\377\204,.'"
++  "\377\210,-'\377\204+-&\377\207+,&\377\3$&\40\377\27\30\24\371\26\27\23"
++  "#\215\0\0\0\0\202\0\0\0\1\3\0\0\0\3\26\27\24h]_R\377\221\305\307\264"
++  "\377\10\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377"
++  "\302\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202"
++  "\300\302\260\377\12\277\302\257\377\276\301\257\377\276\300\256\377\275"
++  "\300\256\377\275\277\256\377\275\277\255\377\274\276\255\377\273\276"
++  "\254\377\273\275\254\377\272\275\253\377\202\271\274\253\377\16\271\273"
++  "\252\377\270\273\251\377\267\272\251\377\267\271\251\377\266\271\250"
++  "\377\266\271\247\377\265\270\247\377\265\267\247\377\264\267\246\377"
++  "\263\266\246\377\217\223|\377()\"\377\27\27\24F\0\0\0\1\213\0\0\0\0\202"
++  "\0\0\0\1\4\0\0\0\3\0\0\0\4\25\26\22""4DF;\377\217\305\307\264\377\10"
++  "\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377\302"
++  "\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202\300"
++  "\302\260\377\5\277\302\257\377\276\301\257\377\276\300\256\377\275\300"
++  "\256\377\275\277\256\377\202\274\276\255\377\12\273\276\255\377\272\275"
++  "\253\377\272\274\253\377\270\273\252\377\267\272\251\377\267\272\250"
++  "\377\266\271\247\377\266\270\247\377\264\267\246\377\263\266\245\377"
++  "\202\262\265\244\377\12\261\264\242\377\260\263\242\377\257\262\241\377"
++  "\255\260\236\377\223\227\201\377\201\205n\376\31\33\27\377\24\25\22\35"
++  "\0\0\0\2\0\0\0\1\212\0\0\0\0\12\0\0\0\1\0\0\0\3\0\0\0\4\0\0\0\7\7\7\6"
++  "\15\37!\33\366\301\303\257\377\305\307\264\377\304\307\263\377\255\260"
++  "\225\377\202\252\256\222\377\202\252\255\221\377\1\251\255\221\377\202"
++  "\251\255\220\377\202\251\254\220\377*\247\253\217\377\246\252\216\377"
++  "\245\251\215\377\245\251\214\377\244\250\213\377\242\246\212\377\241"
++  "\245\211\377\240\244\207\377\237\243\207\377\235\241\206\377\235\241"
++  "\204\377\234\240\204\377\233\237\203\377\232\236\202\377\230\234\201"
++  "\377\227\233\200\377\227\233\177\377\225\231~\377\224\230~\377\223\227"
++  "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377"
++  "\216\222x\377\215\221w\377\214\220v\377\213\217v\377\212\216u\377\212"
++  "\216t\377\211\215t\377\210\214s\377\207\213r\377\206\212q\377\205\211"
++  "q\377ejY\377\27\30\24\346\0\0\0\6\0\0\0\4\0\0\0\2\0\0\0\1\210\0\0\0\0"
++  "\12\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\11\0\0\0\14\27\27\24\306\251"
++  "\253\230\377\305\307\264\377\303\305\261\377\207\244\250\212\377,\243"
++  "\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240\244"
++  "\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204"
++  "\377\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377"
++  "\230\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231"
++  "~\377\224\230}\377\223\227|\377\222\226|\377\222\226{\377\221\225z\377"
++  "\220\224z\377\217\223y\377\216\222x\377\216\222w\377\215\221w\377\214"
++  "\220v\377\213\217u\377\212\216u\377\211\215t\377\211\215s\377\210\214"
++  "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377"
++  "MSH\377\27\30\24\266\0\0\0\11\0\0\0\6\0\0\0\4\202\0\0\0\1\206\0\0\0\0"
++  "\202\0\0\0\1\11\0\0\0\4\0\0\0\6\0\0\0\11\0\0\0\15\0\0\0\21\26\27\23\223"
++  "\207\211x\377\305\307\264\377\304\307\264\377\205\244\250\212\377\10"
++  "\243\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240"
++  "\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\202\234"
++  "\240\203\377\4\233\237\202\377\232\236\201\377\231\235\201\377\230\234"
++  "\200\377\202\227\233\177\377\17\226\232~\377\225\231}\377\224\230|\377"
++  "\223\227|\377\222\226{\377\222\226z\377\221\225z\377\220\224y\377\217"
++  "\223x\377\216\222x\377\216\222w\377\215\221v\377\214\220v\377\213\217"
++  "u\377\212\216t\377\202\211\215s\377\4\210\214r\377\207\213q\377\206\212"
++  "q\377\205\211p\377\202\204\210o\377\11\203\207n\377\200\205l\3778\77"
++  "7\377\26\26\23\210\0\0\0\16\0\0\0\11\0\0\0\5\0\0\0\3\0\0\0\1\206\0\0"
++  "\0\0\11\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\14\0\0\0\21\0\0\0\25\23"
++  "\24\20f`cU\377\202\305\307\264\377\1\246\252\215\377\202\244\250\212"
++  "\3773\243\247\211\377\242\246\211\377\241\245\210\377\241\245\207\377"
++  "\240\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234"
++  "\240\204\377\233\237\203\377\233\237\202\377\232\236\202\377\231\235"
++  "\201\377\232\236\202\377\234\240\205\377\232\236\204\377\226\232~\377"
++  "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220"
++  "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220"
++  "v\377\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377"
++  "\207\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203"
++  "\207o\377\202\206n\377\201\205m\377\200\204m\377ryf\377(,(\377\23\24"
++  "\20]\0\0\0\22\0\0\0\15\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\205\0\0\0\0A"
++  "\0\0\0\1\0\0\0\4\0\0\0\6\0\0\0\12\0\0\0\21\0\0\0\25\0\0\0\33\14\15\13"
++  "868/\377\304\307\264\377\305\307\264\377\251\254\220\377\243\247\211"
++  "\377\242\246\211\377\241\245\210\377\241\245\207\377\240\244\206\377"
++  "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233"
++  "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234"
++  "\200\377\227\233\177\377\247\253\224\377\311\313\275\377\301\303\263"
++  "\377\224\230}\377\223\227|\377\222\226|\377\244\247\222\377\223\227}"
++  "\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377"
++  "\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377\207"
++  "\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203\207"
++  "o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203k\377"
++  "aj]\376\31\33\27\377\14\14\12""3\0\0\0\32\0\0\0\22\0\0\0\13\0\0\0\7\0"
++  "\0\0\4\0\0\0\1\204\0\0\0\0\202\0\0\0\1A\0\0\0\4\0\0\0\10\0\0\0\15\0\0"
++  "\0\22\0\0\0\33\0\0\0\40\0\0\0(\32\32\26\352\274\276\251\377\304\307\264"
++  "\377\251\255\222\377\241\245\210\377\241\245\207\377\240\244\206\377"
++  "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233"
++  "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234"
++  "\200\377\227\233\177\377\226\232\177\377\226\232~\377\241\245\214\377"
++  "\310\312\274\377\305\307\270\377\230\234\202\377\254\257\234\377\300"
++  "\303\264\377\306\310\272\377\305\307\271\377\262\265\243\377\232\235"
++  "\206\377\214\220v\377\213\217v\377\212\216u\377\212\216t\377\211\215"
++  "t\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\205\211p\377"
++  "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177"
++  "\203l\377\177\203k\377~\202j\377{\200i\377LWO\377\27\30\24\352\0\0\0"
++  "(\0\0\0\37\0\0\0\31\0\0\0\17\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\203\0\0"
++  "\0\0\37\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\17\0\0\0\25\0\0\0\34\0"
++  "\0\0(\0\0\0/\25\26\22\301\234\237\215\377\303\305\262\377\251\255\222"
++  "\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377"
++  "\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230"
++  "\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231~\377"
++  "\224\230}\377\223\227|\377\232\236\206\377\307\311\273\377\306\311\273"
++  "\377\202\305\310\272\377\2\305\307\272\377\305\307\271\377\202\304\306"
++  "\271\377\21\303\305\270\377\267\271\252\377\235\241\214\377\212\216u"
++  "\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377"
++  "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177"
++  "\203l\377\177\203k\377~\202k\377\202|\200i\377\13ovd\377BKD\377\25\26"
++  "\22\304\0\0\0""1\0\0\0(\0\0\0\34\0\0\0\24\0\0\0\12\0\0\0\6\0\0\0\3\0"
++  "\0\0\1\203\0\0\0\0\16\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\11\0\0\0\21\0\0\0"
++  "\30\0\0\0\37\0\0\0,\0\0\0:\22\23\20\232y{l\377\302\304\262\377\252\255"
++  "\224\377\235\241\204\377\202\234\240\203\377\4\233\237\202\377\232\236"
++  "\201\377\231\235\201\377\230\234\200\377\202\227\233\177\377\13\226\232"
++  "~\377\225\231}\377\224\230|\377\223\227|\377\225\231\177\377\253\256"
++  "\231\377\301\303\264\377\306\310\272\377\305\310\272\377\305\307\272"
++  "\377\305\307\271\377\202\304\306\271\377\202\303\305\270\377\203\302"
++  "\304\267\377\3\274\276\257\377\243\246\223\377\212\216v\377\202\204\210"
++  "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k"
++  "\377\177\203j\377~\202j\377\204|\200i\377\13bl^\3776>7\377\22\23\20\242"
++  "\0\0\0;\0\0\0""0\0\0\0\40\0\0\0\30\0\0\0\14\0\0\0\7\0\0\0\3\0\0\0\1\203"
++  "\0\0\0\0\36\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\12\0\0\0\21\0\0\0\30\0\0\0"
++  "!\0\0\0""1\0\0\0\77\14\15\13{PRG\377\300\303\260\377\252\256\226\377"
++  "\233\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230"
++  "\234\200\377\227\233\177\377\226\232\177\377\226\232~\377\225\231}\377"
++  "\224\230}\377\223\227|\377\231\235\204\377\260\263\240\377\304\306\270"
++  "\377\306\310\272\377\305\310\272\377\305\307\272\377\202\304\306\271"
++  "\377\1\303\305\271\377\202\303\305\270\377\4\302\304\270\377\302\304"
++  "\267\377\301\303\267\377\301\303\266\377\202\300\302\266\377\11\276\300"
++  "\263\377\270\272\254\377\241\244\222\377\207\213t\377\200\204m\377\177"
++  "\203l\377\177\203k\377~\202j\377}\201j\377\205|\200i\377\14z\177h\377"
++  "WcZ\377','\377\15\16\14\204\0\0\0K\0\0\0""6\0\0\0#\0\0\0\31\0\0\0\16"
++  "\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\33\0\0\0\2\0\0\0\5\0\0\0\12\0\0"
++  "\0\21\0\0\0\31\0\0\0$\0\0\0""1\0\0\0F\3\3\3^()#\376\276\300\256\377\254"
++  "\257\227\377\232\236\202\377\231\235\201\377\230\234\200\377\227\233"
++  "\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223\227"
++  "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377"
++  "\274\276\257\377\202\304\306\271\377\1\303\305\271\377\202\303\305\270"
++  "\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303\266\377"
++  "\202\300\302\266\377\11\300\302\265\377\277\301\265\377\256\261\241\377"
++  "\201\205m\377\200\204m\377\177\203l\377\177\203k\377~\202j\377}\201j"
++  "\377\207|\200i\377\14ovd\377S`X\377\31\33\27\377\5\5\4s\0\0\0R\0\0\0"
++  ">\0\0\0'\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\34\0"
++  "\0\0\1\0\0\0\4\0\0\0\11\0\0\0\21\0\0\0\30\0\0\0$\0\0\0""3\0\0\0E\0\0"
++  "\0_\25\26\22\345\255\257\235\377\255\260\232\377\230\234\200\377\227"
++  "\233\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223"
++  "\227|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223"
++  "x\377\216\222x\377\215\221w\377\263\265\244\377\303\305\271\377\202\303"
++  "\305\270\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303"
++  "\266\377\202\300\302\266\377\1\300\302\265\377\202\277\301\265\377\6"
++  "\276\300\264\377\245\250\230\377\177\203l\377\177\203k\377~\202j\377"
++  "}\201j\377\211|\200i\377\13bl^\377JVO\377\26\27\23\360\0\0\0d\0\0\0\\"
++  "\0\0\0A\0\0\0)\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\205\0\0\0\0!\0\0\0"
++  "\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\27\0\0\0\"\0\0\0""2\0\0\0D\0\0\0\\"
++  "\22\23\20\304\214\216~\377\256\261\233\377\226\232\177\377\225\231~\377"
++  "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220"
++  "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220"
++  "v\377\213\217v\377\252\255\232\377\303\305\270\377\302\304\270\377\220"
++  "\224|\377\207\213r\377\206\212r\377\220\224~\377\202\300\302\266\377"
++  "\202\277\301\265\377\202\276\300\264\377\3\276\300\263\377\235\240\216"
++  "\377~\202k\377\213|\200i\377\14z\177h\377WcZ\377BKD\377\23\24\21\327"
++  "\0\0\0i\0\0\0Z\0\0\0A\0\0\0*\0\0\0\33\0\0\0\16\0\0\0\7\0\0\0\2\206\0"
++  "\0\0\0\21\0\0\0\2\0\0\0\6\0\0\0\16\0\0\0\25\0\0\0\37\0\0\0/\0\0\0A\0"
++  "\0\0Z\16\17\14\246ik]\377\257\262\235\377\224\230}\377\224\230|\377\223"
++  "\227{\377\222\226z\377\221\225z\377\220\224y\377\202\217\223x\377\17"
++  "\216\222w\377\215\221v\377\214\220v\377\213\217u\377\212\216t\377\212"
++  "\216s\377\241\244\220\377\302\304\267\377\301\303\266\377\224\227\201"
++  "\377\205\211p\377\205\211o\377\216\221z\377\277\301\265\377\277\301\264"
++  "\377\203\276\300\263\377\202\275\277\262\377\1\223\226\203\377\214|\200"
++  "i\377\14nuc\377VbY\3776>7\377\20\20\15\275\0\0\0r\0\0\0V\0\0\0\77\0\0"
++  "\0&\0\0\0\32\0\0\0\15\0\0\0\6\0\0\0\1\206\0\0\0\0\32\0\0\0\1\0\0\0\5"
++  "\0\0\0\13\0\0\0\23\0\0\0\36\0\0\0,\0\0\0=\0\0\0U\10\10\7\207AB9\377\260"
++  "\263\237\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217"
++  "\223y\377\216\222x\377\215\221w\377\214\220v\377\213\217v\377\213\217"
++  "u\377\212\216t\377\211\215t\377\210\214s\377\207\213r\377\227\233\205"
++  "\377\202\300\302\266\377\5\227\232\205\377\203\207o\377\202\206n\377"
++  "\211\215w\377\276\300\264\377\202\275\277\263\377\1\275\277\262\377\203"
++  "\274\276\262\377\1\213\217{\377\214|\200i\377\14bk^\377VbY\377','\377"
++  "\13\13\11\243\0\0\0s\0\0\0S\0\0\0:\0\0\0$\0\0\0\30\0\0\0\13\0\0\0\3\0"
++  "\0\0\1\206\0\0\0\0\"\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\32\0\0\0"
++  "(\0\0\0""9\0\0\0N\1\1\1j\35\36\32\371\255\260\234\377\220\224z\377\217"
++  "\223y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377\213\217"
++  "u\377\212\216u\377\212\216t\377\211\215s\377\210\214s\377\207\213r\377"
++  "\206\212q\377\205\211q\377\215\220z\377\300\302\265\377\277\301\265\377"
++  "\233\236\212\377\201\205m\377\200\204l\377\207\212u\377\275\277\263\377"
++  "\275\277\262\377\205\274\276\262\377\1\204\207r\377\213|\200i\377\14"
++  "z~h\377WcZ\377S`X\377\31\34\30\377\4\4\4\210\0\0\0p\0\0\0O\0\0\0""5\0"
++  "\0\0\"\0\0\0\25\0\0\0\10\0\0\0\2\210\0\0\0\0\12\0\0\0\2\0\0\0\6\0\0\0"
++  "\16\0\0\0\27\0\0\0#\0\0\0""5\0\0\0H\0\0\0`\24\25\21\335\226\232\207\377"
++  "\202\216\222x\377\4\215\221w\377\214\220v\377\213\217v\377\212\216u\377"
++  "\202\211\215t\377\16\210\214s\377\207\213r\377\206\212q\377\205\211q"
++  "\377\204\210p\377\204\210o\377\203\207p\377\246\251\230\377\246\250\227"
++  "\377\221\225\201\377\177\203l\377\177\203k\377\201\205n\377\235\240\216"
++  "\377\206\234\237\215\377\1}\200j\377\213|\200i\377\14nuc\377VbY\377J"
++  "UN\377\26\27\23\362\0\0\0{\0\0\0e\0\0\0J\0\0\0""1\0\0\0\37\0\0\0\17\0"
++  "\0\0\7\0\0\0\2\210\0\0\0\0\35\0\0\0\1\0\0\0\4\0\0\0\13\0\0\0\22\0\0\0"
++  "\36\0\0\0-\0\0\0\77\0\0\0U\21\22\17\272y{m\377\215\221w\377\214\220v"
++  "\377\213\217v\377\212\216u\377\211\215t\377\211\215s\377\210\214s\377"
++  "\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377\203"
++  "\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203"
++  "k\377~\202k\377\225|\200i\377\14ak^\377VbY\377BKD\377\23\24\21\327\0"
++  "\0\0m\0\0\0Y\0\0\0B\0\0\0*\0\0\0\32\0\0\0\14\0\0\0\5\0\0\0\1\210\0\0"
++  "\0\0\22\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\20\0\0\0\30\0\0\0%\0\0\0""5\0\0"
++  "\0E\15\16\14\220Y[N\377\213\217v\377\212\216t\377\211\215s\377\210\214"
++  "s\377\210\214r\377\207\213q\377\206\212q\377\205\211p\377\202\204\210"
++  "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k"
++  "\377\177\203j\377~\202j\377\223|\200i\377\17z\177h\377x}g\377v{g\377"
++  "pvd\377VcZ\377VbY\3776>7\377\20\21\16\266\0\0\0]\0\0\0J\0\0\0""2\0\0"
++  "\0!\0\0\0\26\0\0\0\12\0\0\0\3\212\0\0\0\0\30\0\0\0\2\0\0\0\5\0\0\0\14"
++  "\0\0\0\22\0\0\0\35\0\0\0)\0\0\0""6\10\10\7Z13+\377\214\220x\377\210\214"
++  "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377"
++  "\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177"
++  "\203k\377~\202j\377}\201j\377\204|\200i\377\21z\177h\377x}g\377v{g\377"
++  "sye\377qxe\377ovd\377mtc\377krb\377hqa\377fo`\377dm_\377bk^\377_j]\377"
++  "]h\\\377[f\\\377Yd[\377VcZ\377\206VbY\377\11','\377\15\16\13\207\0\0"
++  "\0F\0\0\0""4\0\0\0%\0\0\0\32\0\0\0\16\0\0\0\7\0\0\0\2\212\0\0\0\0\34"
++  "\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\17\0\0\0\24\0\0\0\34\0\0\0&\0\0\0""1"
++  "\30\31\25\354hkX\377{\177h\377x|f\377uze\377rwc\377pvb\377lsa\377jq_"
++  "\377gn^\377el]\377bi[\377`hZ\377]eY\377ZdX\377XbW\377VaV\377T`V\377R"
++  "^U\377P]T\377\226P\\T\377\12MXQ\377\30\32\26\377\10\10\7M\0\0\0-\0\0"
++  "\0\"\0\0\0\32\0\0\0\21\0\0\0\12\0\0\0\3\0\0\0\1\213\0\0\0\0\11\0\0\0"
++  "\1\0\0\0\4\0\0\0\10\0\0\0\16\0\0\0\23\0\0\0\30\0\0\0\40\17\17\15N\26"
++  "\27\23\332\240\27\30\24\352\210\27\30\24\351\11\26\27\24\344\21\22\17"
++  "h\0\0\0!\0\0\0\36\0\0\0\30\0\0\0\20\0\0\0\11\0\0\0\5\0\0\0\1\215\0\0"
++  "\0\0\7\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\12\0\0\0\16\0\0\0\21\0\0\0\24\211"
++  "\0\0\0\25\234\0\0\0\24\202\0\0\0\23\205\0\0\0\22\5\0\0\0\16\0\0\0\14"
++  "\0\0\0\7\0\0\0\5\0\0\0\2\217\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0"
++  "\5\203\0\0\0\6\252\0\0\0\5\202\0\0\0\4\202\0\0\0\2\1\0\0\0\1\223\0\0"
++  "\0\0\216\0\0\0\1\254\0\0\0\0"};
++
++
++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
++
++static const guint8 stock_documents_48[] = 
++{ ""
++  /* Pixbuf magic (0x47646b50) */
++  "GdkP"
++  /* length: header (24) + pixel_data (3237) */
++  "\0\0\14\275"
++  /* pixdata_type (0x2010002) */
++  "\2\1\0\2"
++  /* rowstride (192) */
++  "\0\0\0\300"
++  /* width (48) */
++  "\0\0\0""0"
++  /* height (48) */
++  "\0\0\0""0"
++  /* pixel_data: */
++  "\377\0\0\0\0\377\0\0\0\0\363\0\0\0\0\1XXX\2\240\0\0\0\0\1\0\0\0Y\213"
++  "\0\0\0\377\7\0\0\0\366\0\0\0\362\16\16\16\377(((\377aaa\333\0\0\0\10"
++  "\0\0\0\1\235\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\210"
++  "\377\377\377\377\1\371\371\371\377\202\371\371\370\377\6\347\347\347"
++  "\377\344\344\344\377\315\315\315\377\37\37\37\344\0\0\0\24\0\0\0\2\234"
++  "\0\0\0\0\2\0\0\0\377\366\366\366\377\212\377\377\377\377\11\371\371\370"
++  "\377\357\357\356\377\257\257\256\377\351\351\351\377\377\377\377\377"
++  "\263\263\263\377888\375\0\0\0\16\0\0\0\2\233\0\0\0\0\1\0\0\0\377\202"
++  "\377\377\377\377\205yyy\377\2xxx\377yyy\377\202xxx\377\12\371\371\370"
++  "\377\356\356\356\377\244\244\243\377\360\360\360\377\377\377\377\377"
++  "\364\364\364\377\253\253\253\377\5\5\5\231\0\0\0\13\0\0\0\1\232\0\0\0"
++  "\0\1\0\0\0\377\205\377\377\377\377\11\376\376\376\377\375\375\375\377"
++  "\374\374\373\377\375\375\375\377\374\374\373\377\373\373\373\377\371"
++  "\371\370\377\362\362\362\377\236\236\236\377\204\0\0\0\377\3\0\0\0\330"
++  "\0\0\0\33\0\0\0\5\225\0\0\0\0\1\0\0\0Y\205\0\0\0\377\202\377\377\377"
++  "\377\1yyy\377\202xxx\377\202www\377\16vvv\377www\377vvv\377vvu\377\371"
++  "\371\370\377\364\364\364\377\324\324\323\377\271\267\266\377\203\203"
++  "\201\377\204\203\201\377jgc\377\0\0\0\343\0\0\0&\0\0\0\7\225\0\0\0\0"
++  "\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377\377\377\26\0"
++  "\0\0\377\377\377\377\377\376\376\376\377\375\375\375\377\374\374\373"
++  "\377\373\373\373\377\372\372\371\377\371\371\370\377\370\370\367\377"
++  "\371\371\370\377\370\370\367\377\370\367\366\377\371\371\370\377\363"
++  "\362\361\377\340\340\337\377\334\332\330\377\312\312\310\377\266\266"
++  "\264\377rpl\377\0\0\0\356\0\0\0)\0\0\0\10\225\0\0\0\0\2\0\0\0\377\366"
++  "\366\366\377\203\377\377\377\377\16\0\0\0\377\377\377\377\377\374\374"
++  "\373\377www\377vvv\377vvu\377uuu\377uut\377utt\377uut\377utt\377tts\377"
++  "\364\363\362\377\361\360\357\377\202\360\357\355\377\6\345\344\342\377"
++  "\304\303\300\377\201}t\377\0\0\0\377\0\0\0,\0\0\0\11\225\0\0\0\0\1\0"
++  "\0\0\377\202\377\377\377\377\202yyy\377\13\0\0\0\377\377\377\377\377"
++  "\372\372\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367"
++  "\366\365\377\366\366\364\377\365\364\363\377\366\366\364\377\365\364"
++  "\363\377\204\364\363\362\377\1\353\352\350\377\202\341\337\334\377\4"
++  "\213\206}\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\1\0\0\0Y\205\0\0"
++  "\0\377\204\377\377\377\377\7\0\0\0\377\377\377\377\377\370\370\367\377"
++  "uut\377utt\377tts\377tss\377\204ssr\377\2rrq\377qqp\377\202ppo\377\7"
++  "llk\377jih\377\341\337\334\377\244\236\223\377\0\0\0\377\0\0\0/\0\0\0"
++  "\11\220\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377"
++  "\377\377\1\0\0\0\377\202\377\377\377\377\6yyy\377xxx\377\0\0\0\377\377"
++  "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377\20\363"
++  "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361"
++  "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\347\346\343"
++  "\377\342\341\337\377\344\343\340\377\341\337\334\377\244\236\223\377"
++  "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\2\0\0\0\377\366\366\366\377\203"
++  "\377\377\377\377\12\0\0\0\377\377\377\377\377\376\376\376\377\375\375"
++  "\375\377\374\374\373\377\0\0\0\377\377\377\377\377\364\363\362\377sr"
++  "r\377rrq\377\202qqp\377\17rqp\377qqp\377rqp\377qqp\377qpo\377oon\377"
++  "nml\377llj\377lkj\377kji\377\341\337\334\377\244\236\223\377\0\0\0\377"
++  "\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\202\377\377\377\377\202yyy\377"
++  "\33\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0\0\0\377"
++  "\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\360"
++  "\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361\360"
++  "\356\377\360\357\355\377\357\356\354\377\354\353\351\377\350\347\345"
++  "\377\345\344\341\377\344\343\340\377\342\341\336\377\341\337\334\377"
++  "\244\236\223\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\204"
++  "\377\377\377\377\10\0\0\0\377\377\377\377\377\372\372\371\377\371\371"
++  "\370\377\370\370\367\377\0\0\0\377\377\377\377\377\360\360\356\377\202"
++  "\230\250\265\377\4\230\250\264\377\230\247\264\377\227\247\263\377\355"
++  "\354\352\377\202poo\377\13oon\377nml\377mmk\377kki\377kjh\377jjh\377"
++  "\340\337\333\377\241\234\220\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0"
++  "\0\1\0\0\0\377\202\377\377\377\377\21yyy\377xxx\377\0\0\0\377\377\377"
++  "\377\377\370\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\355"
++  "\355\353\377\227\247\263\377\276\274\307\377\355\337\261\377\227\246"
++  "\263\377\226\246\262\377\351\350\345\377\353\352\350\377\202\351\350"
++  "\345\377\12\345\344\341\377\346\344\341\377\343\342\336\377\337\336\332"
++  "\377\336\335\331\377\335\334\330\377\241\233\220\377\0\0\0\377\0\0\0"
++  "/\0\0\0\11\220\0\0\0\0\17\0\0\0\377\377\377\377\377\376\376\376\377\375"
++  "\375\375\377\374\374\373\377\0\0\0\377\377\377\377\377\366\365\364\377"
++  "\365\365\363\377\364\363\362\377\0\0\0\377\377\377\377\377\353\352\350"
++  "\377\225\245\261\377\274\272\305\377\202\353\336\257\377\17\225\244\261"
++  "\377\347\346\343\377nml\377mmk\377mlk\377lki\377kki\377jig\377ihf\377"
++  "hhf\377\334\333\327\377\241\233\220\377\0\0\0\377\0\0\0/\0\0\0\11\220"
++  "\0\0\0\0\40\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0"
++  "\0\0\377\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377"
++  "\377\377\377\347\346\343\377\224\243\260\377\273\271\304\377\352\335"
++  "\256\377\351\334\256\377\224\243\257\377\345\344\340\377\346\344\341"
++  "\377\345\344\340\377\344\343\337\377\342\341\335\377\340\337\333\377"
++  "\336\335\331\377\334\333\327\377\333\331\325\377\331\327\323\377\237"
++  "\231\215\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\16\0\0\0\377\377\377"
++  "\377\377\372\372\371\377\371\371\370\377\370\370\367\377\0\0\0\377\377"
++  "\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\0\0\0\377"
++  "\371\371\371\377\344\343\340\377\223\242\256\377\202\272\267\302\377"
++  "\5\272\270\302\377\222\241\255\377\343\342\336\377kjh\377kki\377\202"
++  "jjh\377\11ihf\377hgf\377hge\377ffd\377\330\326\322\377\236\230\215\377"
++  "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377\377\377\377\377\370"
++  "\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\360\360\356\377"
++  "\202qqp\377\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334"
++  "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377"
++  "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340"
++  "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326"
++  "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\0\0\0/\0\0\0\11\220"
++  "\0\0\0\0\25\0\0\0\377\377\377\377\377\366\365\364\377\365\365\363\377"
++  "\364\363\362\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352"
++  "\377\354\353\351\377\0\0\0\377\321\321\321\377\341\337\333\377\340\336"
++  "\332\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331"
++  "\377\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330"
++  "\377\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316"
++  "\377\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377"
++  "\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377\377\377"
++  "\377\353\352\350\377\202nnm\377\15\0\0\0\377\231\230\221\377\243\236"
++  "\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243\235\222"
++  "\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234\220\377"
++  "\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235\227\214"
++  "\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\10"
++  "\0\0\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360"
++  "\377\0\0\0\377\377\377\377\377\347\346\343\377\202\346\345\342\377\1"
++  "\221\220\216\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\220\0\0\0\0\3"
++  "\0\0\0\377\377\377\377\377\360\360\356\377\202\357\357\355\377\3\0\0"
++  "\0\377\371\371\371\377\344\343\340\377\202kki\377\6jig\377ba_\377YXV"
++  "\377WWU\377WVT\377WWU\377\202VVT\377\11\265\264\261\377\264\262\257\377"
++  "\263\261\256\377\261\257\254\377\260\256\253\377\200{s\377\0\0\0\377"
++  "\0\0\0U\0\0\0""6\202\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\220\0\0\0\0\33"
++  "\0\0\0\377\377\377\377\377\355\355\353\377poo\377oon\377\0\0\0\377\355"
++  "\355\355\377\341\340\335\377\341\337\334\377\341\340\334\377\340\337"
++  "\333\377\336\335\331\377\330\330\324\377\331\330\324\377\330\327\323"
++  "\377\331\330\324\377\327\326\322\377\330\326\322\377\325\323\317\377"
++  "\324\322\316\377\321\317\313\377\320\316\311\377\317\315\311\377\227"
++  "\221\206\377\0\0\0\377\0\0\0""6\0\0\0\22\202\0\0\0\11\2\0\0\0\10\0\0"
++  "\0\4\221\0\0\0\0\3\0\0\0\377\377\377\377\377\353\352\350\377\202\351"
++  "\350\346\377\13\0\0\0\377\321\321\321\377\341\337\333\377\340\336\332"
++  "\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331\377"
++  "\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330\377"
++  "\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316\377"
++  "\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\225\0\0\0\0\3\0\0\0\377\377"
++  "\377\377\377\347\346\343\377\202mlk\377\15\0\0\0\377\231\230\221\377"
++  "\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243"
++  "\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234"
++  "\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235"
++  "\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\225\0"
++  "\0\0\0\6\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343"
++  "\342\336\377\217\216\214\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\225"
++  "\0\0\0\0\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334\377"
++  "\341\340\334\377\334\333\327\377\315\314\311\377\273\272\266\377\267"
++  "\266\263\377\266\265\262\377\267\266\263\377\265\265\261\377\266\265"
++  "\261\377\264\262\257\377\263\261\256\377\261\257\254\377\260\256\252"
++  "\377\257\255\252\377\200{q\377\0\0\0\377\0\0\0U\0\0\0""6\202\0\0\0/\3"
++  "\0\0\0*\0\0\0\27\0\0\0\4\225\0\0\0\0\13\0\0\0\377\321\321\321\377\341"
++  "\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377\334\333"
++  "\327\377\327\326\322\377\330\326\322\377\326\325\321\377\330\326\322"
++  "\377\202\326\324\320\377\202\324\322\316\377\7\320\316\312\377\317\316"
++  "\311\377\315\313\306\377\225\217\205\377\0\0\0\377\0\0\0""6\0\0\0\22"
++  "\202\0\0\0\11\2\0\0\0\10\0\0\0\4\226\0\0\0\0\15\0\0\0\377\231\230\221"
++  "\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377"
++  "\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242"
++  "\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202"
++  "\235\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\232"
++  "\0\0\0\0\1\0\0\0^\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\232\0\0\0\0"
++  "\3\0\0\0\4\0\0\0\27\0\0\0*\220\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\233\0"
++  "\0\0\0\2\0\0\0\4\0\0\0\10\220\0\0\0\11\2\0\0\0\10\0\0\0\4\377\0\0\0\0"
++  "\377\0\0\0\0\345\0\0\0\0"};
++
++
--- gtk+2.0-2.11.6.orig/debian/control.in
+++ gtk+2.0-2.11.6/debian/control.in
@@ -0,0 +1,297 @@
+Source: gtk+@APIVER@
+Section: libs
+Priority: optional
+Maintainer: Sebastien Bacher <seb128@debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 5.0.22),
+               gettext,
+               pkg-config,
+               libglib2.0-dev (>= 2.13.5),
+               libpango1.0-dev (>= 1.17.3),
+               libatk1.0-dev (>= 1.9.0),
+               libx11-dev (>= 2:1.0.0-6),
+               libxext-dev,
+               libxi-dev,
+               libxrandr-dev,
+               libxt-dev,
+               libxrender-dev,
+               libxft-dev,
+               libxcursor-dev,
+               libxcomposite-dev,
+               libxdamage-dev,
+               libxkbfile-dev,
+               libxinerama-dev,
+               libxfixes-dev,
+               libcairo2-dev (>= 1.2.0),
+               libcairo-directfb2-dev (>= 1.2.4-4),
+               libtiff4-dev,
+               libjpeg62-dev,
+               libpng12-dev,
+               gnome-pkg-tools (>= 0.11),
+               chrpath,
+               dpkg-dev (>= 1.13.19),
+               x11proto-xext-dev,
+               libdirectfb-dev (>= 0.9.24),
+               libcupsys2-dev (>= 1.2),
+               quilt
+Build-Depends-Indep: gtk-doc-tools (>= 1.6),
+                     docbook-xml
+Standards-Version: 3.7.2
+
+Package: @SHARED_PKG@
+Section: libs
+Architecture: any
+Depends: @COMMON_PKG@ (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: @GTK_BINVER_DEP@
+Conflicts: libgtk2.0-0png3,
+           eog2 (<< 1.0.1-4),
+           gnome-panel2 (<< 2.0.4-1),
+           celestia (<< 1.2.4-4),
+           gimp1.3 (<< 1.3.7-1.1),
+           metatheme (<< 0.9.7-3),
+           libgnomeui-0 (<= 2.14.1-3),
+           gtk2.0-examples (<< 2.2.0),
+           libgdkxft0,
+           gtk2-engines-wonderland (<< 1.0-4),
+           gtk2-engines-cleanice (<< 2.4.0-1.1),
+           gtk2-engines-thinice (<< 2.6),
+           gtk2-engines-crux (<< 2.6),
+           gtk2-engines-mist (<< 2.6),
+           gtk2-engines-highcontrast (<< 2.6),
+           gtk2-engines-lighthouseblue (<< 2.6),
+           gnome-themes (<< 2.6),
+           gtk2-engines-industrial (<< 0.2.32-5),
+           gtk2-engines-pixbuf (<= 2.10),
+           gtk2-engines-redmond95 (<< 2.2.0-2.1),
+           gtk2-engines-metal (<< 2.2.0-2.1),
+           gtk2-engines-magicchicken (<< 1.1.1-7.1),
+           gtk2-engines-qtpixmap (<< 0.28-1.2),
+           gtk2-engines-smooth (<< 0.5.6-3),
+           gtk2-engines-ubuntulooks (<= 0.9.11-1),
+           gtk2-engines-xfce (<< 2.4.0-1),
+           tamil-gtk2im (<< 2.2-4.4),
+           imhangul (<< 0.9.13-5),
+           librsvg2-common (<= 2.14.4-2),
+           gtk2-engines (<< 1:2.8.2-2),
+           gtk2-engines-gtk-qt (<< 1:0.7-2),
+           iiimgcf (<= 11.4.1870-7.3),
+           scim-bridge (<= 0.2.4-1),
+           scim-gtk2-immodule (<< 1.4.4-8),
+           gtk-im-libthai (<< 0.1.4-3),
+           uim-gtk2.0 (<< 1:1.4.1-3),
+           libwmf-dev (<< 0.2.8.4-5),
+           libwmf0.2-7 (<< 0.2.8.4-5),
+           swf-player (<< 0.3.6-2.3),
+           gcin (<< 1.3.4-2),
+           gtk-qt-engine (<< 1:0.8~svn-rev36-1),
+           iiimf-client-gtk (<< 12.3.91-4),
+           libginspx0 (<< 20050529-1.1),
+           scim-bridge-client-gtk (<< 0.4.10-1.1),
+           iiimgcf (<= 11.4.1870-7)
+Replaces: libgtk2.0-0png3
+Recommends: hicolor-icon-theme,
+            ${misc:Depends},
+            @BIN_PKG@
+Description: The GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the shared libraries.
+
+Package: @DIRECTFB_PKG@
+Section: libs
+Architecture: any
+Depends: @SHARED_PKG@ (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libgtk+2.0-directfb0
+Description: The GTK+ graphical user interface library - DirectFB runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This version uses DirectFB, a thin library providing an integrated 
+ windowing system and hardware acceleration on top of the Linux 
+ framebuffer.
+
+Package: @UDEB_PKG@
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Provides: @GTK_BINVER_DEP@
+Description: The GTK+ graphical user interface library - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the minimal runtime library using DirectFB needed
+ by the Debian installer.
+
+Package: @COMMON_PKG@
+Section: misc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: @SHARED_PKG@
+Replaces: libgtk1.3-common,
+          libgtk2.0-data
+Conflicts: libgtk1.3-common,
+           libgtk2.0-data
+Description: Common files for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the common files which the libraries need.
+
+Package: @BIN_PKG@
+Section: misc
+Architecture: all
+Depends: ${misc:Depends},
+         @SHARED_PKG@ (>= ${source:Version})
+Replaces: libgtk2.0-common (<= 2.4.0-3),
+          libgtk2.0-dev (<= 2.4.3-1)
+Conflicts: libgtk2.0-dev (<= 2.4.3-1)
+Description: The programs for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the program files which is used for the libraries
+ and others.
+
+Package: @DEV_PKG@
+Section: libdevel
+Architecture: any
+Depends: @SHARED_PKG@ (= ${binary:Version}),
+         ${misc:Depends},
+         libglib2.0-dev (>= 2.12.0),
+         libpango1.0-dev (>= 1.10.0-2),
+         libatk1.0-dev (>= 1.6.1-2),
+         libcairo2-dev,
+         libx11-dev (>= 2:1.0.0-6),
+         libxext-dev,
+         libxinerama-dev,
+         libxi-dev,
+         libxrandr-dev,
+         libxcursor-dev,
+         libxfixes-dev,
+         libxcomposite-dev,
+         libxdamage-dev,
+         pkg-config
+Recommends: python (>= 2.4)
+Suggests: @DOC_PKG@
+Replaces: libgtk1.3-dev,
+          gtk2-engines-pixbuf (<< 2.8.18-5)
+Conflicts: libgtk1.3-dev
+Description: Development files for the GTK+ library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications.
+
+Package: @DIRECTFB_DEV_PKG@
+Section: libdevel
+Architecture: any
+Depends: @DIRECTFB_PKG@ (= ${binary:Version}),
+         ${misc:Depends},
+         @DEV_PKG@ (= ${binary:Version}),
+         libcairo-directfb2-dev,
+         libcairo2-dev (>= 1.2.0)
+Conflicts: libgtk+2.0-directfb-dev
+Description: Development files for the GTK+ library - DirectFB version
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications on top of the DirectFB
+ library.
+
+Package: @DEBUG_PKG@
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: @SHARED_PKG@ (= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: libgtk2.0-dbg
+Replaces: libgtk2.0-dbg
+Description: The GTK+ libraries and debugging symbols
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains detached debugging symbols.
+ .
+ Most people will not need this package.
+
+Package: @DOC_PKG@
+Section: doc
+Architecture: all
+Depends: lynx | www-browser,
+         ${misc:Depends}
+Replaces: libgtk1.3-doc
+Conflicts: libgtk1.3-doc
+Recommends: libglib2.0-doc,
+            libatk1.0-doc,
+            libpango1.0-doc
+Description: Documentation for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the HTML documentation for the GTK+ library
+ in /usr/share/doc/@DOC_PKG@/ .
+
+Package: @EXAMPLES_PKG@
+Section: x11
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         @SHARED_PKG@ (= ${binary:Version})
+Replaces: libgtk1.3-dev
+Description: Examples files for the GTK+ 2.0
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the examples files and a demonstration program
+ for the GTK+-2.0.
+
+Package: @PIXBUF_PKG@
+Section: graphics
+Priority: optional
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         @SHARED_PKG@ (= ${binary:Version})
+Suggests: gtk-engines-pixmap
+Conflicts: gtk2.0-engines-pixbuf
+Replaces: gtk2.0-engines-pixbuf
+Description: Pixbuf-based theme for GTK+ 2.x
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the pixbuf theme engine.
--- gtk+2.0-2.11.6.orig/debian/changelog
+++ gtk+2.0-2.11.6/debian/changelog
@@ -0,0 +1,1858 @@
+gtk+2.0 (2.11.6-1ubuntu4) gutsy; urgency=low
+
+  * debian/patches/081_from_bugzilla_fix_cups1.3_build.patch:
+    - change from GNOME #467414 to build with cups1.3 correctly
+  * debian/patches/090_from_fedora_better_tooltip_compat.patch:
+    - patch from fedora, improve the tooltip compatibility, 
+      make acroread start again
+  * debian/patches/091_workaround_no_gtk_init_incorrect_display.patch:
+    - workaround incorrect display issue for applications using gtk without
+      calling gtk_init correctly
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 31 Aug 2007 16:36:25 +0200
+
+gtk+2.0 (2.11.6-1ubuntu3) gutsy; urgency=low
+
+  * Update the patch series so the change is applied during the build
+
+ -- Sebastien Bacher <seb128@canonical.com>  Sun, 29 Jul 2007 15:14:17 +0200
+
+gtk+2.0 (2.11.6-1ubuntu2) gutsy; urgency=low
+
+  * debian/patches/080_from_svn_fix_dangling_tooltip.patch:
+    - patch from SVN, "fixes annoying dangling tooltips on systray icons."
+      (LP: #128781)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Sun, 29 Jul 2007 12:59:26 +0200
+
+gtk+2.0 (2.11.6-1ubuntu1) gutsy; urgency=low
+
+  * Sync with Debian
+  * debian/libgtk2.0-0.postinst.in:
+    - updated transition version
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 24 Jul 2007 12:52:18 +0200
+
+gtk+2.0 (2.11.6-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch
+    by Petr Salinger; closes: #431477.
+
+  [ Josselin Mouette ]
+  * Move manual pages of binaries in /usr/sbin to section 8.
+  * update-icon-caches: new script, updates the icon caches in a given
+    list of directories. It is meant to be used by packages shipping
+    icons, in the postinst/postrm.
+    For transition purposes, icon caches are currently updated but not
+    created if they don't already exist.
+  * Install this script and its manual page in libgtk2.0-bin.
+
+  [ Loic Minier ]
+  * Call dh_shlibdeps separately for the udeb and add a
+    -l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is
+    found.
+  * New upstream development release, with API additions.
+    - Bump up shlibs to >= 2.11.6.
+    - Refresh patches 006_proper-directfb-modules,
+      015_default-fallback-icon-theme, 040_filechooser_single-click to apply
+      cleanly.
+    - Update patches 009_gtk-export-filechooser, 033_treeview_resizing to
+      apply; update relibtoolizing patch, 070_mandatory-relibtoolize.
+  * 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@dooz.org>  Tue, 24 Jul 2007 10:43:23 +0200
+
+gtk+2.0 (2.11.5-1) experimental; urgency=low
+
+  * New upstream development release, with API additions; the new API may
+    still change incompatibly, especially the tooltips API.
+    - Bump shlibs to >= 2.11.5.
+    - Bump up libpango1.0-dev build-dep to >= 1.17.3.
+    - Ship the new gtk-builder-convert Python script to convert Glade files to
+      GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a
+      ${python:Depends} but Recommend python (>= 2.4) to avoid pulling python
+      on buildds; the script requires python >= 2.4, but this is not enforced
+      in the dependencies.
+    - Refresh patches 001_static-linking-dont-query-immodules,
+      006_proper-directfb-modules, 040_filechooser_single-click to apply
+      cleanly.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+  * Use -s instead of -a in arch-specific dh_* calls.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 03 Jul 2007 13:01:25 +0200
+
+gtk+2.0 (2.11.4-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * 040_filechooser_single-click.patch: fix the patch to apply cleanly
+    again, and enable it.
+
+  [ Loic Minier ]
+  * Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens;
+    closes: #386815.
+  * New upstream development release, with API additions; the new API may
+    still change incompatibly.
+    - Bump shlibs to >= 2.11.3.
+    - Refresh patches 006_proper-directfb-modules,
+      008_implicit_pointer_conversion_gdkgc_directfb,
+      009_gtk-export-filechooser, 030_gtkentry_password-char-circle,
+      033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs
+      to apply cleanly.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+  * Add a debian/dh_listmissing.pl script based on dh_install snippets but
+    customized to handle multiple source installation dirs which can report
+    files which were not installed to a package.
+  * New list-missing rule to list files which were not installed to a package
+    calling debian/dh_listmissing.pl.
+  * Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher.
+  * Ship etc/gtk-2.0/im-multipress.conf in the shared library.
+  * New upstream development release, with incompatible API changes; the new
+    API may still change incompatibly.
+    - Bump shlibs to >= 2.11.4.
+    - Refresh relibtoolizing patch, 070_mandatory-relibtoolize.
+    - Bump up libglib2.0-dev build-dep to >= 2.11.5.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 20 Jun 2007 10:47:42 +0200
+
+gtk+2.0 (2.11.2-1) experimental; urgency=low
+
+  * New upstream release series; these are development releases, the new API
+    may still change incompatibly.
+    - Target at experimental; include check-dist.
+    - Bump shlibs to >= 2.11.2.
+    - Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico,
+      009_gtk-export-filechooser, 015_default-fallback-icon-theme,
+      033_treeview_resizing, 041_ia32-libs to apply cleanly.
+    - Update patch 021_loader-files-d to apply with the upstream G_MODULE
+      changes and the support for included modules.
+    - Update patch 030_gtkentry_password-char-circle to apply.
+    - Drop patch 031_cursor-blinking-timeout, merged upstream.
+    - Disable 040_filechooser_single-click for now as it doesn't apply cleanly
+      and doesn't seem critical; add a description and cross-refs.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+    - Bump up build-deps to libglib2.0-dev >= 2.13.1, libpango1.0-dev >=
+      1.15.3, gtk-doc-tools >= 1.6.
+    - Build-dep on libxcomposite-dev for composite support.
+    - Build-dep on libxdamage-dev for damage support.
+    - Enable test print backend by passing --enable-test-print-backend to
+      configure.
+  * Update 007_implicit_pointer_conversion_gdkdrawable_directfb to include
+    cairo.h instead of defining the directfb feature manually.
+  * New patch, 006_proper-directfb-modules, fixes pkg-config modules included
+    to build directfb stuff, uncovered by the change in
+    007_implicit_pointer_conversion_gdkdrawable_directfb; refresh
+    relibtoolizing patch.
+  * Add cross-refs to patch headers.
+  * Clean up CFLAGS.
+  * Prepare passing -z defs via LDFLAGS in the future.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 13 Jun 2007 16:57:47 +0200
+
+gtk+2.0 (2.10.13-1) unstable; urgency=low
+
+  * Bump Conflicts to iiimf-client-gtk << 12.3.91-4.
+  * Upload to unstable; drop check-dist include.
+  * New upstream release; no API change.
+    - Drop patches 011_directfb-build-fixes-from-head,
+      013_gdkproperty-directfb-strdup, 032_filechooser-sizing,
+      090_capslock-numlock-im-thai merged upstream.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 13 Jun 2007 10:06:49 +0200
+
+gtk+2.0 (2.10.12-3) experimental; urgency=low
+
+  * Use printf instead of echo in dh_gtkmodules to write to write data to
+    files in complex_doit() calls as dash's echo will always honor escape
+    sequences.
+  * Conflict with gtk2-engines-ubuntulooks (<= 0.9.11-1).
+  * New patch, 009_gtk-export-filechooser, exports some filechooser API for
+    use in maemo / Hildon; from Nokia, taken from the Ubuntu package; update
+    patch 032_filechooser-sizing to apply cleanly; bump shlibs to 2.10.12-3;
+    update patch 070_mandatory-relibtoolize.
+  * Kill patch 025_dfb-window-destroy-leak from source tree as well now.
+  * Include check-dist to prevent accidental uploads to unstable.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 07 Jun 2007 00:13:00 +0200
+
+gtk+2.0 (2.10.12-2) unstable; urgency=low
+
+  [ Loic Minier ]
+  * New patch, 15_default-fallback-icon-theme, sets the default
+    gtk-fallback-icon-theme to "gnome"; closes: #421353.
+  * Also honor parallel=n in DEB_BUILD_OPTIONS.
+
+  [ Josselin Mouette ]
+  * 032_filechooser-sizing.patch: patch from Carlos Garnacho in bugzilla
+    #420285, committed in trunk. Fixes (among many other things) infinite
+    flickering with some window managers (closes: #420021).
+  * Refresh other patches.
+
+  [ Loic Minier ]
+  * New patch 090_capslock-numlock-im-thai, fixes Thai input method when
+    NumLock/CapsLock is on; thanks Theppitak Karoonboonyanan; GNOME #438261;
+    closes: #414698.
+  * Re-add patch 031_cursor-blinking-timeout to patch series.
+
+  [ Josselin Mouette ]
+  * 033_treeview_resizing.patch: fix column resizing in GtkTreeView when 
+    there is an expander column. See bugzilla #316087.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 18 May 2007 19:02:20 +0200
+
+gtk+2.0 (2.10.12-1) unstable; urgency=low
+
+  * Bump Conflicts to gtk-im-libthai <= 0.1.4-2.
+  * Document that 2.10.11-2 bumped the conflict on scim-gtk2-immodule to <=
+    1.4.4-7.
+  * Post-transition bump of conflicts to gtk2-engines-wonderland << 1.0-4,
+    imhangul (<< 0.9.13-5), gcin (<< 1.3.4-2), gtk-im-libthai (<< 0.1.4-3),
+    scim-gtk2-immodule (<< 1.4.4-8), uim-gtk2.0 (<< 1:1.4.1-3),
+    gtk2-engines-cleanice (<< 2.4.0-1.1), gtk2-engines-magicchicken
+    (<< 1.1.1-7.1), gtk2-engines-qtpixmap (<< 0.28-1.2), libginspx0
+    (<< 20050529-1.1), tamil-gtk2im (<< 2.2-4.4), gtk2-engines-xfce
+    (<< 2.4.0-1), scim-bridge-client-gtk (<< 0.4.10-1.1), swf-player
+    (<< 0.3.6-2.3), gtk-qt-engine (<< 1:0.8~svn-rev36-1).
+  * Let the udeb provide the Gtk+ module ABI (binver); closes: #419592.
+  * Add a -k flag to dh_gtkmodules, matching the change in dh_pangomodules.
+  * Use this new flag for the udeb and the shared library packages.
+  * Add ${misc:Depends}.
+  * Drop "libtool_is_fool" snippet patching hardcode_libdir_flag_spec and
+    archive_cmds which is probably dangerous with newer libtools.
+  * Drop patch 000_gtk+-2.0.6-exportsymbols which made all libs export way too
+    many symbols and hence was dangerous; closes: #327652.
+    - Update patch 070_mandatory-relibtoolize.
+  * Fix description of the -dbg package.
+  * New upstream release; no ABI change.
+    - Refresh patches 011_directfb-build-fixes-from-head and
+      040_filechooser_single-click.
+    - Update relibtoolizing patch.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 03 May 2007 15:13:54 +0200
+
+gtk+2.0 (2.10.11-2) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Bump libwmf conflicts to << 0.2.8.4-5.
+  * Fix control generation.
+  * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
+    its logic; build-dep on gnome-pkg-tools >= 0.11.
+  * Run "make check" test suite for all flavors except if DEB_BUILD_OPTIONS
+    contains the "nocheck" keyword; ignore failures.
+  * Add support for DEB_BUILD_OPTIONS_PARALLEL.
+  * Re-enable FAQ and Tutorial which were fixed upstream at some point; update
+    installation dirs.
+  * Call dh_installman -a.
+
+  [ Josselin Mouette ]
+  * 040_filechooser_single-click.patch: remove shortcut-related actions
+    in the response callback. This fixes the annoying bug where you need
+    to click twice on "save" after clicking on a shortcut.
+
+  [ Loic Minier ]
+  * Initialize CFLAGS to -Wall -g; pass debian/rules' CFLAGS and LDFLAGS to
+    configure, doh!
+  * Document that 2.10.8 (and 2.10.9) fixed CVE-2007-0010.
+  * Stop shipping engines in the udeb again.
+  * New patch, 040_ia32-libs.patch, for ia32-libs support via ia32-libs-gtk;
+    based on a patch by Goswin von Brederlow with the following changes: a)
+    use .32 and .64 suffixes in all cases (compatible with Ubuntu), b) fix
+    typo, c) use g_file_test() instead of g_access(); does not cover module
+    loading via env vars; closes: #406453.
+  * Upload to unstable; drop check-dist include.
+  * Wrap build-deps and deps.
+  * Add Conflicts on gcin (<= 1.3.4-1), gtk-qt-engine (<= 1:0.8~svn-rev31-3),
+    iiimf-client-gtk (<= 12.3.91-3), libginspx0 (<= 20050529-1),
+    scim-bridge-client-gtk (<= 0.4.10-1), iiimgcf (<= 11.4.1870-7).
+  * Bump Conflicts to gtk2-engines-gtk-qt << 1:0.7-2, imhangul <=
+    0.9.13-3.1, libgnomeui-0 <= 2.14.1-3, swf-player <= 0.3.6-2.2,
+    tamil-gtk2im <= 2.2-4.3, uim-gtk2.0 <= 1:1.2.1-9, scim-gtk2-immodule (<=
+    1.4.4-7).
+  * Drop docbook-utils and linuxdoc-tools-text from the build-deps.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 13 Apr 2007 22:25:49 +0200
+
+gtk+2.0 (2.10.11-1) experimental; urgency=low
+
+  * Move build and install base dirs to debian/build and debian/install
+    instead of debian/tmp/build and debian/tmp/install.
+  * Cleanup rules.
+  * Make debian/control PHONY.
+  * Use @DOC_PKG@ to point at the HTML doc as well.
+  * Tune udeb description.
+  * New upstream releases.
+    - Drop patch 003_default_fallback_icon_theme, upstream added a fallback on
+      hicolor.
+    - Drop patch 015_gdkmain-x11_button-mask.patch, merged upstream.
+    - Refresh patches.
+    - Relibtoolize.
+  * Remove 031_cursor-blinking-timeout from patch series as it causes a
+    regression in the Thai IM; closes: #414698.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 14 Mar 2007 14:11:58 +0100
+
+gtk+2.0 (2.10.9-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * 024_filechooser_single-click.patch:
+    + Monitor selection changes instead of monitoring the cursor.
+    + Miscellaneous fixes.
+  * 015_gdkmain-x11_button-mask.patch, stolen from upstream SVN: fix the
+    issue of resizing columns needing two tries in some cases
+    (closes: #406906).
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Rename patch 023_gtkentry_password-char-circle to
+    030_gtkentry_password-char-circle.
+  * Rename patch 024_filechooser_single-click to 040_filechooser_single-click.
+  * New patch, 031_cursor-blinking-timeout.patch, to stop blinking the cursor
+    after a configurable timeout; helps saving energy by not waking up all Gtk
+    processes with a cursor continuously; from upstream SVN r16366 (trunk);
+    GNOME #353670, #352442.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * Bump up libglib2.0-dev of libgtk2.0-dev dep to >= 2.12.0 as well; thanks
+    Marc Brockschmidt.
+
+  [ Josselin Mouette ]
+  * New upstream release.
+    - Fixes CVE-2007-0010; RedHat #218755, #218932.
+  * Remove patches integrated upstream:
+    + 009_directfb_build.patch
+    + 010_fix-stuc-vs-stub-typo.patch
+    + 012_missing-stub-files.patch
+    + 014_gtktreeview_missing-icons.patch
+  * Refresh patches:
+    + 020_immodules-files-d.patch
+    + 031_cursor-blinking-timeout.patch
+    + 040_filechooser_single-click.patch
+    + 070_mandatory-relibtoolize.patch
+
+ -- Josselin Mouette <joss@debian.org>  Thu,  1 Mar 2007 21:50:34 +0100
+
+gtk+2.0 (2.10.7-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * 022_gtkcupsutils_multipage.patch: removed, integrated upstream.
+  * Regenerate 070_mandatory-relibtoolize.patch.
+  * 014_gtktreeview_missing-icons.patch: update patch with the upstream
+    fix that was committed.
+  * 009_directfb_build.patch: new patch, fix typo in configure.in for 
+    the directfb build.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 10 Jan 2007 00:03:03 +0100
+
+gtk+2.0 (2.10.6-5) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Really update gtk2-engines conflict to << 2.8.2-2.
+
+  [ Josselin Mouette ]
+  * 022_gtkcupsutils_multipage.patch: new patch, stolen upstream.
+    Properly pass multi-value options to cups (closes: #404867).
+  * 023_gtkentry_password-char-circle.patch: new patch to replace stars by
+    black circles in password fields; thanks Sven Arvidsson; found in Fedora
+    and OpenSuse (closes: #401568).
+  * 024_filechooser_single-click.patch: patch from UHU-Linux to make the 
+    side pane in the filechooser usable with a single click
+    (closes: #405296).
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  3 Jan 2007 00:14:28 +0100
+
+gtk+2.0 (2.10.6-4) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Update gtk2-engines conflict to << 2.8.2-2.
+
+  [ Josselin Mouette ]
+  * 014_gtktreeview_missing-icons.patch, stolen from bugzilla: fix
+    missing icon in "save as" filechooser dialogs.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 30 Nov 2006 20:42:44 +0100
+
+gtk+2.0 (2.10.6-3) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Update gtk2-engines conflict to <= 2.8.1-4.
+  * Update gtk2-engines-pixbuf conflict to <= 2.10.
+  * Bump up libcairo-directfb2-dev build-dep to 1.2.4-4.
+
+  [ Josselin Mouette ]
+  * 070_mandatory-relibtoolize.patch: recreate with autoconf 2.59, to 
+    avoid the AM_GLIB_DEFINE_LOCALEDIR bug (making GTK+ applications 
+    untranslated).
+  * Make gtk2-engines conflict less strict.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 11 Nov 2006 00:04:46 +0100
+
+gtk+2.0 (2.10.6-2) experimental; urgency=medium
+
+  * New patch, 013_gdkproperty-directfb-strdup, to g_strdup() strings returned
+    by gdk_atom_name(); GNOME #357611; thanks Attilio Fiandrotti.
+
+ -- Loic Minier <lool@dooz.org>  Sun,  8 Oct 2006 16:03:08 +0200
+
+gtk+2.0 (2.10.6-1) experimental; urgency=low
+
+  * New upstream release.
+    - Drop patch 013_stock-icons-typo-in-rm, merged upstream.
+    - Relibtoolize: update patch 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Wed,  4 Oct 2006 11:41:37 +0200
+
+gtk+2.0 (2.10.5-1) experimental; urgency=low
+
+  * Fail if dh_gtkmodules called query helpers on module files, but no module
+    could be written to the module file.
+  * Parse stderr as well as the stdout of query helpers and bail out if
+    g_module_open(); suggest adjusting LD_LIBRARY_PATH.
+  * Fix some probably harmless typos.
+  * New patch, 030_gtkfilechooserbutton-update-combo-box-null-base-path, to
+    avoid a segfault when opening some filechoosers; thanks Sam Morris for
+    reporting and testing; from CVS HEAD; GNOME #358405; closes: #390231.
+  * New upstream release; no API change.
+    - Drop patch 030_gtkfilechooserbutton-update-combo-box-null-base-path,
+      merged upstream.
+    - New patch, 013_stock-icons-typo-in-rm, to fix a typo in gtk/Makefile.am;
+      GNOME #358931.
+    - Relibtoolize: update patch 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Mon,  2 Oct 2006 16:59:18 +0200
+
+gtk+2.0 (2.10.4-1) experimental; urgency=low
+
+  * New upstream release; no API change.
+    - Switch from tar-in-tar and sys-build to regular source and quilt
+      patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR)
+      and @TOP_SRC_DIR@ which isn't needed anymore.
+    - Refresh patch 021_loader-files-d.
+    - New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in
+      gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch.
+    - New patch, 011_directfb-build-fixes-from-head, to backport directfb
+      build fixes; from HEAD not commited in the gtk-2-10 branch.  Thanks
+      Attilio Fiandrotti for pointing me at the actual log entry.
+    - New patch, 012_missing-stub-files, to add gtk/gtkplug-stub.c and
+      gtksocket-stub.c missing from the tarball; from the gtk-2-10 branch.
+    - Relibtoolize: update patch 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 24 Sep 2006 12:24:31 +0200
+
+gtk+2.0 (2.10.3-3) experimental; urgency=medium
+
+  * Update patch 021_loader-files-d to not warn about missing module files or
+    unreadable files as is already the case for immodules; see #388450 for
+    more background.
+  * Fix awful typo which broke generation of the udeb shlibs and which I
+    didn't notice with debdiff; thanks Frans Pop.
+  * Drop debian/docs.in and pass the list of files to dh_installdocs instead;
+    should fix the missing README and NEWS files.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 21 Sep 2006 17:35:16 +0200
+
+gtk+2.0 (2.10.3-2) experimental; urgency=low
+
+  * Drop obsolete --with-cairo-backend configure flag.
+  * Make update-gtk-immodules and update-gtk-immodules no-ops, to avoid
+    modules to recreate the /etc modules files on upgrades or by mistake;
+    remove the generated module files in /etc on upgrades. closes: #388450
+  * Merge 2.8.20-2; drop patch 009_revert-gdkdrawable-directfb, merged
+    upstream.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 20 Sep 2006 22:17:30 +0200
+
+gtk+2.0 (2.10.3-1) experimental; urgency=low
+
+  * New upstream releases; with API additions in the filesystem modules API,
+    probably only used by gtk-demo, and in the quartz gdk backend, not used in
+    Debian.
+    - Bump shlibs to >= 2.10.3.
+    - Drop patch 009_configurable-cairo-backend-module, it was not really
+      required to select a cairo backend dynamically as the backend is always
+      cairo-directfb for a directfb gdk.
+    - Drop patch 010_gdk-require-cairo-module, merged upstream.
+    - Drop patch 011_gdk-directfb-cvs-changes, this release includes the
+      changes that were pulled back then.
+    - Relibtoolize: update patch 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 19 Sep 2006 20:42:38 +0200
+
+gtk+2.0 (2.10.1-2) experimental; urgency=low
+
+  * Drop obsolete scary warning in 2.10.1-1.
+  * Drop update-gtk-immodules and update-gdkpixbuf-loaders calls from
+    libgtk2.0-0's postinst, this isn't needed for backwards compatibility.
+  * Use /usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders and
+    /usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 instead of
+    /usr/bin/gdk-pixbuf-query-loaders and /usr/bin/gtk-query-immodules-2.0 in
+    dh_gtkmodules.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 19 Sep 2006 16:40:22 +0200
+
+gtk+2.0 (2.10.1-1) experimental; urgency=low
+
+  * Add a missing x11proto-xext-dev build-dep for X SYNC checks.
+  * Add a missing libatk1.0-dev (>= 1.9.0) build-dep for ATK.
+  * Replace GTK_BINARY_VERSION in debian/*.in to set the binary version of
+    binary modules; it is set via debian/scripts/vars and currently in use in
+    update-gdkpixbuf-loaders.in and update-gtk-immodules.in.
+  * Remove fake support for version argument from update-gdkpixbuf-loaders and
+    update-gtk-immodules.
+  * New upstream development releases with API additions, and non-public API
+    changes and removals.
+    - Target at experimental.
+    - Update copyright from AUTHORS.
+    - Update upstream URL.
+    - Bump up libglib2.0-dev build-dep to >= 2.12.0.
+    - Add a libdirectfb-dev (>= 0.9.24) build-dep for DirectFB.
+    - Add a libcupsys2-dev (>= 1.2) build-dep for CUPS printing backend.
+    - Bump shlibs to >= 2.10.0.
+    - Update list of docs to ship; now includes NEWS. (Closes: #384225)
+    - Update watch file to track stable releases and use HTTP.
+    - Set GTK_BINARY_VERSION to 2.10.0.
+    - Add or bump Conflicts with packages shipping modules for the 2.4.0
+      binary version of Gtk: gtk2-engines-wonderland <= 1.0-3,
+      gtk2-engines-cleanice <= 2.4.0-1, gtk2-engines <= 1:2.6.10-2,
+      gtk2-engines-magicchicken <= 1.1.1-7, gtk2-engines-pixbuf <= 2.8.20-1,
+      gtk2-engines-gtk-qt <= 1:0.7-1, gtk2-engines-qtpixmap <= 0.28-1.1,
+      librsvg2-common <= 2.14.4-2, gtk2-engines-xfce <= 2.3.90.2-1,
+      libgnomeui-0 <= 2.14.1-2, tamil-gtk2im <= 2.2-4.2, imhangul <= 0.9.13-3,
+      iiimgcf <= 11.4.1870-7.3, scim-bridge <= 0.2.4-1, scim-gtk2-immodule <=
+      1.4.4-4, gtk-im-libthai <= 0.1.4-1, uim-gtk2.0 <= 1:1.2.1-3, libwmf-dev
+      <= 0.2.8.4-2, libwmf0.2-7 <= 0.2.8.4-2, swf-player <= 0.3.6-2.1.
+    - Replace 001_gtk+-2.2.0-buildfix-immodule patch with
+      001_static-linking-dont-query-immodules which has more chances to be
+      merged upstream; see GNOME #346531.
+    - Drop 006_gtk+-2.8.17-directfb patch, merged upstream.
+    - Refresh patches: 000_gtk+-2.0.6-exportsymbols,
+      003_default_fallback_icon_theme,
+      004_gtk+-ximian-gtk2-filesel-navbutton-5,
+      007_implicit_pointer_conversion_gdkdrawable_directfb.
+    - Update 070_mandatory-relibtoolize with libtoolize --force --copy &&
+      aclocal-1.7 -I m4macros && autoconf && automake-1.7.
+    - New patch, 002_static-linking-dont-build-perf, to avoid building the
+      perf measurement tools in static builds; see GNOME #346559; needs
+      the 001_gtk+-2.2.0-buildfix-immodule patch.
+    - New patch, 009_configurable-cairo-backend-module, to add a new
+      --with-cairo-backend flag which will select a cairo-$backend.pc
+      pkg-config module instead of the default of cairo.pc; see GNOME #351509.
+    - Configure with --with-cairo-backend=directfb for the dfb build.
+    - New patch, 010_gdk-require-cairo-module, to require the Cflags and Libs
+      from the cairo-directfb module (as $cairo_module); see GNOME #351519.
+    - New patch, 011_gdk-directfb-cvs-changes, backport of CVS only build
+      fixes to permit compilation against directfb 0.9.25.1.
+  * Fix bashishms in debian/rules. (Closes: #385473)
+  * Generate a Provides: gtk2.0-binver-@BINVER@ in libgtk2.0-@SONAME@ to track
+    the binary version of Gtk and to permit Gtk modules to depend on it.
+  * Define the flags for each flavor (shared, static, and udeb) in Makefile
+    vars and share the common flags.
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
+  * Stop shipping *.la and *.a files of modules (all module types).
+  * Move GTK_BINARY_VERSION back to rules.
+  * Use GTK_BINVER_DEP instead of BINVER.
+  * Build flavors out-of-tree; saves 25% of required build space (315 MB) and
+    some build time / IO load; this clutters the headers a little (full build
+    path is mentionned instead of ".") though.
+  * Rewrite and cleanup the build process completely.
+  * Install the full set of pkg-config files from the dfb flavor in
+    /usr/lib/pkgconfig/libgtk-directfb-2.0; to use this feature, set
+    PKG_CONFIG_PATH while invoking pkg-config (or configure); the
+    /usr/lib/pkgconfig/*directfb*.pc files will be removed when Debian sources
+    have been converted.
+  * In the same spirit, gdkconfig.h is in /usr/lib/gtk-2.0/include/directfb;
+    to use it, prepend -I/usr/lib/gtk-2.0/include/directfb to CFLAGS.
+  * Fix generation of /etc/gtk-2.0/gdk-pixbuf.loaders for the udeb.
+    (Closes: #382435)
+  * Build-depend on libcairo-directfb2-dev >= 1.2.4-2 to get PDF/PS support in
+    the directfb flavor of libcairo.
+  * Recommend the linked source packages in libgtk2.0-doc instead of simply
+    suggesting them.
+  * Rewrite update-gdkpixbuf-loaders and update-gtk-immodules.
+  * Drop double libatk1.0-dev build-dep.
+  * Empty the dependency_libs in the *.la files of libgtk2.0-dev.
+  * New immodule files handling with *.immodules files below
+    /usr/lib/gtk-2.0/<BINARY_VERSION>/immodule-files.d.
+    - New patch, 020_immodules-files-d, to split the module search path on
+      ":", as is done in Pango, prepend
+      /usr/lib/gtk-2.0/<BINARY_VERSION>/immodule-files.d to the search path,
+      and to read all *.immodules files when a directory is encountered in the
+      search path.
+    - Pre-generate
+      /usr/lib/gtk-2.0/<BINARY_VERSION>/immodule-files.d/libgtk2.0-0.immodules
+      for the shared library.
+    - Continue generating /etc/gtk-2.0/gtk.immodules until packages are
+      updated.
+  * Add the libpixmap engine to the udeb for the new Bladr GTK theme for g-i.
+  * New loader files handling with *.loaders files below
+    /usr/lib/gtk-2.0/<BINARY_VERSION>/loaders-files.d.
+    - New patch, 021_loader-files-d, to split the module search path on
+      ":", as is done in Pango, prepend
+      /usr/lib/gtk-2.0/<BINARY_VERSION>/loader-files.d to the search path,
+      and to read all *.loaders files when a directory is encountered in the
+      search path.
+    - Pre-generate
+      /usr/lib/gtk-2.0/<BINARY_VERSION>/loader-files.d/libgtk2.0-0.loaders
+      for the shared library and libgtk-directfb-2.0-0-udeb.loaders for the
+      udeb.
+    - Continue generating /etc/gtk-2.0/gdk-pixbuf.loaders until packages are
+      updated.
+    - This particular patch uses two ugly workarounds and needs work before
+      being sent upstream.
+  * New Debhelper-based command, dh_gtkmodules, to create module files for IM
+    modules and GdkPixbuf loaders; it will still add a dependency on the
+    binary version of Gtk for other modules.
+  * Make use of the new dh_gtkmodules during the build (override the path to
+    gtk-query-immodules-2.0 and gdk-pixbuf-query-loaders.
+  * Add ${misc:Depends} to gtk2-engines-pixbuf.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 19 Sep 2006 15:13:38 +0200
+
+gtk+2.0 (2.8.20-2) unstable; urgency=low
+
+  * New patch, 009_revert-gdkdrawable-directfb, to revert a fix for Italic
+    letters which caused ugly unneeded horizontal/vertical lines; thanks
+    Davide Viti. (Closes: #386860)
+  * Fix typo, install-dfb depends on build-dfb, not build-shared.
+  * Fix typo (DFB_PKGFIR versus DFB_PKGDIR), use the BUILD_DFB_DIR version of
+    gdk-pixbuf-query-loaders, and set LD_LIBRARY_PATH to the udeb's /usr/lib;
+    should fix the empty /etc/gtk-2.0/gdk-pixbuf.loaders. (Closes: #382435)
+  * Ship all engines of the DirectFB build in the udeb, that is
+    engines/libpixmap.so.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 20 Sep 2006 21:36:04 +0200
+
+gtk+2.0 (2.8.20-1) unstable; urgency=low
+
+  * New upstream releases; no API changes.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 14 Aug 2006 16:52:04 +0200
+
+gtk+2.0 (2.8.18-7) unstable; urgency=medium
+
+  * Rename patches to reflect the order in which they are applied:
+    - 000_gtk+-2.2.0-buildfix-immodule to 001_gtk+-2.2.0-buildfix-immodule
+    - 001_default_fallback_icon_theme to 003_default_fallback_icon_theme
+    - 001_gtk+-ximian-gtk2-filesel-navbutton-5 to
+      004_gtk+-ximian-gtk2-filesel-navbutton-5
+    - 002_xpmico to 005_xpmico
+    - 003_gtk+-2.8.17-directfb to 006_gtk+-2.8.17-directfb
+    - 005_implicit_pointer_conversion to
+      007_implicit_pointer_conversion_gdkdrawable_directfb
+    - 006_implicit_pointer_conversion to
+      008_implicit_pointer_conversion_gdkgc_directfb
+  * Change the 000_gtk+-2.0.6-exportsymbols, and
+    001_gtk+-2.2.0-buildfix-immodule patches to only patch the
+    non-autogenerated files.
+  * Rename 004_reautoconf to 070_mandatory-relibtoolize; update it for the
+    previous changes; use an older autoconf version to work around a bug
+    in the glib-gettext macro which broke localization in dialog boxes; thanks
+    Mike Hommey.
+
+ -- Loic Minier <lool@dooz.org>  Sun,  6 Aug 2006 11:49:48 +0200
+
+gtk+2.0 (2.8.18-6) unstable; urgency=low
+
+  * 005_implicit_pointer_conversion.patch: patch from Dann Frazier to 
+    fix an implicit pointer conversion error on 64-bit architectures
+    (closes: #381081).
+  * 006_implicit_pointer_conversion.patch: fix another implicit 
+    conversion by allowing deprecated functions in the necessary header 
+    file (closes: #381082).
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  2 Aug 2006 14:48:54 +0200
+
+gtk+2.0 (2.8.18-5) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Set Priority to extra to sync with overrides.
+
+  [ Josselin Mouette ]
+  * Set priority to extra for the udeb.
+  * Bump build dependencies for libcairo to the stable version.
+  * Lots of cleanup in debian/rules.
+  * Rename directfb packages to libgtk-directfb-2.0-*.
+  * Move .a and .la files from the engine package to the development
+    package.
+    + Add appropriate Replaces: field.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Jul 2006 18:21:37 +0200
+
+gtk+2.0 (2.8.18-4) experimental; urgency=low
+
+  * Bump libcairo build dependencies.
+  * Only install the PNG loader in the udeb.
+  * Rebuild against a fixed glib.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 26 Jun 2006 22:34:27 +0200
+
+gtk+2.0 (2.8.18-3) experimental; urgency=low
+
+  * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb
+    backend.
+  * 004_reautoconf.patch: new patch, result of "libtoolize --force
+    --copy; aclocal; autoheader; automake -acf; autoconf; rm -rf
+    autom4te.cache" with the previous patches applied.
+  * Make 3 new packages: libgtk+2.0-directfb0-udeb,
+    libgtk+2.0-directfb-dev and  libgtk+2.0-directfb0.
+  * Add a new build flavour for directfb (only the shared version).
+  * Use chrpath to remove the rpath in the udeb.
+  * Generate a fake shlibs.local to handle all intra-gtk dependencies by
+    hand.
+  * Switch to debhelper compatibility mode 5 and require 5.0.22.
+  * Standards-version is 3.7.2.
+  * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and
+    libgtk2.0-common (closes: #309604).
+    + Remove libgtk2.0-common dependency on libgtk2.0-0.
+    + Remove libgtk2.0-0 dependency on libgtk2.0-bin.
+    + Use ${binary:Version} and ${source:Version} to ensure strict
+      dependencies.
+    + Build-depend on dpkg-dev 1.13.19.
+    + Invert the libgtk2.0-common -> libgtk2.0-0 symbolic link.
+    + libgtk2.0-common.preinst, libgtk2.0-0.postinst: dance the symbolic
+      link samba.
+    + Move support binaries and scripts to libgtk2.0-0 and make
+      libgtk2.0-bin a binary-all package containing only scripts.
+    + Move /usr/sbin/update-* calls to libgtk2.0-0.
+    + update-*: call binaries at their new location.
+
+ -- Josselin Mouette <joss@debian.org>  Mon, 26 Jun 2006 22:31:14 +0200
+
+gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low
+
+  * Bump libgtk2.0-dev dependency and build-dep on libx11-dev to >= 2:1.0.0-6
+    as it ships x11.pc which ends up in the Requires of gdk-x11-2.0.pc.
+    (Closes: #326199, #370693)
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Tue,  6 Jun 2006 15:18:28 +0200
+
+gtk+2.0 (2.8.18-1) unstable; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - search box positioning has some bugs
+    - Gdk does not translate VK_NUMPADx to GDK_KP_x  
+    - sanely handle late (re)setting of dnd image   
+    - Text is shifted off-by-one in Add to panel 
+    - gtk_widget_create_pango_layout docs typo
+    - GtkLayout In GtkScrolledWindow does not receive the scroll_event
+    - gtktreeview has RTL problems with toggle buttons if using gtktreestore 
+      as a model    
+    - Wrong drop location in GtkEntry     
+    - GtkImage animation CRITICALS on switching themes 
+    - DnD: Conditional jump or move depends on uninitialised value
+    - cursor blocked to dnd mode after using shift and dnd on a GtkCalendar
+    - Crashes while creating source code w/GtkFontSelection
+    - the right edge tab does not appear when switching tab
+    - Warning in gtk_paned_compute_position 
+    - gdk should set resolution on PangoCairoFontmap, not PangoCairoContext
+    - GtkTreeView does not resize correctly
+    - gtk_tree_view_get_cell_area() forgets depth-one expander
+    - expander animation not working in RTL mode
+    - Multiple issues discovered by Coverity  
+    - Make gtk_file_chooser_button_new() friendlier for language bindings
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 30 May 2006 17:02:26 +0200
+
+gtk+2.0 (2.8.17-1) unstable; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - Expander disclosure button is too small
+    - gtk_image_clear doesn't cause redraw
+    - typo in configure.in yields suspicious warning
+    - gtk_icon_view_set_cursor causes Segmentation fault
+    - garbage output of --help in non UTF-8 locale
+    - GtkNotebook does not destroy its children on destroy()
+    - TreeView DnD between-row highlight colo
+    - Gtk-Criticals occur when scrolling a text_view that is not realized
+    - Hidden menubar still activates submenus with kbd
+    - GtkTreeItem broken 
+    -  Clean up button press handling (use one-grab-op-at-a-time pattern)   
+    - broken scrolling when selecting
+    - GTK+ File-chooser dialog crashes
+    - Nautilus crashes when dragging icons to another screen
+    - mixed line separators confuse gtk_text_iter_ends_line
+    - Textview child is covered by window border
+    - gdk_pixbuf_loader_new_with_type(): What image types are allowed? 
+    - Missing progress bar label
+    - Fix a problem which caused grab-notify signal to be missed in some cases
+  * debian/control.in:
+    - clear the Build-Depends on xlibs-static-pic | xlibs-pic, not required
+    - updated the Build-Depends on libpango1.0-dev so it build with 
+      the xorg transitioned version
+  * * debian/patches/001_default_fallback_icon_theme.patch:
+    - set the default fallback icon theme to "gnome", fixes the issues with
+      the moves of icons from hicolor to gnome
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  9 Apr 2006 21:54:11 +0200
+
+gtk+2.0 (2.8.16-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 15 Mar 2006 19:26:46 +0100
+
+gtk+2.0 (2.8.15-1) unstable; urgency=low
+
+  * New upstream version:
+    * Bugs fixed:
+      - Keys P and N in "open file" dialog have special meaning
+      - MS-Windows theme (GTK-Wimp) shows all funky characters
+      - Optimize gdk on win32 
+      - Hollow polygons have wrong linecaps 
+      - panel crash with a11y enabled
+    * Updated translations (bg,bn,cs,eu,ro)
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 14 Mar 2006 15:41:56 +0100
+
+gtk+2.0 (2.8.13-1) unstable; urgency=low
+
+  * New upstream version:
+    * Bugs fixed:
+    - Can't select some items in GtkIconView 
+    - gtk_icon_theme_list_icons: example contexts don't work
+    - gnopernicus crashes on changing display screen source for magnifier
+    - evince crashes in gdk_region_union_with_rect 
+    - Small error in _gdk_gc_update_context 
+    - gtk.Notebook.get_current_page() returns incorrect page number 
+      when pages hidden
+    - GtkAboutDialog not responsive to Escape key
+    - GtkNotebook popup menu not keynavigatable
+    - GtkRadioButton does not issue notify::active
+    - Make more use of G_DISABLE_ASSERT in TextView code  
+    * Updated translations 
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 25 Feb 2006 23:56:58 +0100
+
+gtk+2.0 (2.8.12-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * [debian/copyright] Updated FSF's address.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 12 Feb 2006 14:11:11 +0100
+
+gtk+2.0 (2.8.11-1) unstable; urgency=low
+
+  * New upstream version
+    * Avoid memory overruns in the pixbuf theme engine with nonsensical 
+      gradient specifications.  [Matthias]
+    * Bugs fixed:
+    - Cursor doesn't move as expected
+    - Segfault from combination of gtk_container_set_resize_mode() 
+      and GtkComboBox
+    - segfault in update_cursor on amd64
+    - eog crashes at launch under AIX 
+    - "~" should bring up the location dialog
+    - gtk_text_layout_get_cursor_locations() chokes on layout=0x0
+    * Documentation improvements [Federico Mena Quintero]
+    * Translation updates (es,pt_BR,zh_HK,zh_TW)
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 27 Jan 2006 22:28:05 +0100
+
+gtk+2.0 (2.8.10-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/control.in:
+    - updated the glib requirement
+  * debian/patches/001_fs_documents.patch:
+    - dropped, stick with upstream behaviour rather
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 12 Jan 2006 13:34:37 +0100
+
+gtk+2.0 (2.8.9-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 15 Dec 2005 15:13:32 +0100
+
+gtk+2.0 (2.8.9-1) experimental; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - File chooser filter behaves weird 
+    - 2.8.4 to 2.8.6: sound-juicer crash, fileselector assertions
+    - On unsetting the Model, GtkTreeView does not clear 
+      it's associated TreeSelection
+    - Crash on selecting a file of null mime-type 
+    - gtktoolbutton leaks a pixbuf
+    - GdkEvent leaked in gtktreeview.c / gtk_tree_view_key_press 
+    - Typo in trap_activate_cb() 
+    - gtkcalendar.c: The identifier is already declared. 
+    - gtk_menu_attach_to_widget() does not take NULL detacher 
+    - Unhinted fonts are measured incorrectly and drawing 
+      problems occur as a result
+    - unwanted scrolling in recent gtk 
+    - Toolbars without icons are invisible in icon-only mode 
+    - Search-entry in the TreeView not working properly 
+    - gtktoolbutton.c:562: warning: 'image' is used 
+      uninitialized in this function 
+    - reference count of textbuffer increases with each paste 
+    - gtk_selection_data_get_uris leaks memory
+    Other changes:
+    - Remove GMemChunk from public header files to 
+      support building against GLib 2.10 
+    - Report errors in option parsing 
+    - Merge upstream xdgmime changes to handle duplicate glob patterns 
+  
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 10 Dec 2005 18:22:50 +0100
+
+gtk+2.0 (2.8.8-1) experimental; urgency=low
+
+  * New upstream version:
+    GtkFileChooser:
+     - Make F2 work for renaming bookmarks
+    GtkEntry:
+     - Turn off input methods in password entries
+    - Other fixes * Documentation improvements
+    - Updated translations
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 29 Nov 2005 16:00:32 +0100
+
+gtk+2.0 (2.8.7-1) experimental; urgency=low
+
+  * New upstream version.
+  * Security fixes:
+    - Add check to XPM reader to prevent integer overflow for specially crafted
+      number of colors (CVE-2005-3186) (Closes: #339431).
+    - Fix endless loop with specially crafted number of colors (CVE-2005-2975).
+  * debian/patches/001_fs_documents.patch:
+    - updated.
+  * debian/rules:
+    - fix confusing cp usage.
+  
+  [ Loic Minier ]
+  * Drop xlibs-dev deps and build-deps.
+    [debian/control, debian/control.in]
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 16 Nov 2005 11:54:11 +0100
+
+gtk+2.0 (2.8.3-1) experimental; urgency=low
+
+  * New upstream version:
+    - Fix problems with the handling of initial settings
+      for font options and cursor themes.
+    - Add a --ignore-theme-index option to gtk-update-icon-cache.
+
+ -- Jordi Mallach <jordi@debian.org>  Thu,  1 Sep 2005 19:45:50 +0200
+
+gtk+2.0 (2.8.2-1) experimental; urgency=low
+
+  * New upstream version:
+    - Fix a crash with custom icon themes, which affected 
+      the gnome-theme-manager.
+    - Make sure font and cursor settings are propaged down
+      to the screen initially. 
+  * debian/control.in:
+    - require the current pango.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 25 Aug 2005 00:36:18 +0200
+
+gtk+2.0 (2.8.1-1) experimental; urgency=low
+
+  * New upstream version:
+    - gtk-update-icon-cache no longer stores copies of symlinked icons,
+      and it has a --index-only option to omit image data from the cache.
+    - Make large GtkSizeGroups more efficient.
+    - Improve positioning of menus in GtkToolbar.
+    - Make scrolling work on unrealized icon views.
+    - Avoid unnecessary redraws on range widgets.
+    - Make sure that all GTK+ applications reload icon themes promptly.
+    - Ensure that gdk_pango_get_context() and gtk_widget_get_pango_context()
+      use the same font options and dpi value.
+    - Multiple memory leak fixes.
+  * debian/control.in:
+    - updated the libgtk2.0-dev Depends according to the changes.
+  * debian/rules:
+    Add --enable-explicit-deps=yes to make sure stuff like x11 gets listed as a
+    Requires: in gdk(-x11)-2.0.pc, because otherwise linkage against -lX11 and
+    friends doesn't get carried through.  Whether or not this is correct is
+    arguable, since libgdk-x11-2.0.so.0* ends up linked against it anyway, but
+    stuff like gnome-panel seems to be relying on this transience.
+    Change by Daniel Stone.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 24 Aug 2005 11:24:16 +0200
+
+gtk+2.0 (2.8.0-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/control.in:
+    - build with the new cairo (Closes: #323705).
+    - updated the Build-Depends for xorg (Closes: #323080).
+  * debian/copyright:
+    - use License instead of Copyright (Closes: #323209).
+  * debian/patches/001_fs_documents.patch:
+    - default to Documents.
+  * debian/rules:
+    - updated the shlibs.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 18 Aug 2005 12:19:41 +0200
+
+gtk+2.0 (2.7.2-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/control.in:
+    - updated the Build-Depends.
+  * debian/rules:
+    - updated the shlibs.
+    - use cairo.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 12 Jul 2005 01:06:55 +0200
+
+gtk+2.0 (2.6.8-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches/003_focus_issues.patch:
+    - fixed with the new version.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 16 Jun 2005 12:52:35 +0200
+
+gtk+2.0 (2.6.7-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Forward patches from 2.6.4 branch:
+    + 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues.
+    + debian/gtk-tutorial.devhelp: updated to reflect the reality of the
+      html files.
+  * Loïc Minier:
+    + Document the configuration of Emacs-style key bindings in README.Debian,
+      with additional instructions for GNOME users. [debian/README.Debian]
+      (Closes: #309530)
+
+ -- Josselin Mouette <joss@debian.org>  Mon,  6 Jun 2005 22:39:27 +0200
+
+gtk+2.0 (2.6.7-1) experimental; urgency=low
+
+  * New upstream version:
+    - Fix compilation with gcc 4.0 (Closes: #303646).
+  * debian/rules:
+    - clean from the mips changes.
+  * debian/patches/002_bmp.patch:
+    - the new version fixes that.
+  * debian/patches/004_fs_newdir.patch:
+    - the new version fixes that.
+  
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 14 Apr 2005 22:06:53 +0200
+
+gtk+2.0 (2.6.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches/004_fs_newdir.patch:
+    - fix a crash in the fileselector when creating a directory.
+  * debian/patches/003_iconcache.patch:
+    - this bug is fixed in the new version.
+  * debian/patches/004_mipsbuild.patch:
+    - dropped, this change is not required.
+  * debian/patches/002_bmp.patch:
+     - fix CAN-2005-0891: BMP double free Dos (Closes: #303141).
+  
+ -- Sebastien Bacher <seb128@debian.org>  Tue,  5 Apr 2005 21:09:01 +0200
+
+gtk+2.0 (2.6.2-4) unstable; urgency=high
+
+  * Sjoerd Simons:
+    - debian/patches/003_iconcache.patch
+      + Updated. Let updateiconcache.c include config.h so it's correctly build
+        with large file support (Closes: #295777).
+  * Sebastien Bacher:
+    - debian/shlibs.local:
+      + dropped, fix the self depends (Closes: #296175).
+  * Loic Minier:
+    - debian/control*
+      + added gtk2-engines-pixbuf subsection and priority to sync with
+        the override.
+  * Use high urgency so that icon themes can propagate to testing.
+
+ -- Josselin Mouette <joss@debian.org>  Wed,  2 Mar 2005 22:28:38 +0100
+
+gtk+2.0 (2.6.2-3) unstable; urgency=low
+
+  * Patch from Steve Langasek <vorlon@debian.org>:
+    Add a --disable-testsuite argument to upstream configure, to permit
+    skipping the testsuite on architectures where large static binaries
+    are currently problematic (i.e., mips).  Closes: #295048.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 13 Feb 2005 19:23:39 +0100
+
+gtk+2.0 (2.6.2-2) unstable; urgency=low
+
+  * debian/libgtk2.0-bin.postinst:
+    - don't run gtk-update-icon-cache, the themes should do that 
+      (Closes: #293568).
+  * debian/patches/003_iconcache.patch:
+    - should fix the gtk-update-icon-cache issue on sparc. 
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  6 Feb 2005 19:57:57 +0100
+
+gtk+2.0 (2.6.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - fix the loop in gtkdialog (Closes: #291051).
+    - should fix the issue on sparc (Closes: #293711).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  6 Feb 2005 00:16:52 +0100
+
+gtk+2.0 (2.6.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/patches/004_gtkmodules.patch:
+    - don't reverse the order of modules, that fix a crash with the modules.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed,  2 Feb 2005 18:28:09 +0100
+
+gtk+2.0 (2.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  9 Jan 2005 14:23:07 +0100
+
+gtk+2.0 (2.6.0-1) experimental; urgency=low
+
+  * New upstream release (Closes: #275239).
+  * debian/control.in:
+    - create a gtk2-engines-pixbuf package.
+    - recommends hicolor-icon-theme (Closes: #287334).
+    - rename libgtk2.0-dbg to libgtk2.0-0-dbg.
+    - updated the Build-Depends.
+  * debian/gtk2-engines-pixbuf.files:
+    - added.
+  * debian/libgtk2.0-bin.files:
+    - install gtk-update-icon-cache here.
+  * debian/libgtk2.0-bin.postinst:
+    - call gtk-update-icon-cache.
+  * debian/patches/001_gtk+-debian-aclocal-pass_all.patch:
+    - removed, should not be needed with the new version.
+  * debian/patches/003_treeview-typeahead.patch,
+    debian/patches/003_filechooser-search.patch,
+    debian/patches/004_treeview-activate.patch,
+    debian/patches/005_modifiers.patch:
+    - removed, these changes are in the new version.
+  * debian/rules:
+    - updated the shlibs.
+    - use dh_strip to make the debug package.  
+  * update-gtk-immodules.in:
+  * update-gdkpixbuf-loaders.in:
+    - module version is 2.4.0.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 29 Dec 2004 18:55:11 +0100
+
+gtk+2.0 (2.4.14-2) unstable; urgency=low
+
+  * debian/patches/003_filechooser-search.patch:
+    - open the path entry if "/" is enter in the file-selector.
+  * debian/patches/004_treeview-activate.patch:
+    - typeahead active the row.
+  * debian/patches/005_modifiers.patch:
+    - accept shift-/ for bringing up the location popup.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 21 Dec 2004 16:21:15 +0100
+
+gtk+2.0 (2.4.14-1) unstable; urgency=low
+
+  * New upstream release (Closes: #286021).
+  * debian/control.in:
+    - set myself as maintainer.
+  * debian/patches/003_treeview-typeahead.patch:
+    - backport of the typeahead feature for the treeviews.  
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 19 Dec 2004 14:55:07 +0100
+
+gtk+2.0 (2.4.13-1) unstable; urgency=low
+
+  * New upstream release:
+    - make new notebook tabs appear again (Closes: #276266).
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 13 Oct 2004 16:48:13 +0200
+
+gtk+2.0 (2.4.11-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 11 Oct 2004 19:48:52 +0200
+
+gtk+2.0 (2.4.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/002_xpmico.patch:
+    - updated, the two xpm fixes are in the new version.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 19 Sep 2004 00:19:27 +0200
+
+gtk+2.0 (2.4.9-2) unstable; urgency=high
+
+  * debian/patches/002_xpmico.patch:
+    - fix CAN-2004-0782 Heap-based overflow in pixbuf_create_from_xpm.
+    - fix CAN-2004-0783 Stack-based overflow in xpm_extract_color.
+    - fix CAN-2004-0788 ico loader integer overflow.
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 17 Sep 2004 12:23:02 +0200
+
+gtk+2.0 (2.4.9-1) unstable; urgency=medium
+
+  * GNOME team upload.
+  * New upstream release.
+  * debian/patches/002_gtk+-pixbuf-breakage.patch: removed, included in
+    upstream version 2.4.8.
+
+ -- Jordi Mallach <jordi@debian.org>  Thu, 26 Aug 2004 14:41:17 +0200
+
+gtk+2.0 (2.4.7-1) unstable; urgency=medium
+
+  * GNOME team upload.
+  * New upstream release.
+  * debian/patches/002_gtk+-pixbuf-breakage.patch: new, apply patch
+    from CVS to fix thumbnail corruption in nautilus.
+
+ -- Jordi Mallach <jordi@debian.org>  Wed, 25 Aug 2004 20:12:28 +0200
+
+gtk+2.0 (2.4.4-2) unstable; urgency=medium
+
+  * Rebuilt with libtiff4.
+  * debian/control.in:
+    - Build-Depends on libtiff4-dev.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 28 Jul 2004 23:11:54 +0200
+
+gtk+2.0 (2.4.4-1) unstable; urgency=low
+
+  * New upstream release
+    - fix the problem with directories displayed twice in the file chooser
+      (Closes: #249057).
+  * debian/control.in:
+    - libgtk2.0-bin Conflicts with old libgtk2.0-dev.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 11 Jul 2004 00:33:45 +0200
+
+gtk+2.0 (2.4.3-3) unstable; urgency=low
+
+  * debian/control.in:
+    - since manpages have moved from libgtk2.0-dev to libgtk2.0-bin we need
+      to update the Replaces.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon,  5 Jul 2004 21:15:25 +0200
+
+gtk+2.0 (2.4.3-2) unstable; urgency=low
+
+  * debian/libgtk2.0-bin.files:
+    - moved gdk-pixbuf-query-loader and gtk-query-immodules-2.0 manpages
+      to libgtk2.0-bin. (Closes: #257399).
+  * debian/libgtk2.0-doc.doc-base.gtk-faq,
+    debian/libgtk2.0-doc.doc-base.gtk-tutorial:
+    - changed index.html with book1.html.
+  * Included devehelp files from Richard Cohen <richard@daijobu.co.uk> 
+    for the faq and the tutorial (Closes: #256844).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  3 Jul 2004 12:14:38 +0200
+
+gtk+2.0 (2.4.3-1) unstable; urgency=medium
+
+  * New upstream release 
+    - fix the button size allocation logic (Closes: #253971, #253974).
+  * debian/rules
+    - updated the shlibs.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 15 Jun 2004 11:29:13 +0200
+
+gtk+2.0 (2.4.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #252690).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  5 Jun 2004 17:23:57 +0200
+
+gtk+2.0 (2.4.1-4) unstable; urgency=low
+
+  * Conflict with librsvg2-common << 2.6.3-1 (closes: #250714, #250647).
+
+ -- Josselin Mouette <joss@debian.org>  Tue, 25 May 2004 14:15:22 +0200
+
+gtk+2.0 (2.4.1-3) unstable; urgency=low
+
+  * GNOME Team Upload. 
+  * Upload to unstable
+    + close bug fixed in experimental uploads 
+      (Closes: #161244, #201429, #201507, #203677, #208744, #223316, #228603)
+      (Closes: #232081, #234902, #238479, #241860) 
+  * Marc Brockschmidt <he@debian.org>
+   + debian/rules: Really, *really* surpress warnings when removing directories
+     (using >/dev/null 2>&1 instead of 2>&1 >/dev/null)
+  
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 22 May 2004 15:23:21 +0200
+
+gtk+2.0 (2.4.1-2) experimental; urgency=low
+
+  * debian/control.in: 
+    + Conflict with old versions of packages that need a rebuild to work with 
+      gtk+2.4 to force the updates.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 15 May 2004 23:24:07 +0200
+
+gtk+2.0 (2.4.1-1) experimental; urgency=low
+  
+  * New upstream release.
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/control:
+    - added libgtk2.0-0 to Depends for libgtk2.0-common. (from 2.2.4-6).
+    - libgtk2.0-dev requires libxext-dev. (Closes: #247469)
+  * Sebastien Bacher <seb128@debian.org>
+  + debian/rules:
+    - updated shlib to 2.4.1.
+  
+ -- Sebastien Bacher <seb128@debian.org>  Wed,  5 May 2004 23:32:54 +0200
+
+gtk+2.0 (2.4.0-4) experimental; urgency=low
+
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/control:
+    - moved arch-independent files to libgtk2.0-common again.
+    - separated arch-dependent files to libgtk2.0-bin.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 24 Apr 2004 02:11:52 +0900
+
+gtk+2.0 (2.4.0-3) experimental; urgency=low
+
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/rules:
+    - modified the sed script to strip the version properly.
+      (closes: Bug#241860)
+    - clean up.
+  + debian/control:
+    - updated the dependencies for the separated xlibs-dev. (from 2.2.4-4)
+    - separated arch-independent data to libgtk2.0-data package.
+      (from 2.2.4-4)
+
+ -- Akira TAGOH <tagoh@debian.org>  Fri, 23 Apr 2004 22:43:58 +0900
+
+gtk+2.0 (2.4.0-2) experimental; urgency=low
+
+  * debian/control.in:
+    + Added build dependency on libxcursor-dev. (Closes: #239886)
+
+  Sebastien Bacher <seb128@debian.org>:
+  * debian/rules:
+    + Updated shver.
+  * debian/control.in:
+    + Added again Build-Depends removed in 2.4.0-1.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 25 Mar 2004 11:18:48 +0100
+
+gtk+2.0 (2.4.0-1) experimental; urgency=low
+
+  * First upload of new GTK+ branch in experimental (Closes: #238479):
+    + back out locale-dependent interpretation of KP_Decimal (Closes: #234902).
+    + change scrolling method (Closes: #161244).
+    + first day of the week depends of the locale (Closes: #228603).
+    + fix fileselector multiple selection handling after keyboard validation 
+      (Closes: #208744).  
+    + fix gtktreeview crash when expanding nodes (Closes: #232081).  
+    + fix quotes missing in gtk-2.0.m4 (Closes: #223316).
+    + use the new file selector (Closes: #203677, #201429, #201507).
+    + and probably a lot of other bug fixes and improvements ...
+  * Sebastien Bacher <seb128@debian.org>:
+    * debian/control.in:
+      - removed Build-Depends on docbook-utils and linuxdoc-tools-text.
+    * patches/001_gtk+-debian-docfix-dtds.patch:
+      - removed since we have a xml catalog now.
+  * Rob Taylor <robtaylor@fastmail.fm>:
+    * debian/control.in, debian/sources, debian/scripts/vars, debian/watch:
+      - updated for 2.4.0.
+    * debian/patches/:
+      - 002_gtk+-debian-freetype.patch:
+        + removed, not needed any more, configure already has the changes.
+      - 000_gtk+-2.2.4-non-weak-symbols.patch:
+        + removed, fixed in upstream source.
+      - 000_gtk+-2.2.4-socketfocus.patch:
+        + removed, fixed in upstream source.
+      - 001_gtk+-debian-aclocal-pass_all.patch :
+        + updated.
+      - 000_gtk+-2.2.0-buildfix-immodule.patch 
+        + updated.
+      - 000_gtk+-debian-xinerama-pic.patch 
+        + updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 22 Mar 2004 22:00:09 +0100
+
+gtk+2.0 (2.2.4-6) unstable; urgency=low
+
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/control:
+    - added libxt-dev to fix FTBFS. (closes: Bug#246450)
+    - added libgtk2.0-0 to Depends for libgtk2.0-common.
+
+ -- Akira TAGOH <tagoh@debian.org>  Tue,  4 May 2004 11:30:56 +0900
+
+gtk+2.0 (2.2.4-5) unstable; urgency=low
+
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/control:
+    - moved arch-independent files to libgtk2.0-common again.
+    - separated arch-dependent files to libgtk2.0-bin.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 24 Apr 2004 01:12:08 +0900
+
+gtk+2.0 (2.2.4-4) unstable; urgency=low
+
+  * Akira TAGOH <tagoh@debian.org>
+  + debian/rules:
+    - bumped the shlib version to 2.2.1-3. (closes: Bug#208671)
+  + debian/control:
+    - separated arch-independent data to libgtk2.0-data package.
+      (closes: Bug#233396)
+    - fixed the dependencies for the separated xlibs-dev.
+      (closes: Bug#241782, Bug#241522)
+  + debian/libgtk2.0-data.{dir,files}:
+    - added.
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu, 22 Apr 2004 00:42:02 +0900
+
+gtk+2.0 (2.2.4-3) unstable; urgency=low
+
+  * debian/patches/:
+    - 002_gtk+-debian-freetype.patch: patch from Daniel Schepler to fix the 
+      build failure due to freetype (Closes: #225129).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 27 Dec 2003 13:00:17 +0100
+
+gtk+2.0 (2.2.4-2) unstable; urgency=low
+
+  * debian/control:
+    - added Uploaders to maintain as team.
+    - added gnome-pkg-tools to Build-Depends.
+  * debian/gtk-options.7:
+    - included a manpage with the help on the options (Closes: Bug#216897).
+  * debian/libgtk2.0-doc.doc-base.gtk-faq
+  * debian/libgtk2.0-doc.doc-base.gtk-tutorial:
+    - replaced book1.html by index.html (closes: Bug#215382).
+  * debian/patches/:
+    - 000_gtk+-2.2.4-socketfocus.patch: new patch to fix a GtkSocket focus
+      problem that hang the system tray applet. 
+      (closes: Bug#210813, Bug#212772).
+    - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: updated 
+      (closes: Bug#216660). 
+  * debian/rules:
+    - modified to generate debian/control using gnome-pkg-tools.
+  
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 31 Oct 2003 21:32:29 +0100
+
+gtk+2.0 (2.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+    - implemented the im module that produces C_WITH_CEDILLA rather than
+      C_WITH_ACUTE for dead_acute+c combinations. it will be used as default
+      im module for fr and pt. (closes: Bug#168557)
+    - reworked the handling of XIM's status window. (closes: Bug#203009)
+  * debian/control:
+    - removed libgtk2.0-0png3 which is unnecessary anymore.
+    - added non-versioned Conflicts: libgtk2.0-0png3.
+    - bumped Standards-Version to 3.6.1.0.
+  * debian/patches/: removed the backported patches.
+    - 000_gtk+-2.2.2-docfix-gtk2compliant.patch
+    - 000_gtk+-2.2.2-docfix-gtktreemodel.patch
+    - 000_gtk+-2.2.2-gtkwidget-viewable.patch
+    - 000_gtk+-2.2.2-imxim-reconnect.patch
+
+ -- Akira TAGOH <tagoh@debian.org>  Mon,  8 Sep 2003 03:42:18 +0900
+
+gtk+2.0 (2.2.2-3) unstable; urgency=low
+
+  * debian/patches/:
+    - 000_gtk+-2.2.2-docfix-gtk2compliant.patch: applied a backported patch
+      from CVS to fix the old documentation. (closes: Bug#146723)
+    - 000_gtk+-2.2.2-docfix-gtktreemodel.patch: applied a backported patch
+      from CVS to fix the sample code. (closes: Bug#201322)
+    - 000_gtk+-2.2.2-gtkwidget-viewable.patch: applied a backported patch from
+      CVS to fix the garbled pixmaps. (closes: Bug#201808, Bug#202486)
+    - 000_gtk+-2.2.2-imxim-reconnect.patch: applied a backported patch from
+      CVS to fix the segfaults if the XIM server is killed during running gtk2
+      applications.
+    - 001_gtk+-debian-docfix-dtds.patch: applied to use the local DTD.
+  * debian/control:
+    - added Build-Depends-Indep: gtk-doc-tools, docbook-xml to re-generate the
+      fixed documents.
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu,  7 Aug 2003 01:42:46 +0900
+
+gtk+2.0 (2.2.2-2) unstable; urgency=low
+
+  * debian/patches/:
+    - 001_gtk+-debian-aclocal-pass_all.patch: re-applied a patch to fix FTBFS
+      on arm. (closes: Bug#201443)
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu, 24 Jul 2003 03:14:10 +0900
+
+gtk+2.0 (2.2.2-1) unstable; urgency=low
+
+  * New upstream release. (closes: Bug#200350)
+    - Fixed threadlocks on GtkTreeView. (closes: Bug#192136)
+    - Fixed the crash on moving the cursor when the cursor is invisible.
+      (closes: Bug#187858)
+    - Fixed the compose table for ascending order. (closes: Bug#182073)
+  * debian/control:
+    - fix the FTBFS. Thanks to Daniel Baeyens.
+    - bumped Standards-Version to 3.6.0.
+  * debian/rules:
+    - removed dh_undocumented.
+    - don't claim the newer shlibs.
+  * debian/patches/:
+    - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch: removed.
+    - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch: removed.
+    - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch: removed.
+    - 000_gtk+-2.2.1-gtktreeview-scroll.patch: removed.
+    - 000_gtk+-debian-xinerama-pic.patch: updated.
+    - 001_gtk+-debian-aclocal.patch: removed.
+    - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: applied a Ximian patch
+      to improve the GtkFileSel UI. Requested from Ross Burton.
+    - 000_gtk+-2.2.2-non-weak-symbols.patch: applied to fix the undefined non
+      weak symbols. (closes: Bug#193774)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 13 Jul 2003 21:26:49 +0900
+
+gtk+2.0 (2.2.1-6) unstable; urgency=low
+
+  * debian/patches/001_gtk+-debian-aclocal.patch:
+    - damn. forgot to re-run automake and autoconf. fix again.
+      (closes: Bug#190569)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat,  3 May 2003 16:56:18 +0900
+
+gtk+2.0 (2.2.1-5) unstable; urgency=low
+
+  * debian/control:
+    - changed a section for libgtk2.0-dbg to libdevel.
+  * debian/patches/000_gtk+-debian-aclocal.patch:
+    - applied to fix Xinerama library linkage broken on arm and m68k.
+      (closes: Bug#190569)
+      Thanks to James Troup and Phil Blundell.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat,  3 May 2003 01:50:52 +0900
+
+gtk+2.0 (2.2.1-4) unstable; urgency=low
+
+  * debian/patches/:
+    - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch:
+      applied a backported patch from CVS. (closes: Bug#185066)
+    - 000_gtk+-2.2.1-gtktreeview-scroll.patch:
+      applied a patch from Red Hat to fix infinite expose loops in TreeView.
+      (closes: Bug#187312)
+  * debian/control:
+    - bumped Standards-Version to 3.5.9.
+    - changed a section for libgtk2.0-dev to libdevel.
+  * debian/rules:
+    - fixed the symlinks on /usr/share/gtk-doc/html. (closes: Bug#183377)
+  * debian/compat:
+    - use it instead of DH_COMPAT.
+
+ -- Akira TAGOH <tagoh@debian.org>  Fri,  4 Apr 2003 01:55:35 +0900
+
+gtk+2.0 (2.2.1-3) unstable; urgency=low
+
+  * build against the latest xlibs and xlibs-pic. so now correct
+    libXinerama_pic.a is linked and supporting xinarama is re-enabled.
+    (closes: Bug#177318)
+  * debian/control:
+    - depend on xlibs-pic (>= 4.2.1-6)
+  * debian/README.Debian:
+    - improve description of static libraries issue. (closes: Bug#181879)
+      Thanks to Marcelo E. Magallon <mmagallo@debian.org>
+    - mention gtk-key-theme-name and gnome-settings-daemon.
+  * debian/rules:
+    - create the symlinks in /usr/share/gtk-doc
+
+ -- Akira TAGOH <tagoh@debian.org>  Mon,  3 Mar 2003 01:35:04 +0900
+
+gtk+2.0 (2.2.1-2) unstable; urgency=low
+
+  * debian/patches/:
+    - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch:
+      backport from CVS to fix wrong pointer returned. (closes: Bug#180786)
+    - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch:
+      applied to fix a crash when using xinput. (closes: Bug#178908)
+
+ -- Akira TAGOH <tagoh@debian.org>  Wed, 19 Feb 2003 03:10:55 +0900
+
+gtk+2.0 (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/: removed patches. they were fixed in this release.
+    - 000_gtk+-2.2.0-buildfix-modules.patch
+    - 000_gtk+-2.2.0-fix-es.po.patch
+    - 000_gtk+-2.2.0-fnmatch-undef.patch
+    - 002_gtk+-2.2.0-fixtypo-xinput.patch
+  * debian/patches/000_gtk+-debian-xinerama-pic.patch: update.
+
+ -- Akira TAGOH <tagoh@debian.org>  Fri,  7 Feb 2003 03:37:44 +0900
+
+gtk+2.0 (2.2.0-3) unstable; urgency=low
+
+  * debian/: clean the unnecessary files up. (closes: Bug#177809)
+  * debian/rules:
+    remove the old debug libraries on install process if exists. (closes:
+    Bug#177376)
+  * debian/patches/:
+    - 002_gtk+-2.2.0-fixtypo-xinput.patch:
+      fix to enable XFree86 xinput extension. (closes: Bug#176104)
+    - 000_gtk+-2.2.0-fix-es.po.patch:
+      applied to fix es.po. (closes: Bug#178870)
+
+ -- Akira TAGOH <tagoh@debian.org>  Wed, 29 Jan 2003 23:01:43 +0900
+
+gtk+2.0 (2.2.0-2) unstable; urgency=low
+
+  * debian/control:
+    - add Conflicts libgnomeui-0 (<< 2.0.6-2) to avoid the gtk+ 2.2 breakage.
+      (closes: Bug#175946)
+    - add Conflicts gtk2.0-examples (<< 2.2.0) (closes: Bug#175868)
+    - add dependency of libgtk2.0-common. (closes: Bug#175873)
+    - removed libgtk-common package. it's no longer needed. I hope the loop
+      dependency will be disappeared.
+    - used libpng12-0-dev instead of libpng3-dev for Build-Depends.
+  * debian/patches/001_gtk+-2.2.0-xinerama-pic.patch:
+    disabled Xinerama support until xlibs-pic has libXinerama_pic.a.
+    (closes: Bug#175923)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 11 Jan 2003 05:09:12 +0900
+
+gtk+2.0 (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - upstream bug were closed. so it should be fixed. (closes: Bug#147697)
+  * debian/control:
+    - updated Build-Depends.
+    - bumped Standards-Version to 3.5.8.
+    - fix description-synopsis-ends-with-full-stop stuff.
+  * debian/update-gdkpixbuf-loaders: add brand-new wrapper script.
+  * debian/update-gdkpixbuf-loaders.1: add manpage.
+  * debian/rules:
+    modified to build the static libraries. (closes: Bug#161938)
+  * debian/README.Debian: updated.
+  * debian/patches/:
+    - 000_gtk+-2.0.6-extranotify.patch: removed.
+    - 000_gtk+-2.0.6-scroll_to.patch: removed.
+    - 000_gtk+-2.2.0-fnmatch-undef.patch:
+      applied to fix having main() in the library.
+    - 000_gtk+-2.2.0-buildfix-immodule.patch:
+      applied to build the static libraries.
+    - 000_gtk+-2.2.0-buildfix-modules.patch:
+      applied to fix a typo in configure.in.
+
+ -- Akira TAGOH <tagoh@debian.org>  Mon,  6 Jan 2003 18:34:31 +0900
+
+gtk+2.0 (2.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/000_gtk+-2.0.8-refcolormap.patch: this release contains it.
+    removed.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 24 Nov 2002 00:08:42 +0900
+
+gtk+2.0 (2.0.8-2) unstable; urgency=low
+
+  * debian/patches/000_gtk+-2.0.8-refcolormap.patch: applied to fix the crash
+    problem with close. For solve your problem, I recommend you restart all
+    processes related gtk+2.0. (closes: Bug#169005)
+
+ -- Akira TAGOH <tagoh@debian.org>  Fri, 15 Nov 2002 09:16:40 +0900
+
+gtk+2.0 (2.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: it's no longer needed.
+  * debian/rules: fix twice called ldconfig. (closes: Bug#168071)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 10 Nov 2002 16:36:45 +0900
+
+gtk+2.0 (2.0.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - support noopt option for DEB_BUILD_OPTIONS.
+    - add symlink for gobject. (closes: Bug#167755)
+  * Hm, closed a bug which is marked as NMU due to mis-upload. (closes:
+    Bug#166442)
+  * debian/patches: these patches are no longer needed, so removed.
+    - 000_gtk+-2.0.6-64bitfix.patch
+    - 000_gtk+-2.0.6-imenvvar.patch
+    - 000_gtk+-2.0.6-keycode.patch
+    - 000_gtk+-2.0.6-usintl.patch
+  * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: applied to fix the
+    undefined symbol issue on libpixbufloader-gif.so.
+
+ -- Akira TAGOH <tagoh@debian.org>  Wed,  6 Nov 2002 01:42:22 +0900
+
+gtk+2.0 (2.0.6-4) unstable; urgency=low
+
+  * debian/patches/000_gtk+-2.0.6-64bitfix.patch: applied to fix a segfault on
+    IA64. (closes: Bug#166442)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 27 Oct 2002 03:07:59 +0900
+
+gtk+2.0 (2.0.6-3) unstable; urgency=low
+
+  * debian/control: moved libgtk2.0-0png3 to the last entry.
+  * debian/rule: fix invalid symlink.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 31 Aug 2002 09:46:36 +0900
+
+gtk+2.0 (2.0.6-2) unstable; urgency=low
+
+  * debian/control:
+    - bumped Standards-Version and depends debhelper (>> 4).
+    - revert to libgtk2.0-0 and remove Conflicts libgtk2.0-0, then add
+      versioned conflict to work eog2, gnome-panel2, celestia, gimp1.3 and
+      metatheme. (closes: Bug#155689, Bug#155854)
+    - add libgtk2.0-0png3 to Conflicts, Replaces.
+    - add a dummy package for libgtk2.0-0png3.
+    - remove the image libraries dependency. (closes: Bug#158858)
+    - clean up -dev's Depends.
+    - add libglib2.0-doc, libatk1.0-doc and libpango1.0-doc to Suggests.
+  * debian/patches/: from Red Hat.
+    - 000_gtk+-2.0.6-exportsymbols.patch:
+      applied to fix stripping the wrong symbols due to libtool's bug. but
+      it's not affected about the symbols used by ld and ld.so. mainly for nm,
+      gdb and etc.
+    - 000_gtk+-2.0.6-extranotify.patch:
+      applied to fix extra settings notifies on startup that were causing
+      significant performance problems as fonts were reloaded.
+    - 000_gtk+-2.0.6-imenvvar.patch:
+      applied to fix a bug with GTK_IM_MODULE environment variable.
+    - 000_gtk+-2.0.6-keycode.patch: applied to fix a problem with keycodes
+      passed to GtkIMContextXIM.
+    - 000_gtk+-2.0.6-usintl.patch:
+      applied to fix to GtkIMContextSimple compose for us-intl keyboards.
+      should be fixed. (closes: Bug#149515)
+    - 000_gtk+-2.0.6-scroll_to.patch:
+      applied to fix gtk_tree_view_scroll_to_cell.
+  * debian/rules: add symlink to fix the missing symlink for glib, atk and
+    pango. (closes: Bug#158107)
+  * debian/update-gtk-immodules.fr.1: added. Thanks Julien Louis. (closes:
+    Bug#156985)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 31 Aug 2002 05:22:33 +0900
+
+gtk+2.0 (2.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against libpng3 (closes: 147852)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun,  4 Aug 2002 18:31:53 +0900
+
+gtk+2.0 (2.0.5-2) unstable; urgency=low
+
+  * debian/rules: add --with-xinput=xfree. (closes: Bug#151668)
+  * debian/control:
+    - add Conflicts: libgdkxft0 to avoid some problem. (closes: Bug#151439).
+    - changed a summary from 'Dummy' to 'Empty'.
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu,  4 Jul 2002 00:18:53 +0900
+
+gtk+2.0 (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: fix typo (closes: Bug#150147)
+
+ -- Akira TAGOH <tagoh@debian.org>  Mon, 17 Jun 2002 01:07:20 +0900
+
+gtk+2.0 (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+    - should be fixed in this release. (closes: Bug#149667)
+    - now it's not linked to the Pango docs (closes: Bug#149143)
+  * debian/libgtk2.0-doc.doc-base.{gdk,gdk-pixbuf,gtk,gtk-faq,gtk-tutorial}:
+    add a new line before Format: (closes: Bug#149548, Bug#150043)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 16 Jun 2002 05:16:29 +0900
+
+gtk+2.0 (2.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}:
+    changed an index file.
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu, 30 May 2002 23:35:52 +0900
+
+gtk+2.0 (2.0.2-5) unstable; urgency=high
+
+  * debian/control: add libtiff3g-dev, libpng2-dev and libjpeg62-dev to
+    Depends for -dev.
+  * set urgency=high because previous version violated our policy 2.3.4.
+    it should be into woody as far as possible.
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu, 23 May 2002 00:31:52 +0900
+
+gtk+2.0 (2.0.2-4) unstable; urgency=high
+
+  * debian/patches/000_gtk+2.0-2.0.2-bigendian.patch: applied to fix a problem
+    for big endian machines. (closes: Bug#145285)
+  * set urgency=high because it should be in woody.
+
+ -- Akira TAGOH <tagoh@debian.org>  Wed,  1 May 2002 02:46:12 +0900
+
+gtk+2.0 (2.0.2-3) unstable; urgency=low
+
+  * debian/update-gtk-immodules: create /etc/gtk-2.0 directory for workaround,
+    if it's not found. oh, why didn't you have it? (closes: Bug#143508,
+    Bug#144673)
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 28 Apr 2002 04:46:30 +0900
+
+gtk+2.0 (2.0.2-2) unstable; urgency=low
+
+  * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}:
+    Grr, fix again... (closes: Bug#141069)
+  * debian/scripts/vars.build: fix bashism.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat,  6 Apr 2002 04:26:14 +0900
+
+gtk+2.0 (2.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - this release has bug fix only.
+  * debian/control: forgot to update versioned dependency for -dev.
+  * debian/libgtk2.0-doc.doc-base.gtk-faq,
+    debian/libgtk2.0-doc.doc-base.gtk-tutorial:
+    fix wrong index. (closes: Bug#141069)
+
+ -- Akira TAGOH <tagoh@debian.org>  Thu,  4 Apr 2002 02:49:49 +0900
+
+gtk+2.0 (2.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/update-gtk-immodules: check the immodules directory.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sun, 31 Mar 2002 00:59:03 +0900
+
+gtk+2.0 (2.0.0-3) unstable; urgency=low
+
+  * debian/rules: removed regenerate shlibs. all packages no longer needs to
+    depend on -common.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 16 Mar 2002 21:51:08 +0900
+
+gtk+2.0 (2.0.0-2) unstable; urgency=low
+
+  * debian/control: changed Build-Depends to libpango1.0-dev (>= 1.0.0-3)
+  * debian/{control,rules}: add libgtk-common as dummy package for upgrading.
+  * debian/rules: fix the missing directory.
+  * debian/update-gtk-immodules: fix file attribute for gtk.immodules.
+
+ -- Akira TAGOH <tagoh@debian.org>  Sat, 16 Mar 2002 04:34:39 +0900
+
+gtk+2.0 (2.0.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Akira TAGOH <tagoh@debian.org>  Wed, 13 Mar 2002 00:07:25 +0900
+
--- gtk+2.0-2.11.6.orig/debian/control
+++ gtk+2.0-2.11.6/debian/control
@@ -0,0 +1,297 @@
+Source: gtk+2.0
+Section: libs
+Priority: optional
+Maintainer: Sebastien Bacher <seb128@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>
+Build-Depends: debhelper (>= 5.0.22),
+               gettext,
+               pkg-config,
+               libglib2.0-dev (>= 2.13.5),
+               libpango1.0-dev (>= 1.17.3),
+               libatk1.0-dev (>= 1.9.0),
+               libx11-dev (>= 2:1.0.0-6),
+               libxext-dev,
+               libxi-dev,
+               libxrandr-dev,
+               libxt-dev,
+               libxrender-dev,
+               libxft-dev,
+               libxcursor-dev,
+               libxcomposite-dev,
+               libxdamage-dev,
+               libxkbfile-dev,
+               libxinerama-dev,
+               libxfixes-dev,
+               libcairo2-dev (>= 1.2.0),
+               libcairo-directfb2-dev (>= 1.2.4-4),
+               libtiff4-dev,
+               libjpeg62-dev,
+               libpng12-dev,
+               gnome-pkg-tools (>= 0.11),
+               chrpath,
+               dpkg-dev (>= 1.13.19),
+               x11proto-xext-dev,
+               libdirectfb-dev (>= 0.9.24),
+               libcupsys2-dev (>= 1.2),
+               quilt
+Build-Depends-Indep: gtk-doc-tools (>= 1.6),
+                     docbook-xml
+Standards-Version: 3.7.2
+
+Package: libgtk2.0-0
+Section: libs
+Architecture: any
+Depends: libgtk2.0-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: gtk2.0-binver-2.10.0
+Conflicts: libgtk2.0-0png3,
+           eog2 (<< 1.0.1-4),
+           gnome-panel2 (<< 2.0.4-1),
+           celestia (<< 1.2.4-4),
+           gimp1.3 (<< 1.3.7-1.1),
+           metatheme (<< 0.9.7-3),
+           libgnomeui-0 (<= 2.14.1-3),
+           gtk2.0-examples (<< 2.2.0),
+           libgdkxft0,
+           gtk2-engines-wonderland (<< 1.0-4),
+           gtk2-engines-cleanice (<< 2.4.0-1.1),
+           gtk2-engines-thinice (<< 2.6),
+           gtk2-engines-crux (<< 2.6),
+           gtk2-engines-mist (<< 2.6),
+           gtk2-engines-highcontrast (<< 2.6),
+           gtk2-engines-lighthouseblue (<< 2.6),
+           gnome-themes (<< 2.6),
+           gtk2-engines-industrial (<< 0.2.32-5),
+           gtk2-engines-pixbuf (<= 2.10),
+           gtk2-engines-redmond95 (<< 2.2.0-2.1),
+           gtk2-engines-metal (<< 2.2.0-2.1),
+           gtk2-engines-magicchicken (<< 1.1.1-7.1),
+           gtk2-engines-qtpixmap (<< 0.28-1.2),
+           gtk2-engines-smooth (<< 0.5.6-3),
+           gtk2-engines-ubuntulooks (<= 0.9.11-1),
+           gtk2-engines-xfce (<< 2.4.0-1),
+           tamil-gtk2im (<< 2.2-4.4),
+           imhangul (<< 0.9.13-5),
+           librsvg2-common (<= 2.14.4-2),
+           gtk2-engines (<< 1:2.8.2-2),
+           gtk2-engines-gtk-qt (<< 1:0.7-2),
+           iiimgcf (<= 11.4.1870-7.3),
+           scim-bridge (<= 0.2.4-1),
+           scim-gtk2-immodule (<< 1.4.4-8),
+           gtk-im-libthai (<< 0.1.4-3),
+           uim-gtk2.0 (<< 1:1.4.1-3),
+           libwmf-dev (<< 0.2.8.4-5),
+           libwmf0.2-7 (<< 0.2.8.4-5),
+           swf-player (<< 0.3.6-2.3),
+           gcin (<< 1.3.4-2),
+           gtk-qt-engine (<< 1:0.8~svn-rev36-1),
+           iiimf-client-gtk (<< 12.3.91-4),
+           libginspx0 (<< 20050529-1.1),
+           scim-bridge-client-gtk (<< 0.4.10-1.1),
+           iiimgcf (<= 11.4.1870-7)
+Replaces: libgtk2.0-0png3
+Recommends: hicolor-icon-theme,
+            ${misc:Depends},
+            libgtk2.0-bin
+Description: The GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the shared libraries.
+
+Package: libgtk-directfb-2.0-0
+Section: libs
+Architecture: any
+Depends: libgtk2.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libgtk+2.0-directfb0
+Description: The GTK+ graphical user interface library - DirectFB runtime
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This version uses DirectFB, a thin library providing an integrated 
+ windowing system and hardware acceleration on top of the Linux 
+ framebuffer.
+
+Package: libgtk-directfb-2.0-0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Provides: gtk2.0-binver-2.10.0
+Description: The GTK+ graphical user interface library - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the minimal runtime library using DirectFB needed
+ by the Debian installer.
+
+Package: libgtk2.0-common
+Section: misc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libgtk2.0-0
+Replaces: libgtk1.3-common,
+          libgtk2.0-data
+Conflicts: libgtk1.3-common,
+           libgtk2.0-data
+Description: Common files for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the common files which the libraries need.
+
+Package: libgtk2.0-bin
+Section: misc
+Architecture: all
+Depends: ${misc:Depends},
+         libgtk2.0-0 (>= ${source:Version})
+Replaces: libgtk2.0-common (<= 2.4.0-3),
+          libgtk2.0-dev (<= 2.4.3-1)
+Conflicts: libgtk2.0-dev (<= 2.4.3-1)
+Description: The programs for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the program files which is used for the libraries
+ and others.
+
+Package: libgtk2.0-dev
+Section: libdevel
+Architecture: any
+Depends: libgtk2.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         libglib2.0-dev (>= 2.12.0),
+         libpango1.0-dev (>= 1.10.0-2),
+         libatk1.0-dev (>= 1.6.1-2),
+         libcairo2-dev,
+         libx11-dev (>= 2:1.0.0-6),
+         libxext-dev,
+         libxinerama-dev,
+         libxi-dev,
+         libxrandr-dev,
+         libxcursor-dev,
+         libxfixes-dev,
+         libxcomposite-dev,
+         libxdamage-dev,
+         pkg-config
+Recommends: python (>= 2.4)
+Suggests: libgtk2.0-doc
+Replaces: libgtk1.3-dev,
+          gtk2-engines-pixbuf (<< 2.8.18-5)
+Conflicts: libgtk1.3-dev
+Description: Development files for the GTK+ library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications.
+
+Package: libgtk-directfb-2.0-dev
+Section: libdevel
+Architecture: any
+Depends: libgtk-directfb-2.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         libgtk2.0-dev (= ${binary:Version}),
+         libcairo-directfb2-dev,
+         libcairo2-dev (>= 1.2.0)
+Conflicts: libgtk+2.0-directfb-dev
+Description: Development files for the GTK+ library - DirectFB version
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the GTK+ applications on top of the DirectFB
+ library.
+
+Package: libgtk2.0-0-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libgtk2.0-0 (= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: libgtk2.0-dbg
+Replaces: libgtk2.0-dbg
+Description: The GTK+ libraries and debugging symbols
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains detached debugging symbols.
+ .
+ Most people will not need this package.
+
+Package: libgtk2.0-doc
+Section: doc
+Architecture: all
+Depends: lynx | www-browser,
+         ${misc:Depends}
+Replaces: libgtk1.3-doc
+Conflicts: libgtk1.3-doc
+Recommends: libglib2.0-doc,
+            libatk1.0-doc,
+            libpango1.0-doc
+Description: Documentation for the GTK+ graphical user interface library
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the HTML documentation for the GTK+ library
+ in /usr/share/doc/libgtk2.0-doc/ .
+
+Package: gtk2.0-examples
+Section: x11
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libgtk2.0-0 (= ${binary:Version})
+Replaces: libgtk1.3-dev
+Description: Examples files for the GTK+ 2.0
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the examples files and a demonstration program
+ for the GTK+-2.0.
+
+Package: gtk2-engines-pixbuf
+Section: graphics
+Priority: optional
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgtk2.0-0 (= ${binary:Version})
+Suggests: gtk-engines-pixmap
+Conflicts: gtk2.0-engines-pixbuf
+Replaces: gtk2.0-engines-pixbuf
+Description: Pixbuf-based theme for GTK+ 2.x
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package contains the pixbuf theme engine.
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-bin.links.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-bin.links.in
@@ -0,0 +1,6 @@
+usr/lib/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders
+usr/lib/@SHARED_PKG@/gtk-query-immodules-@APIVER@ usr/bin/gtk-query-immodules-@APIVER@
+usr/lib/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
+usr/lib/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
+usr/lib/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders
+usr/share/doc/@SHARED_PKG@ usr/share/doc/@BIN_PKG@
--- gtk+2.0-2.11.6.orig/debian/update-gdkpixbuf-loaders.8
+++ gtk+2.0-2.11.6/debian/update-gdkpixbuf-loaders.8
@@ -0,0 +1,31 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH UPDATE-GDKPIXBUF-LOADERS 8 "6 January 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+update-gdkpixbuf-loaders \- Update wrapper script for the Gdkpixbuf loaders list
+.SH SYNOPSIS
+.B update-gdkpixbuf-loaders
+.I package\| version
+.SH DESCRIPTION
+\fIupdate-gdkpixbuf-loaders\fP is a wrapper script for updating /etc/gtk-2.0/gdk-pixbuf.loaders using \fIgdk-pixbuf-query-loaders\fP.
+.br
+\fIupdate-gdkpixbuf-loaders\fP get a argument and /etc/gtk-2.0/gdk-pixbuf.loaders for that version will be generated by \fIgdk-pixbuf-query-loaders\fP.
+.SH SEE ALSO
+.BR gdk-pixbuf-query-loaders (1)
+.SH AUTHOR
+This manual page was written by Akira TAGOH <tagoh@debian.org>,
+for the Debian GNU/Linux system.
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-common.install
+++ gtk+2.0-2.11.6/debian/libgtk2.0-common.install
@@ -0,0 +1,3 @@
+# from the shared flavor
+debian/install/shared/usr/share/locale usr/share
+debian/install/shared/usr/share/themes usr/share
--- gtk+2.0-2.11.6.orig/debian/dh_listmissing.pl
+++ gtk+2.0-2.11.6/debian/dh_listmissing.pl
@@ -0,0 +1,79 @@
+#!/bin/false /usr/bin/perl -w
+# shebang disabled while this script resides in debian/
+
+# similar to dh_install; needs some documentation
+
+use strict;
+use File::Find;
+use Debian::Debhelper::Dh_Lib;
+
+init();
+
+# list of sourcedirs
+my @sourcedirs = @ARGV;
+
+my @installed;
+
+my $srcdir = '.';
+
+# dh_install code, but not doing any installation, just building @installed
+# and stripping sourcedirs from these
+foreach my $package (@{$dh{DOPACKAGES}}) {
+    my $tmp=tmpdir($package);
+    my $file=pkgfile($package,"install");
+
+    my @install;
+    if ($file) {
+        @install=filedoublearray($file); # no globbing yet
+    }
+
+    # Support for -X flag.
+    my $exclude = '';
+    if ($dh{EXCLUDE_FIND}) {
+        $exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
+    }
+
+    foreach my $set (@install) {
+        if (! defined $dh{AUTODEST} && @$set > 1) {
+            pop @$set;
+        }
+        foreach my $src (map { glob "$srcdir/$_" } @$set) {
+            next if excludefile($src);
+
+            # strip source dir
+            foreach my $d (@sourcedirs) {
+                $src=~s/^\Q$srcdir\E\/\Q$d\E\///;
+            }
+
+            # Keep track of what's installed.
+            # Kill any extra slashes. Makes the @installed stuff more robust.
+            $src=~y:/:/:s;
+            $src=~s:/+$::;
+            $src=~s:^(\./)*::;
+            push @installed, "\Q$src\E\/.*|\Q$src\E";
+        }
+    }
+}
+
+# dh_install code, but stripping sourcedirs
+my @missing;
+my $installed=join("|", @installed);
+$installed=qr{^($installed)$};
+find(sub {
+    -f || -l || return;
+    $_="$File::Find::dir/$_";
+    foreach my $d (@sourcedirs) {
+        s/^\Q$d\E\///;
+    }
+    if (! /$installed/ && ! excludefile($_)) {
+        my $file=$_;
+        push @missing, $file;
+    }
+}, @sourcedirs);
+if (@missing) {
+    warning "$_ has been installed upstream but is not in any package" foreach @missing;
+    if ($dh{FAIL_MISSING}) {
+        error("missing files, aborting");
+    }
+}
+
--- gtk+2.0-2.11.6.orig/debian/watch
+++ gtk+2.0-2.11.6/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://download.gnome.org/sources/gtk+/([\d\.]+)[02468]/ \
+	gtk\+-(.*)\.tar\.gz \
+	debian uupdate
--- gtk+2.0-2.11.6.orig/debian/libgtk-directfb-2.0-dev.links.in
+++ gtk+2.0-2.11.6/debian/libgtk-directfb-2.0-dev.links.in
@@ -0,0 +1 @@
+usr/share/doc/@DIRECTFB_PKG@ usr/share/doc/@DIRECTFB_DEV_PKG@
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-dev.links.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-dev.links.in
@@ -0,0 +1 @@
+usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEV_PKG@
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-bin.manpages
+++ gtk+2.0-2.11.6/debian/libgtk2.0-bin.manpages
@@ -0,0 +1,5 @@
+debian/gtk-options.7
+debian/update-gtk-immodules.8
+debian/update-gtk-immodules.fr.8
+debian/update-gdkpixbuf-loaders.8
+debian/update-icon-caches.8
--- gtk+2.0-2.11.6.orig/debian/libgtk-directfb-2.0-dev.install.in
+++ gtk+2.0-2.11.6/debian/libgtk-directfb-2.0-dev.install.in
@@ -0,0 +1,6 @@
+# from the directfb flavor
+debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk
+debian/install/directfb/usr/lib/*directfb*.so usr/lib
+debian/install/directfb/usr/lib/pkgconfig/* usr/lib/pkgconfig/@DIRECTFB_PKG@
+debian/install/directfb/usr/lib/pkgconfig/*directfb* usr/lib/pkgconfig
+debian/install/directfb/usr/lib/gtk-@APIVER@/include/gdkconfig.h usr/lib/gtk-@APIVER@/include/directfb
--- gtk+2.0-2.11.6.orig/debian/gtk2-engines-pixbuf.install.in
+++ gtk+2.0-2.11.6/debian/gtk2-engines-pixbuf.install.in
@@ -0,0 +1,2 @@
+# from the shared flavor
+debian/install/shared/@MODULES_BASE_PATH@/engines/*.so @MODULES_BASE_PATH@/engines
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-dev.manpages
+++ gtk+2.0-2.11.6/debian/libgtk2.0-dev.manpages
@@ -0,0 +1 @@
+debian/dh_gtkmodules.1
--- gtk+2.0-2.11.6.orig/debian/update-icon-caches.8
+++ gtk+2.0-2.11.6/debian/update-icon-caches.8
@@ -0,0 +1,19 @@
+.TH UPDATE-ICON-CACHES 8 "13 July 2007"
+.SH NAME
+update-icon-caches \- Update wrapper script for the icon caches
+.SH SYNOPSIS
+\fBupdate-icon-caches\fP \fIdirectory\fP [ \fI...\fP ]
+.SH DESCRIPTION
+\fBupdate-icon-caches\fP is a wrapper script for updating the icon
+caches in a list of directories.
+.P
+In each of the directories passed as arguments, the icon cache is
+updated if it is already present. It is not created if it does not
+already exist.
+.P
+If the theme index file is not present, the icon cache is removed.
+.SH SEE ALSO
+.BR gtk-update-icon-cache (1)
+.SH AUTHOR
+This manual page was written by Josselin Mouette <joss@debian.org>,
+for the Debian GNU/Linux system.
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-0.install.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-0.install.in
@@ -0,0 +1,12 @@
+# from Debian
+debian/update-gdkpixbuf-loaders usr/lib/@SHARED_PKG@
+debian/update-gtk-immodules usr/lib/@SHARED_PKG@
+# from the shared flavor
+debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@
+debian/install/shared/usr/bin/gdk-pixbuf-query-loaders usr/lib/@SHARED_PKG@
+debian/install/shared/usr/bin/gtk-query-immodules-2.0 usr/lib/@SHARED_PKG@
+debian/install/shared/usr/bin/gtk-update-icon-cache usr/lib/@SHARED_PKG@
+debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders
+debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
+debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
+debian/install/shared/usr/lib/*.so.* usr/lib
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.doc-base.gtk.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.doc-base.gtk.in
@@ -0,0 +1,11 @@
+Document: gtk
+Title: GTK+ Reference Manual
+Author: Damon Chaplin et al.
+Abstract: The GTK+ library provides a graphical user interface for
+ C programs, and is used in projects such as GIMP, Gnome, and Mozilla.
+ This document covers programming using the GTK+ library.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/@DOC_PKG@/gtk/index.html
+Files: /usr/share/doc/@DOC_PKG@/gtk/*.html
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.doc-base.gtk-faq
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.doc-base.gtk-faq
@@ -0,0 +1,12 @@
+Document: gtk2-faq
+Title: GTK+2.0 Frequently Asked Questions
+Author: Tony Gale, Shawn Amundson, and Emmanuel Deloget
+Abstract: This document is intended to answer questions that are
+ likely to be frequently asked by programmers using the GTK+ 
+ graphical user interface library, or people who are just looking at 
+ using GTK+, Gnome, or GIMP.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html
+Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-bin.install.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-bin.install.in
@@ -0,0 +1,5 @@
+# from the shared flavor
+debian/install/shared/usr/share/man/man1/gtk-update-icon-cache.1 usr/share/man/man1
+debian/install/shared/usr/share/man/man1/gtk-query-immodules-@APIVER@.1 usr/share/man/man1
+debian/install/shared/usr/share/man/man1/gdk-pixbuf-query-loaders.1 usr/share/man/man1
+debian/update-icon-caches usr/sbin
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.doc-base.gdk
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.doc-base.gdk
@@ -0,0 +1,13 @@
+Document: gdk
+Title: GDK Reference Manual
+Author: Damon Chaplin et al.
+Abstract: The GDK library provides an OS-independant wrapper around the
+ most fundamental graphical user interface functions.  This allows
+ GTK+ to be ported to non-X11 systems, as long as GDK is ported first.
+ .
+ This document covers programming in GDK.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgtk2.0-doc/gdk/index.html
+Files: /usr/share/doc/libgtk2.0-doc/gdk/*.html
--- gtk+2.0-2.11.6.orig/debian/compat
+++ gtk+2.0-2.11.6/debian/compat
@@ -0,0 +1 @@
+5
--- gtk+2.0-2.11.6.orig/debian/libgtk-directfb-2.0-0-udeb.install.in
+++ gtk+2.0-2.11.6/debian/libgtk-directfb-2.0-0-udeb.install.in
@@ -0,0 +1,3 @@
+# from the directfb flavor
+debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders
+debian/install/directfb/usr/lib/*.so.* usr/lib
--- gtk+2.0-2.11.6.orig/debian/copyright
+++ gtk+2.0-2.11.6/debian/copyright
@@ -0,0 +1,91 @@
+This package was debianized by Akira TAGOH <tagoh@debian.org> on
+Wed, 13 Mar 2002 00:07:25 +0900.
+
+It was downloaded from <http://ftp.gnome.org/pub/gnome/sources/gtk+/>.
+
+Copyright Holders:
+
+Please do not mail any of the authors listed here 
+asking questions about this version of GTK+. 
+
+Original Authors
+----------------
+Peter Mattis      <petm@xcf.berkeley.edu>
+Spencer Kimball   <spencer@xcf.berkeley.edu>
+Josh MacDonald    <jmacd@xcf.berkeley.edu>
+
+The GTK+ Team (in alphabetical order)
+-------------------------------------
+Shawn T. Amundson <amundson@gtk.org>
+Jerome Bolliet    <bolliet@gtk.org>
+Damon Chaplin     <damon@gtk.org>
+Tony Gale         <gale@gtk.org>
+Jeff Garzik       <jgarzik@gtk.org>
+Lars Hamann       <lars@gtk.org>
+Raja R Harinath   <harinath@gtk.org>
+Carsten Haitzler  <raster@gtk.org>
+Tim Janik         <timj@gtk.org>
+Stefan Jeske      <stefan@gtk.org>
+Elliot Lee        <sopwith@gtk.org>
+Raph Levien       <raph@gtk.org>
+Ian Main          <imain@gtk.org>
+Federico Mena     <quartic@gtk.org>
+Paolo Molaro      <lupus@gtk.org>
+Jay Painter       <jpaint@gtk.org>
+Manish Singh      <manish@gtk.org>
+Owen Taylor       <otaylor@gtk.org>
+
+There are many others who have contributed patches; we thank them,
+GTK+ is much better because of them.
+
+
+Over time, GTK+ has incorporated some pieces of software which 
+started as independent projects. We list the original authors here:
+
+
+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
+IME input method
+----------------
+Takuro Ashie
+Kazuki IWAMOTO
+
+
+Mac OS X backend
+----------------
+Anders Carlsson
+
+
+DirectFB backend
+----------------
+Denis Oliver Kropp
+Sven Neumann
+Mike Emmel
+
+License:
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA.
+
+ See /usr/share/common-licenses/LGPL-2 on your debian system.
--- gtk+2.0-2.11.6.orig/debian/rules
+++ gtk+2.0-2.11.6/debian/rules
@@ -0,0 +1,327 @@
+#!/usr/bin/make -f
+
+# Debian GNOME Maintainers
+DISABLE_UPDATE_UPLOADERS := 1
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+# prevent accidental uploads to unstable
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
+# get-orig-source target
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+GNOME_MODULE := gtk+
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+STAMP_DIR := debian/stampdir
+
+PATCH_DIR := debian/patches
+
+# rules in this debian/rules Makefile can be built concurrently as well as
+# upstream rules in Makefile; all $(MAKE) invocations will inherit this flag,
+# if you recurse into debian/rules ($(MAKE)
+# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when
+# the childs encounters this line
+DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
+
+DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
+# ppc64 support; see #386815
+# XXX Should probably be fixed in binutils
+# XXX Use LDFLAGS instead of CFLAGS?
+# XXX shouldn't we check the arch instead of the CPU?
+ifeq ($(DEB_BUILD_GNU_CPU),powerpc64)
+	CFLAGS += -mminimal-toc
+endif
+
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+# used to fail in directfb code -- but this might be fixed -- currently fails
+# in the cups gtkprint backend
+#LDFLAGS += -Wl,-z,defs
+
+DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
+APIVER := 2.0
+SONAME := 0
+SHVER := 2.11.6
+
+# earliest version that this release has backwards binary compatibility for
+GTK_BINARY_VERSION := 2.10.0
+
+# Gtk binary version virtual Provide
+GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION)
+
+# package names
+SHARED_PKG := libgtk$(APIVER)-$(SONAME)
+COMMON_PKG := libgtk$(APIVER)-common
+DEV_PKG := libgtk$(APIVER)-dev
+DIRECTFB_PKG := libgtk-directfb-$(APIVER)-$(SONAME)
+DIRECTFB_DEV_PKG := libgtk-directfb-$(APIVER)-dev
+UDEB_PKG := $(DIRECTFB_PKG)-udeb
+DOC_PKG := libgtk$(APIVER)-doc
+BIN_PKG := libgtk$(APIVER)-bin
+DEBUG_PKG := $(SHARED_PKG)-dbg
+EXAMPLES_PKG := gtk$(APIVER)-examples
+PIXBUF_PKG := gtk2-engines-pixbuf
+
+# package groups, used in rule dependencies and in cleanup
+BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG)
+BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG)
+ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
+
+# list of flavors we build; each gets a builddir, a configure pass (configure
+# args are defined below), a build pass, and an install pass (in two steps)
+# Note: the shared flavor is required
+FLAVORS := directfb shared static
+
+# list of flavors to run the test suite on
+# don't run the directfb testsuite on kfreebsd as it hangs; see #431477
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+CHECK_FLAVORS := $(filter shared static, $(FLAVORS))
+else
+CHECK_FLAVORS := $(filter directfb shared static, $(FLAVORS))
+endif
+
+# build dir for the current flavor; this is only expanded in flavor specific
+# targets
+builddir = $(buildbasedir)/$*
+buildbasedir = $(CURDIR)/debian/build
+
+# install dir for the current flavor; this is only expanded in flavor specific
+# targets
+installdir = $(installbasedir)/$*
+installbasedir = $(CURDIR)/debian/install
+
+# relative base directory for all types of modules
+MODULES_BASE_PATH := usr/lib/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
+
+# relative directory to store the generated IM module files
+IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d
+
+# relative directory to store the generated GdkPixbuf loader files
+LOADER_FILES_D := $(MODULES_BASE_PATH)/loader-files.d
+
+# configure flags
+common_configure_flags := \
+			--prefix=/usr \
+			--mandir=\$${prefix}/share/man \
+			--infodir=\$${prefix}/share/info \
+			--sysconfdir=/etc \
+			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
+			--enable-explicit-deps=yes \
+			--enable-test-print-backend
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+else
+	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+shared_configure_flags := $(common_configure_flags) \
+			--with-xinput=yes \
+			--enable-shared \
+			--disable-static
+static_configure_flags := $(common_configure_flags) \
+			--with-xinput=yes \
+			--with-included-loaders=yes \
+			--disable-modules \
+			--disable-shared \
+			--enable-static
+directfb_configure_flags := $(common_configure_flags) \
+			--with-xinput=no \
+			--enable-shared \
+			--disable-static \
+			--with-gdktarget=directfb
+
+# macro computing the list of 'debian/<pkg>.*" files which have a corresponding
+# ".in" file; pass the list of packages in $(1)
+dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
+
+debian/dh_gtkmodules.1: debian/dh_gtkmodules
+	cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1
+
+patch: $(STAMP_DIR)/patch-stamp
+
+$(STAMP_DIR)/patch-stamp:
+	dh_testdir
+	mkdir $(STAMP_DIR)
+	# apply patches
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	# backup the original files to restore them in the clean target
+	-test -r config.sub && cp config.sub config.sub.orig
+	-test -r config.guess && cp config.guess config.guess.orig
+	-test -r /usr/share/misc/config.sub && \
+		cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+		cp -f /usr/share/misc/config.guess config.guess
+	touch $@
+
+$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
+	dh_testdir
+	mkdir -p $(builddir)
+	cd $(builddir) && \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+			$(CURDIR)/configure $($*_configure_flags)
+	touch $@
+
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
+
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+	dh_testdir
+	LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \
+		$(MAKE) -C $(builddir)
+	touch $@
+
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+
+$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-%
+	dh_testdir
+	# setting LD_LIBRARY_PATH for "make check" might be needed in the
+	# future, but doesn't seem necessary right now
+	#LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH)
+	# testsuite failures are ignored
+	-$(MAKE) -C $(builddir) check
+	touch $@
+
+check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS))
+
+$(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-%
+	mkdir -p $(installdir)
+	$(MAKE) -C $(builddir) install \
+		DESTDIR=$(installdir)
+	touch $@
+
+install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
+
+# gross kludge to force control generation with the %.in target
+clean::
+	touch debian/control.in
+
+debian/%: debian/%.in
+	dh_testdir
+	sed \
+		-e "s#@SONAME@#$(SONAME)#g" \
+		-e "s#@APIVER@#$(APIVER)#g" \
+		-e "s#@VERSION@#$(VERSION)#g" \
+		-e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
+		-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
+		-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \
+		-e "s#@DEV_PKG@#$(DEV_PKG)#g" \
+		-e "s#@DIRECTFB_PKG@#$(DIRECTFB_PKG)#g" \
+		-e "s#@DIRECTFB_DEV_PKG@#$(DIRECTFB_DEV_PKG)#g" \
+		-e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
+		-e "s#@DOC_PKG@#$(DOC_PKG)#g" \
+		-e "s#@BIN_PKG@#$(BIN_PKG)#g" \
+		-e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \
+		-e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \
+		-e "s#@PIXBUF_PKG@#$(PIXBUF_PKG)#g" \
+		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
+		-e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \
+		-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
+		$@.in > $@
+
+clean:: debian/control
+	dh_testdir
+	dh_testroot
+	# remove install and build dirs
+	rm -rf $(installbasedir)
+	rm -rf $(buildbasedir)
+	# restore files from backup (before unpatching)
+	-test -r config.sub.orig && mv -f config.sub.orig config.sub
+	-test -r config.guess.orig && mv -f config.guess.orig config.guess
+	# unapply patches, if any
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+	-rm -rf .pc
+	-rm -rf $(STAMP_DIR)
+	-rm -f $(call dh_subst_files,$(ALL_PKGS))
+	-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
+	dh_clean
+
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
+	dh_testdir
+	dh_testroot
+	dh_install -i
+	dh_installchangelogs -i -N$(BIN_PKG) ChangeLog ChangeLog.*
+	dh_installdocs -i -N$(BIN_PKG) NEWS NEWS.pre-1-0 README
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
+	dh_testdir
+	dh_testroot
+	dh_install -s
+	# empty the dependency_libs in the *.la files
+	sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la
+	# we don't need the rpath in the udeb
+	chrpath -d debian/$(UDEB_PKG)/usr/lib/*directfb*.so.*
+	# fix permissions of binaries below /usr/lib/$(SHARED_PKG)
+	for f in update-gdkpixbuf-loaders update-gtk-immodules; do \
+	    chmod 755 debian/$(SHARED_PKG)/usr/lib/$(SHARED_PKG)/$$f; \
+	done
+	dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.*
+	dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README
+	dh_installman -s
+	# fix the permissions of the development package because it ships
+	# dh_gtkmodules which we need to invoke in this build
+	dh_fixperms -p$(DEV_PKG)
+	# generate a dependency on the Gtk binary version
+	debian/$(DEV_PKG)/usr/bin/dh_gtkmodules -p$(PIXBUF_PKG)
+	# generate an IM module file and a GdkPixbuf loader file for the shared
+	# library
+	LD_LIBRARY_PATH=debian/$(SHARED_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
+	GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \
+	GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \
+		debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
+			-k \
+			-p$(SHARED_PKG)
+	# generate a GdkPixbuf loader config file for the udeb
+	LD_LIBRARY_PATH=debian/$(UDEB_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
+	GTK_QUERYLOADERS=$(installbasedir)/directfb/usr/bin/gdk-pixbuf-query-loaders \
+		debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
+			-k \
+			-p$(UDEB_PKG)
+	dh_installexamples -s
+	dh_link -s
+	dh_strip -s --dbg-package=$(DEBUG_PKG)
+	dh_compress -s
+	dh_fixperms -s -Xusr/lib/$(SHARED_PKG)
+	dh_makeshlibs -p$(SHARED_PKG) \
+		-X$(MODULES_BASE_PATH) \
+		-V"$(SHARED_PKG) (>= $(SHVER))" \
+		--add-udeb=$(UDEB_PKG)
+	dh_makeshlibs -p$(DIRECTFB_PKG) \
+		-X$(MODULES_BASE_PATH) \
+		-V"$(DIRECTFB_PKG) (>= $(SHVER))" \
+		--add-udeb=$(UDEB_PKG)
+	dh_installdeb -s
+	# override shlibs for libraries from this source before computing
+	# dependencies of packages generated from this source; we already have
+	# inter-dependencies expressed manually in the control file, we do not
+	# need the shlibs to add duplicates
+	cat debian/*/DEBIAN/shlibs | \
+		sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \
+			> debian/shlibs.local
+	dh_shlibdeps -s -N$(UDEB_PKG)
+	dh_shlibdeps -p$(UDEB_PKG) -l/usr/lib/libcairo-directfb/lib/
+	-rm -f debian/shlibs.local
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+
+list-missing:
+	perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \
+	    egrep -v '(\.la|usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
+
+binary: binary-indep binary-arch
+.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-0.postinst.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-0.postinst.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+if [ -d /usr/share/doc/@SHARED_PKG@ -a ! -L /usr/share/doc/@SHARED_PKG@ ]; then
+    if rmdir /usr/share/doc/@SHARED_PKG@; then
+        ln -sf @COMMON_PKG@ /usr/share/doc/@SHARED_PKG@
+    else
+        echo "Warning: could not remove /usr/share/doc/@SHARED_PKG@." >&2
+    fi
+fi
+
+# versions prior to 2.10.12-2ubuntu2 used the 2.4.0 binary version and generated module
+# files below /etc/gtk-2.0 which will we can not leave behind (since they
+# reference modules not on the system anymore)
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.10.12-2ubuntu2"; then
+    echo "Removing generated module files coming from the previous Gtk binary version..."
+    rm -v -f /etc/gtk-2.0/gdk-pixbuf.loaders
+    rm -v -f /etc/gtk-2.0/gtk.immodules
+fi
+
+#DEBHELPER#
--- gtk+2.0-2.11.6.orig/debian/gtk-faq.devhelp
+++ gtk+2.0-2.11.6/debian/gtk-faq.devhelp
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+
+<book title="GTK+ FAQ"
+      name="gtk-faq"
+      link="book1.html">
+<chapters>
+  <sub name="General Information" link="c20.html">
+    <sub name="Note: This FAQ is undergoing conversion to GTK+ 2.x" link="c20.html#AEN22"/>
+    <sub name="Before anything else: the greetings" link="x26.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="Authors" link="x52.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="What is GTK+?" link="x81.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="What is the + in GTK+?" link="x90.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="Does the G in GTK+, GDK and GLib stand for?" link="x98.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="Where is the documentation for GTK+?" link="x104.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="Is there a mailing list (or mailing list archive) for
+GTK+?" link="x132.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="How to get help with GTK+" link="x137.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="How to report bugs in GTK+" link="x141.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="Is there a Windows version of GTK+?" link="x157.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+    <sub name="What applications have been written with GTK+?" link="x165.html"/>
+    <sub name="[GTK 2.x]" link="x165.html"/>
+  </sub>
+
+  <sub name="How to find, configure, install, and troubleshoot GTK+" link="c192.html">
+    <sub name="What do I need to compile GTK+?" link="c192.html#FAQ-COMPILE"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+    <sub name="Where can I get GTK+?" link="x234.html"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+    <sub name="How do I configure/compile GTK+?" link="x261.html"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+    <sub name="When compiling GTK+ I get an error like:" link="x278.html"/>
+    <sub name="make:
+file `Makefile' line 456: Syntax error" link="x278.html"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+    <sub name="I've compiled and installed GTK+, but I can't get any
+programs to link with it!" link="x284.html"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+    <sub name="When installing a GTK+ application, configure reports
+that it can't find GTK." link="x306.html"/>
+    <sub name="[GTK 2.x]" link="x306.html"/>
+  </sub>
+
+  <sub name="Development of GTK+" link="c323.html">
+    <sub name="Whats this CVS thing that everyone keeps talking about,
+and how do I access it?" link="c323.html#AEN325"/>
+    <sub name="[GTK 2.x]" link="x381.html"/>
+    <sub name="How can I contribute to GTK+?" link="x359.html"/>
+    <sub name="[GTK 2.x]" link="x381.html"/>
+    <sub name="How do I know if my patch got applied, and if not, why
+not?" link="x367.html"/>
+    <sub name="[GTK 2.x]" link="x381.html"/>
+    <sub name="What is the policy on incorporating new widgets into
+the library?" link="x373.html"/>
+    <sub name="[GTK 2.x]" link="x381.html"/>
+    <sub name="Is anyone working on bindings for languages other than
+C?" link="x381.html"/>
+    <sub name="[GTK 2.x]" link="x381.html"/>
+  </sub>
+
+  <sub name="Development with GTK+: the begining" link="c387.html">
+    <sub name="How do I get started?" link="c387.html#AEN389"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="How do I use the Glade GUI builder with GTK+?" link="x395.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="How do I write security sensitive/SUID/SGID programs with GTK+?
+Is GTK+ secure? What's this GTK_MODULES security hole I heard about?" link="x402.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="I tried to compile a small" link="x409.html"/>
+    <sub name="Hello World" link="x409.html"/>
+    <sub name="of mine,
+but it failed. Any clue?" link="x409.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="What about using the" link="x426.html"/>
+    <sub name="make" link="x426.html"/>
+    <sub name="utility?" link="x426.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="I use the backquote stuff in my makefiles, but my make
+process failed." link="x434.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="I want to add some configure stuff, how could I do
+this?" link="x440.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+    <sub name="I try to debug my GTK+ application with gdb, but it
+hangs my X server when I hit some breakpoint. Any
+Idea?" link="x462.html"/>
+    <sub name="[GTK 2.x]" link="x462.html"/>
+  </sub>
+
+  <sub name="Development with GTK+: general questions" link="c476.html">
+    <sub name="What widgets are in GTK?" link="c476.html#AEN478"/>
+    <sub name="Is GTK+ thread safe? How do I write multi-threaded GTK+
+applications?" link="x482.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="I'm doing some stuff with GTK+ in a separate thread, and
+properly locking with gdk_threads_enter/gdk_threads_leave()
+but the display doesn't update properly." link="x492.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="What's an easy way to run a function in the thread with
+the main loop?" link="x500.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="Why does this strange 'x io error' occur when I" link="x506.html"/>
+    <sub name="fork()" link="x506.html"/>
+    <sub name="in my GTK+ app?" link="x506.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="Why don't the contents of a button move when the button
+is pressed? Here's a patch to make it work that way..." link="x519.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I identifiy a widgets top level window or other
+ancestor?" link="x527.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I get the Window ID of a GtkWindow?" link="x540.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I catch a double click event?" link="x545.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="By the way, what are the differences between signals
+and events?" link="x556.html"/>
+    <sub name="Data I pass to the" link="x567.html"/>
+    <sub name="delete_event" link="x567.html"/>
+    <sub name="(or other event)
+handler gets corrupted." link="x567.html"/>
+    <sub name="I have my signal connected to the the (whatever) event,
+but it seems I don't catch it. What's wrong?" link="x573.html"/>
+    <sub name="I need to add a new signal to a GTK+ widget. Any
+idea?" link="x581.html"/>
+    <sub name="Is it possible to get some text displayed which is
+truncated to fit inside its allocation?" link="x591.html"/>
+    <sub name="How do I make my window modal? / How do I make a single
+window active?" link="x597.html"/>
+    <sub name="Why doesn't my widget (e.g. progressbar)
+update?" link="x602.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I attach data to some GTK+ object/widget?" link="x611.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I remove the data I have attached to an
+object?" link="x624.html"/>
+    <sub name="How do I reparent a widget?" link="x636.html"/>
+    <sub name="How could I get any widgets position?" link="x643.html"/>
+    <sub name="How do I set the size of a widget/window? How do I
+prevent the user resizing my window?" link="x663.html"/>
+    <sub name="[GTK 2.x]" link="x663.html"/>
+    <sub name="How do I add a popup menu to my GTK+ application?" link="x670.html"/>
+    <sub name="How do I disable or enable a widget, such as a
+button?" link="x675.html"/>
+    <sub name="Shouldn't the text argument in the gtk_clist_*
+functions be declared const?" link="x679.html"/>
+    <sub name="How do I render pixels (image data) to the
+screen?" link="x685.html"/>
+    <sub name="How do I create a pixmap without having my window being
+realized/shown?" link="x691.html"/>
+    <sub name="How do I do drag-and-drop?" link="x697.html"/>
+    <sub name="Why does GTK+/GLib leak memory?" link="x703.html"/>
+  </sub>
+
+  <sub name="Development with GTK+: widget specific questions" link="c708.html">
+    <sub name="How do I find out about the selection of a GtkList?" link="c708.html#AEN710"/>
+    <sub name="How do I stop the column headings of a GtkCList
+disappearing when the list is scrolled?" link="x747.html"/>
+    <sub name="I don't want the user of my applications to enter text
+into a GtkCombo. Any idea?" link="x753.html"/>
+    <sub name="How do I catch a combo box change?" link="x760.html"/>
+    <sub name="How can I define a separation line in a menu?" link="x770.html"/>
+    <sub name="How can I right justify a menu, such as Help?" link="x775.html"/>
+    <sub name="How do I add some underlined accelerators to menu
+items?" link="x781.html"/>
+    <sub name="How can I retrieve the text from a GtkMenuItem?" link="x789.html"/>
+    <sub name="How do I right (or otherwise) justify a
+GtkLabel?" link="x799.html"/>
+    <sub name="How do I set the background color of a GtkLabel
+widget?" link="x811.html"/>
+    <sub name="How do I set the color and font of a GtkLabel using a
+Resource File?" link="x815.html"/>
+    <sub name="How do I configure Tooltips in a Resource File?" link="x829.html"/>
+    <sub name="I can't add more than (something like) 2000 chars in a
+GtkEntry. What's wrong?" link="x834.html"/>
+    <sub name="How do I make a GtkEntry widget activate on pressing
+the Return key?" link="x839.html"/>
+    <sub name="How do I validate/limit/filter the input to a GtkEntry?" link="x843.html"/>
+    <sub name="[GTK 2.x]" link="x843.html"/>
+    <sub name="How do I use horizontal scrollbars with a GtkText widget?" link="x848.html"/>
+    <sub name="How do I change the font of a GtkText widget?" link="x851.html"/>
+    <sub name="How do I set the cursor position in a GtkText
+object?" link="x857.html"/>
+  </sub>
+
+  <sub name="About GDK" link="c867.html">
+    <sub name="What is GDK?" link="c867.html#AEN869"/>
+    <sub name="How do I use color allocation?" link="x872.html"/>
+  </sub>
+
+  <sub name="About GLib" link="c876.html">
+    <sub name="What is GLib?" link="c876.html#AEN878"/>
+    <sub name="How can I use the doubly linked lists?" link="x895.html"/>
+    <sub name="Memory does not seem to be released when I free the
+list nodes I've allocated" link="x902.html"/>
+    <sub name="Why use g_print, g_malloc, g_strdup and fellow glib
+functions?" link="x909.html"/>
+    <sub name="What's a GScanner and how do I use one?" link="x919.html"/>
+  </sub>
+
+  <sub name="GTK+ FAQ Contributions, Maintainers and Copyright" link="c958.html">
+  </sub>
+
+</chapters>
+
+</book>
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-0.postrm.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-0.postrm.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  purge)
+    rm -rf /etc/gtk-@APIVER@
+  ;;
+esac
+
+#DEBHELPER#
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-dev.install.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-dev.install.in
@@ -0,0 +1,14 @@
+# from Debian
+debian/dh_gtkmodules usr/bin
+# from the shared flavor
+debian/install/shared/usr/bin/gdk-pixbuf-csource  usr/bin
+debian/install/shared/usr/bin/gtk-builder-convert usr/bin
+debian/install/shared/usr/include usr
+debian/install/shared/usr/lib/*.la usr/lib
+debian/install/shared/usr/lib/*.so usr/lib
+debian/install/shared/usr/lib/pkgconfig usr/lib
+debian/install/shared/usr/lib/gtk-@APIVER@/include usr/lib/gtk-@APIVER@
+debian/install/shared/usr/share/aclocal usr/share
+debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/
+# from the static flavor
+debian/install/static/usr/lib/*.a usr/lib
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.doc-base.gtk2-tutorial
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.doc-base.gtk2-tutorial
@@ -0,0 +1,18 @@
+Document: gtk2-tutorial
+Title: GTK+2.0 Tutorial
+Author: Tony Gale and Ian Main
+Abstract: GTK (GIMP Toolkit) is a library for creating graphical user
+ interfaces. It is licensed using the LGPL license, so you can develop
+ open software, free software, or even commercial non-free software
+ using GTK without having to spend anything for licenses or royalties.
+ .
+ This tutorial is an attempt to document as much as possible of GTK,
+ but it is by no means complete. This tutorial assumes a good
+ understanding of C, and how to create C programs. It would be a great
+ benefit for the reader to have previous X programming experience, but
+ it shouldn't be necessary.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html
+Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.links.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.links.in
@@ -0,0 +1,7 @@
+usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk
+usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf
+usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk
+usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject
+usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DOC_PKG@/pango
--- gtk+2.0-2.11.6.orig/debian/gtk-options.7
+++ gtk+2.0-2.11.6/debian/gtk-options.7
@@ -0,0 +1,107 @@
+.\" gtk-options.7 - Standard Command Line Options for Gnome Programs
+.\" Copyright 2003  Jochen Voss <voss@debian.org>
+.\" You may redistribute and modify this manual page
+.\" under the terms of the GPL.
+.TH gtk\-options 7 "2003\-10\-20" "GTK+ 1.2" "GTK+ User\'s Manual"
+.SH NAME
+gtk\-options \- Standard Command Line Options for GTK+ Programs
+.SH SYNOPSIS
+.IR "program " [ "standard options" "] [" "specific options" "] " arguments
+.SH DESCRIPTION
+This manual page describes the command line options, which are common
+to all GTK+ based applications.
+.SH OPTIONS
+.SS GTK+ OPTIONS
+.TP
+\fB\-\-gtk\-module\fR=\fIMODULE\fR
+Load an additional Gtk module.
+.TP
+\fB\-\-gtk\-debug\fR=\fIFLAGS\fR
+A colon separated list of GTK+ debugging flags to set.
+Valid flags are
+.IR objects ,
+.IR misc ,
+.IR signals ,
+.IR dnd ,
+and
+.IR plugsocket .
+The special value
+.I all
+enables all flags.
+.TP
+\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR
+GTK+ debugging flags to unset.  Use this options to override the
+.I GTK_DEBUG
+environment variable.
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make all warnings fatal.
+.SS GDK OPTIONS
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+Set the X display to use.  Use this option to override the
+.I DISPLAY
+environment variable.
+.TP
+\fB\-\-screen\fR=\fISCREEN\fR
+X screen to use.  Use this options to override the screen part
+of the
+.I DISPLAY
+environment variable (see the
+.I DISPLAY NAMES
+section of the
+.IR X (7x)
+manual page).
+.TP
+\fB\-\-sync\fR
+Make X calls synchronous.  This slows down the program considerably,
+but may be useful for debugging purposes.
+.TP
+\fB\-\-no\-xshm\fR
+Do not use the X server\'s XSHM shared memory extension.  This slows down the
+program.
+.TP
+\fB\-\-name\fR=\fINAME\fR
+Program name as used by the window manager.
+.TP
+\fB\-\-class\fR=\fICLASS\fR
+Program class as used by the window manager.
+.HP
+\fB\-\-gxid_host\fR=\fIHOST\fR
+.HP
+\fB\-\-gxid_port\fR=\fIPORT\fR
+.HP
+\fB\-\-xim\-preedit\fR
+.TP
+\fB\-\-xim\-status\fR
+Control the X input method.
+.TP
+\fB\-\-gdk\-debug\fR=\fIFLAGS\fR
+A colon\-separated list of GDK debugging flags to set.  This only works
+if your GDK library was compile with debugging support.  Valid flags
+are
+.IR events ,
+.IR misc ,
+.IR dnd ,
+.IR color\-context ,
+and
+.IR xim .
+The special value
+.I all
+enables all valid flags.
+.TP
+\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR
+A colon\-separated list of GDK debugging flags to unset.
+Use this options to override the
+.I GDK_DEBUG
+environment variable.
+.SH "SEE ALSO"
+.BR X (7x),
+the GTK+ documentation, and
+the GDK documentation.
+.PP
+For most GTK+ programs there will be additional command line options,
+which are specific to the program.  These will be explained in the
+application\'s documentation.
+.SH AUTHOR
+This manual page was written by Jochen Voss <voss@debian.org>.
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.doc-base.gdk-pixbuf
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.doc-base.gdk-pixbuf
@@ -0,0 +1,12 @@
+Document: gdk-pixbuf
+Title: GDK-pixbuf Reference Manual
+Author: Federico Mena Quintero
+Abstract: The GDK-pixbuf library is used to manipulate images and
+ other image-like objects, similar to the imlib library.  GDK and
+ GTK+ use it for image storage and manipulation.  This document
+ covers programming using this library.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/index.html
+Files: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/*.html
--- gtk+2.0-2.11.6.orig/debian/libgtk-directfb-2.0-0.install
+++ gtk+2.0-2.11.6/debian/libgtk-directfb-2.0-0.install
@@ -0,0 +1,2 @@
+# from the directfb flavor
+debian/install/directfb/usr/lib/*directfb*.so.* usr/lib
--- gtk+2.0-2.11.6.orig/debian/gtk2.0-examples.install.in
+++ gtk+2.0-2.11.6/debian/gtk2.0-examples.install.in
@@ -0,0 +1,3 @@
+# from the shared flavor
+debian/install/shared/usr/bin/gtk-demo usr/bin
+debian/install/shared/usr/share/gtk-@APIVER@/demo usr/share/gtk-@APIVER@
--- gtk+2.0-2.11.6.orig/debian/update-icon-caches
+++ gtk+2.0-2.11.6/debian/update-icon-caches
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    ""|-h|--help)
+        echo "Usage: $0 directory [ ... ]"
+        exit 1
+        ;;
+esac
+
+for dir in "$@"; do
+    if [ ! -d "$dir" ]; then
+        echo "$dir is not a directory"
+        exit 2
+    fi
+    if [ -f "$dir"/index.theme ]; then
+        if [ -f "$dir"/icon-theme.cache ]; then
+            # The cache already exists, regenerate it
+            gtk-update-icon-cache --force --quiet "$dir"
+        fi
+    else
+        # No more index.theme, remove the cache if it exists
+        rm -f "$dir"/icon-theme.cache
+        rmdir -p --ignore-fail-on-non-empty "$dir"
+    fi
+done
+
--- gtk+2.0-2.11.6.orig/debian/dh_gtkmodules.in
+++ gtk+2.0-2.11.6/debian/dh_gtkmodules.in
@@ -0,0 +1,229 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_gtkmodules - create Gtk module files for Gtk modules
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+use Cwd;
+
+=head1 SYNOPSIS
+
+B<dh_gtkmodules> [S<I<debhelper options>>]
+
+=head1 DESCRIPTION
+
+B<dh_gtkmodules> is a debhelper program that handles correctly
+generating Gtk module files for GdkPixbuf loaders and IM modules
+that it finds in the standard module directory.
+
+This command automatically adds a "<package>.loaders" file to the
+current package with the package name or "<package>.immodules" if it
+finds any GdkPixbuf loaders or IM modules.
+
+If this command finds the versionned standard module directory in the
+current package, it will generate a dependency on the earliest Gtk
+version that Gtk currently has compatibility for in ${misc:Depends}
+("binary version").
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-k>
+
+Do not generate any dependencies in ${misc:Depends}.
+
+=cut
+
+init();
+
+# 'abs_path' from Cwd resolves symlinks, and we don't want that to happen
+# (otherwise it's harder to remove the prefix of the generated output)
+sub make_absolute_path {
+    my $path = shift;
+    if ($path =~ m#^/#) {
+        return $path;
+    }
+    my $cwd = getcwd;
+    return "$cwd/$path";
+}
+
+# gdk-pixbuf-query-loaders helper (generates a GdkPixbuf loaders module
+# file on its stdout with *.so passed on its command-line)
+my $queryloaders;
+if ($ENV{GTK_QUERYLOADERS}) {
+    $queryloaders = $ENV{GTK_QUERYLOADERS};
+} else {
+    $queryloaders = '/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders';
+}
+
+# gtk-query-immodules-2.0 helper (generates an IM module file on its
+# stdout with *.so passed on its command-line)
+my $queryimmodules;
+if ($ENV{GTK_QUERYIMMODULES}) {
+    $queryimmodules = $ENV{GTK_QUERYIMMODULES};
+} else {
+    $queryimmodules = '/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0';
+}
+
+# relative Gtk base module path
+my $modules_base_path = '@MODULES_BASE_PATH@';
+
+# relative path to GdkPixbuf loaders modules (separated by ":")
+my $loaders_modules_path = "$modules_base_path/loaders";
+# relative directory to store the generated loader module file
+my $loader_module_files_d = "$modules_base_path/loader-files.d";
+
+# relative path to IM modules (separated by ":")
+my $im_modules_path = "$modules_base_path/immodules";
+# relative directory to store the generated IM module file
+my $im_module_files_d = "$modules_base_path/immodule-files.d";
+
+# Gtk binary version virtual Provide
+my $gtk_binver_dep = '@GTK_BINVER_DEP@';
+
+sub find_modules {
+    # where to store the modules we find
+    my $modules_ref = shift;
+    # base directory to prepend to the list of locations
+    my $basedir = shift;
+    # list of locations to search relative to $basedir separated with ":"
+    my $path = shift;
+
+    foreach (map("$basedir/$_", split(/:/, $path))) {
+        # it's necessary to make the path absolute to strip the build-time
+        # prefix later on
+        my $path = make_absolute_path($_);
+        if (! -e $path) {
+            warning("skipping $path.");
+            next;
+        }
+        if (-d $path) {
+            # if path is a directory (or symlink to a directory), search for
+            # *.so files or symlinks
+            open(FIND,
+              "find '$path' -name '*.so' \\( -type f -or -type l \\) |")
+              or die "Can't run find: $!";
+            while (<FIND>) {
+                chomp;
+                push @$modules_ref, $_;
+            }
+            close FIND;
+        } elsif (-f $path or -l $path) {
+            # if path is a file or symlink, simply add it to the list
+            push @$modules_ref, $path;
+        } else {
+            error("$path has unknown file type.");
+        }
+    }
+}
+
+sub query_modules {
+    # absolute pathname to query helper
+    my $querymodules = shift;
+    # base directory to prepend to the output module file and to strip
+    # of the output
+    my $basedir = shift;
+    # relative directory where to write the module file
+    my $module_files_d = shift;
+    # relative path of the module file
+    my $module_file = shift;
+    # modules to query
+    my @modules = @_;
+
+    my $do_query = join ' ', $querymodules, @modules;
+    open(QUERY, "$do_query 2>&1 |")
+        or die "Can't query modules with $querymodules: $!";
+
+    doit("rm", "-f", "$module_file");
+    if (! -d "$basedir/$module_files_d") {
+        doit("install", "-d", "$basedir/$module_files_d");
+    }
+    complex_doit("printf '%s\\n' '# automatically generated by dh_gtkmodules, do not edit' >>$module_file");
+
+    my $absolute_basedir = make_absolute_path($basedir);
+    my $n_lines = 0;
+    while (<QUERY>) {
+        next if m/^#/;
+        chomp;
+        # if some module couldn't be loaded by the query helper, bail out
+        if (m#^g_module_open\(\) failed for #) {
+            error("$querymodules could not load a module:\n$_\nYou should probably make the libraries built by your package available via LD_LIBRARY_PATH.");
+        }
+        # strip build-time prefix from output
+        if (m#^\Q"$absolute_basedir/\E#) {
+            s#^\Q"$absolute_basedir/\E#"/#;
+        }
+        complex_doit("printf '%s\\n' '$_' >>$module_file");
+        $n_lines++;
+    }
+    # nothing written to the module file, fail miserably
+    if (0 == $n_lines) {
+        doit("rm", "-f", "$module_file");
+        error("Internal error: could not find any module in the output of $querymodules.");
+    }
+
+    doit("chmod", 644, "$module_file");
+    doit("chown", "0:0", "$module_file");
+
+    close QUERY;
+}
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+    my $tmp = tmpdir($package);
+    my @loaders_modules = ();
+    my @im_modules = ();
+
+    # if the versionned directory isn't present, give up on package
+    if (! -d "$tmp/$modules_base_path") {
+        next;
+    }
+
+    # since the versionned module directory exists, generate a dependency
+    # on the Gtk binary version
+    if (! $dh{K_FLAG}) {
+        addsubstvar($package, "misc:Depends", $gtk_binver_dep);
+    }
+
+    # search for specific module types
+    find_modules(\@loaders_modules, $tmp, $loaders_modules_path);
+    find_modules(\@im_modules, $tmp, $im_modules_path);
+
+    # if no modules of these types were found, we're done
+    if (0 == @loaders_modules + @im_modules) {
+        warning("no GdkPixbuf loaders or Gtk IM modules found for package $package.");
+        next;
+    }
+
+    if (@loaders_modules) {
+        query_modules($queryloaders,
+                      $tmp,
+                      $loader_module_files_d,
+                      "$tmp/$loader_module_files_d/$package.loaders",
+                      @loaders_modules);
+    }
+    if (@im_modules) {
+        query_modules($queryimmodules,
+                      $tmp,
+                      $im_module_files_d,
+                      "$tmp/$im_module_files_d/$package.immodules",
+                      @im_modules);
+    }
+}
+
+=head1 SEE ALSO
+
+L<debhelper>
+
+This program relies on Debhelper, but is shipped with the Gtk
+development files.
+
+=head1 AUTHOR
+
+Loic Minier <lool@dooz.org>
+
+=cut
--- gtk+2.0-2.11.6.orig/debian/gtk2.0-examples.examples
+++ gtk+2.0-2.11.6/debian/gtk2.0-examples.examples
@@ -0,0 +1,2 @@
+# from the source
+examples/*
--- gtk+2.0-2.11.6.orig/debian/update-gdkpixbuf-loaders.in
+++ gtk+2.0-2.11.6/debian/update-gdkpixbuf-loaders.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# this script is a no-op since 2.10.3-2
+exit 0
+
+set -e
+
+VERSION="@VERSION@"
+APIVER="@APIVER@"
+SHARED_PKG="@SHARED_PKG@"
+TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
+
+echo -n "Updating the gdk-pixbuf loaders list for Gtk+ $VERSION..."
+"/usr/lib/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE
+if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
+    echo "no gdk-pixbuf loader found."
+else
+    echo "done."
+fi
+if ! test -d "/etc/gtk-$APIVER"; then
+    echo -n "Creating /etc/gtk-$APIVER..."
+    mkdir "/etc/gtk-$APIVER"
+    echo "done."
+fi
+cp "$TMPFILE" "/etc/gtk-$APIVER/gdk-pixbuf.loaders"
+chmod 644 "/etc/gtk-$APIVER/gdk-pixbuf.loaders"
+
+rm -f "$TMPFILE"
--- gtk+2.0-2.11.6.orig/debian/update-gtk-immodules.in
+++ gtk+2.0-2.11.6/debian/update-gtk-immodules.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# this script is a no-op since 2.10.3-2
+exit 0
+
+set -e
+
+VERSION="@VERSION@"
+GTK_BINARY_VERSION="@GTK_BINARY_VERSION@"
+APIVER="@APIVER@"
+SHARED_PKG="@SHARED_PKG@"
+TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
+
+echo -n "Updating the IM modules list for Gtk+ $VERSION..."
+"/usr/lib/$SHARED_PKG/gtk-query-immodules-$APIVER" \
+    $(find "/usr/lib/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \
+    > "$TMPFILE"
+if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
+    echo "no Gtk+ IM modules found."
+else
+    echo "done."
+fi
+if ! test -d "/etc/gtk-$APIVER"; then
+    echo -n "Creating /etc/gtk-$APIVER..."
+    mkdir "/etc/gtk-$APIVER"
+    echo "done."
+fi
+cp "$TMPFILE" "/etc/gtk-$APIVER/gtk.immodules"
+chmod 644 "/etc/gtk-$APIVER/gtk.immodules"
+
+rm -f "$TMPFILE"
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-0-dbg.links.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-0-dbg.links.in
@@ -0,0 +1 @@
+usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEBUG_PKG@
--- gtk+2.0-2.11.6.orig/debian/update-gtk-immodules.8
+++ gtk+2.0-2.11.6/debian/update-gtk-immodules.8
@@ -0,0 +1,31 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH UPDATE-GTK-IMMODULES 8 "13 March 2002"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+update-gtk-immodules \- Update wrapper script for the GTK+ IM modules list
+.SH SYNOPSIS
+.B update-gtk-immodules
+.I package\| version
+.SH DESCRIPTION
+\fIupdate-gtk-immodules\fP is a wrapper script for updating /etc/gtk-2.0/gtk.immodules using \fIgtk-query-immodules-2.0\fP.
+.br
+\fIupdate-gtk-immodules\fP get a argument and /etc/gtk-2.0/gtk.immodules for that version will be generated by \fIgtk-query-immodules-2.0\fP.
+.SH SEE ALSO
+.BR gtk-query-immodules-2.0 (1)
+.SH AUTHOR
+This manual page was written by Akira TAGOH <tagoh@debian.org>,
+for the Debian GNU/Linux system.
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-doc.install.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-doc.install.in
@@ -0,0 +1,9 @@
+# from Debian
+debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq
+debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial
+# from the shared flavor
+debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc
+# from the source
+docs/faq/html usr/share/doc/@DOC_PKG@/faq
+docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial
+docs/*.txt usr/share/doc/@DOC_PKG@
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-common.preinst.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-common.preinst.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ -L /usr/share/doc/@COMMON_PKG@ ]; then
+    rm -f /usr/share/doc/@COMMON_PKG@
+fi
+
+#DEBHELPER#
--- gtk+2.0-2.11.6.orig/debian/libgtk-directfb-2.0-0.links.in
+++ gtk+2.0-2.11.6/debian/libgtk-directfb-2.0-0.links.in
@@ -0,0 +1 @@
+usr/share/doc/@SHARED_PKG@ usr/share/doc/@DIRECTFB_PKG@
--- gtk+2.0-2.11.6.orig/debian/gtk-tutorial.devhelp
+++ gtk+2.0-2.11.6/debian/gtk-tutorial.devhelp
@@ -0,0 +1,284 @@
+<?xml version="1.0"?>
+
+<book title="GTK+ 2.0 Tutorial"
+      name="gtk-tutorial"
+      link="book1.html">
+<chapters>
+  <sub name="Tutorial Availability" link="c17.html">
+  </sub>
+
+  <sub name="Introduction" link="c24.html">
+  </sub>
+
+  <sub name="Getting Started" link="c58.html">
+    <sub name="Hello World in GTK" link="c58.html#SEC-HELLOWORLD"/>
+    <sub name="Compiling Hello World" link="x130.html"/>
+    <sub name="Theory of Signals and Callbacks" link="x178.html"/>
+    <sub name="Events" link="x201.html"/>
+    <sub name="Stepping Through Hello World" link="x300.html"/>
+  </sub>
+
+  <sub name="Moving On" link="c345.html">
+    <sub name="Data Types" link="c345.html#SEC-DATATYPES"/>
+    <sub name="More on Signal Handlers" link="x354.html"/>
+    <sub name="An Upgraded Hello World" link="x364.html"/>
+  </sub>
+
+  <sub name="Packing Widgets" link="c374.html">
+    <sub name="Theory of Packing Boxes" link="c374.html#SEC-THEORYOFPACKINGBOXES"/>
+    <sub name="Details of Boxes" link="x383.html"/>
+    <sub name="Packing Demonstration Program" link="x406.html"/>
+    <sub name="Packing Using Tables" link="x409.html"/>
+    <sub name="Table Packing Example" link="x461.html"/>
+  </sub>
+
+  <sub name="Widget Overview" link="c470.html">
+    <sub name="Casting" link="c470.html#SEC-CASTING"/>
+    <sub name="Widget Hierarchy" link="x498.html"/>
+    <sub name="Widgets Without Windows" link="x502.html"/>
+  </sub>
+
+  <sub name="The Button Widget" link="c510.html">
+    <sub name="Normal Buttons" link="c510.html#SEC-NORMALBUTTONS"/>
+    <sub name="Toggle Buttons" link="x539.html"/>
+    <sub name="Check Buttons" link="x556.html"/>
+    <sub name="Radio Buttons" link="x563.html"/>
+  </sub>
+
+  <sub name="Adjustments" link="c584.html">
+    <sub name="Creating an Adjustment" link="c584.html#SEC-CREATINGANADJUSTMENT"/>
+    <sub name="Using Adjustments the Easy Way" link="x608.html"/>
+    <sub name="Adjustment Internals" link="x623.html"/>
+  </sub>
+
+  <sub name="Range Widgets" link="c654.html">
+    <sub name="Scrollbar Widgets" link="c654.html#SEC-SCROLLBARWIDGETS"/>
+    <sub name="Scale Widgets" link="x666.html">
+      <sub name="Creating a Scale Widget" link="x666.html#AEN669"/>
+      <sub name="Functions and Signals (well, functions, at least)" link="x666.html#AEN681"/>
+    </sub>
+    <sub name="Common Range Functions" link="x705.html">
+      <sub name="Setting the Update Policy" link="x705.html#AEN709"/>
+      <sub name="Getting and Setting Adjustments" link="x705.html#AEN734"/>
+    </sub>
+    <sub name="Key and Mouse bindings" link="x746.html"/>
+    <sub name="Example" link="x764.html"/>
+  </sub>
+
+  <sub name="Miscellaneous Widgets" link="c774.html">
+    <sub name="Labels" link="c774.html#SEC-LABELS"/>
+    <sub name="Arrows" link="x814.html"/>
+    <sub name="The Tooltips Object" link="x831.html"/>
+    <sub name="Progress Bars" link="x850.html"/>
+    <sub name="Dialogs" link="x882.html"/>
+    <sub name="Rulers" link="x912.html"/>
+    <sub name="Statusbars" link="x940.html"/>
+    <sub name="Text Entries" link="x960.html"/>
+    <sub name="Spin Buttons" link="x988.html"/>
+    <sub name="Combo Box" link="x1084.html"/>
+    <sub name="Calendar" link="x1121.html"/>
+    <sub name="Color Selection" link="x1205.html"/>
+    <sub name="File Selections" link="x1228.html"/>
+  </sub>
+
+  <sub name="Container Widgets" link="c1247.html">
+    <sub name="The EventBox" link="c1247.html#SEC-EVENTBOX"/>
+    <sub name="The Alignment widget" link="x1264.html"/>
+    <sub name="Fixed Container" link="x1279.html"/>
+    <sub name="Layout Container" link="x1300.html"/>
+    <sub name="Frames" link="x1312.html"/>
+    <sub name="Aspect Frames" link="x1338.html"/>
+    <sub name="Paned Window Widgets" link="x1356.html"/>
+    <sub name="Viewports" link="x1373.html"/>
+    <sub name="Scrolled Windows" link="x1389.html"/>
+    <sub name="Button Boxes" link="x1411.html"/>
+    <sub name="Toolbar" link="x1423.html"/>
+    <sub name="Notebooks" link="x1471.html"/>
+  </sub>
+
+  <sub name="Menu Widget" link="c1520.html">
+    <sub name="Manual Menu Creation" link="c1520.html#SEC-MANUALMENUCREATION"/>
+    <sub name="Manual Menu Example" link="x1598.html"/>
+    <sub name="Using ItemFactory" link="x1607.html">
+      <sub name="ItemFactory entries" link="x1607.html#SEC-ITEMFACTORYENTRIES"/>
+      <sub name="Creating an ItemFactory" link="x1607.html#SEC-ITEMFACTORYCREATION"/>
+      <sub name="Making use of the menu and its menu items" link="x1607.html#SEC-USINGMENUANDITEMS"/>
+    </sub>
+    <sub name="Item Factory Example" link="x1718.html"/>
+  </sub>
+
+  <sub name="Undocumented Widgets" link="c1722.html">
+    <sub name="Accel Label" link="c1722.html#SEC-ACCELLABEL"/>
+    <sub name="Option Menu" link="x1730.html"/>
+    <sub name="Menu Items" link="x1733.html">
+      <sub name="Check Menu Item" link="x1733.html#SEC-CHECKMENUITEM"/>
+      <sub name="Radio Menu Item" link="x1733.html#SEC-RADIOMENUITEM"/>
+      <sub name="Separator Menu Item" link="x1733.html#SEC-SEPARATORMENUITEM"/>
+      <sub name="Tearoff Menu Item" link="x1733.html#SEC-TEAROFFMENUITEM"/>
+    </sub>
+    <sub name="Curves" link="x1748.html"/>
+    <sub name="Drawing Area" link="x1751.html"/>
+    <sub name="Font Selection Dialog" link="x1754.html"/>
+    <sub name="Message Dialog" link="x1757.html"/>
+    <sub name="Gamma Curve" link="x1760.html"/>
+    <sub name="Image" link="x1763.html"/>
+    <sub name="Plugs and Sockets" link="x1766.html"/>
+    <sub name="Tree View" link="x1769.html"/>
+    <sub name="Text View" link="x1772.html"/>
+  </sub>
+
+  <sub name="Setting Widget Attributes" link="c1775.html">
+  </sub>
+
+  <sub name="Timeouts, IO and Idle Functions" link="c1780.html">
+    <sub name="Timeouts" link="c1780.html#SEC-TIMEOUTS"/>
+    <sub name="Monitoring IO" link="x1791.html"/>
+    <sub name="Idle Functions" link="x1811.html"/>
+  </sub>
+
+  <sub name="Advanced Event and Signal Handling" link="c1818.html">
+    <sub name="Signal Functions" link="c1818.html#SEC-SIGNALFUNCTIONS">
+      <sub name="Connecting and Disconnecting Signal Handlers" link="c1818.html#AEN1822"/>
+      <sub name="Blocking and Unblocking Signal Handlers" link="c1818.html#AEN1825"/>
+      <sub name="Emitting and Stopping Signals" link="c1818.html#AEN1828"/>
+    </sub>
+    <sub name="Signal Emission and Propagation" link="x1831.html"/>
+  </sub>
+
+  <sub name="Managing Selections" link="c1855.html">
+    <sub name="Overview" link="c1855.html#SEC-SELECTIONSOVERVIEW"/>
+    <sub name="Retrieving the selection" link="x1871.html"/>
+    <sub name="Supplying the selection" link="x1894.html"/>
+  </sub>
+
+  <sub name="Drag-and-drop (DND)" link="c1920.html">
+    <sub name="Overview" link="c1920.html#SEC-DRAGANDDROPOVERVIEW"/>
+    <sub name="Properties" link="x1942.html"/>
+    <sub name="Functions" link="x1960.html">
+      <sub name="Setting up the source widget" link="x1960.html#SEC-DNDSOURCEWIDGETS"/>
+      <sub name="Signals on the source widget:" link="x1960.html#SEC-SIGNALSONSOURCEWIDGETS"/>
+      <sub name="Setting up a destination widget:" link="x1960.html#SEC-DNDDESTWIDGETS"/>
+      <sub name="Signals on the destination widget:" link="x1960.html#SEC-SIGNALSONDESTWIDGETS"/>
+    </sub>
+  </sub>
+
+  <sub name="GLib" link="c2044.html">
+    <sub name="Definitions" link="c2044.html#SEC-DEFINITIONS"/>
+    <sub name="Doubly Linked Lists" link="x2056.html"/>
+    <sub name="Singly Linked Lists" link="x2076.html"/>
+    <sub name="Memory Management" link="x2080.html"/>
+    <sub name="Timers" link="x2097.html"/>
+    <sub name="String Handling" link="x2101.html"/>
+    <sub name="Utility and Error Functions" link="x2116.html"/>
+  </sub>
+
+  <sub name="GTK's rc Files" link="c2137.html">
+    <sub name="Functions For rc Files" link="c2137.html#SEC-FUNCTIONSFORRCFILES"/>
+    <sub name="GTK's rc File Format" link="x2157.html"/>
+    <sub name="Example rc file" link="x2198.html"/>
+  </sub>
+
+  <sub name="Writing Your Own Widgets" link="c2201.html">
+    <sub name="Overview" link="c2201.html#SEC-WIDGETSOVERVIEW"/>
+    <sub name="The Anatomy Of A Widget" link="x2210.html"/>
+    <sub name="Creating a Composite widget" link="x2221.html">
+      <sub name="Introduction" link="x2221.html#AEN2223"/>
+      <sub name="Choosing a parent class" link="x2221.html#AEN2234"/>
+      <sub name="The header file" link="x2221.html#AEN2237"/>
+      <sub name="The" link="x2221.html#AEN2314"/>
+      <sub name="_get_type()" link="x2221.html#AEN2249"/>
+      <sub name="function" link="x2221.html#AEN2314"/>
+      <sub name="The" link="x2221.html#AEN2314"/>
+      <sub name="_class_init()" link="x2221.html#AEN2261"/>
+      <sub name="function" link="x2221.html#AEN2314"/>
+      <sub name="The" link="x2221.html#AEN2314"/>
+      <sub name="_init()" link="x2221.html#AEN2314"/>
+      <sub name="function" link="x2221.html#AEN2314"/>
+      <sub name="And the rest..." link="x2221.html#AEN2319"/>
+    </sub>
+    <sub name="Creating a widget from scratch" link="x2331.html">
+      <sub name="Introduction" link="x2331.html#AEN2333"/>
+      <sub name="Displaying a widget on the screen" link="x2331.html#AEN2340"/>
+      <sub name="The origins of the Dial Widget" link="x2331.html#AEN2373"/>
+      <sub name="The Basics" link="x2331.html#AEN2377"/>
+      <sub name="gtk_dial_realize()" link="x2331.html#AEN2389"/>
+      <sub name="Size negotiation" link="x2331.html#AEN2398"/>
+      <sub name="gtk_dial_expose()" link="x2331.html#AEN2406"/>
+      <sub name="Event handling" link="x2331.html#AEN2412"/>
+      <sub name="Possible Enhancements" link="x2331.html#AEN2428"/>
+    </sub>
+    <sub name="Learning More" link="x2440.html"/>
+  </sub>
+
+  <sub name="Scribble, A Simple Example Drawing Program" link="c2443.html">
+    <sub name="Overview" link="c2443.html#SEC-SCRIBBLEOVERVIEW"/>
+    <sub name="Event Handling" link="x2452.html"/>
+    <sub name="The DrawingArea Widget, And Drawing" link="x2491.html"/>
+    <sub name="Adding XInput support" link="x2550.html">
+      <sub name="Enabling extended device information" link="x2550.html#AEN2578"/>
+      <sub name="Using extended device information" link="x2550.html#AEN2591"/>
+      <sub name="Finding out more about a device" link="x2550.html#AEN2609"/>
+      <sub name="Further sophistications" link="x2550.html#SEC-FURTHERSOPHISTICATIONS"/>
+    </sub>
+  </sub>
+
+  <sub name="Tips For Writing GTK Applications" link="c2636.html">
+  </sub>
+
+  <sub name="Contributing" link="c2641.html">
+  </sub>
+
+  <sub name="Credits" link="c2648.html">
+  </sub>
+
+  <sub name="Tutorial Copyright and Permissions Notice" link="c2710.html">
+  </sub>
+
+  <sub name="GTK Signals" link="a2719.html">
+    <sub name="GtkObject" link="a2719.html#SEC-GTKOBJECT"/>
+    <sub name="GtkWidget" link="x2725.html"/>
+    <sub name="GtkData" link="x2728.html"/>
+    <sub name="GtkContainer" link="x2731.html"/>
+    <sub name="GtkCalendar" link="x2734.html"/>
+    <sub name="GtkEditable" link="x2737.html"/>
+    <sub name="GtkNotebook" link="x2740.html"/>
+    <sub name="GtkList" link="x2743.html"/>
+    <sub name="GtkMenuShell" link="x2746.html"/>
+    <sub name="GtkToolbar" link="x2749.html"/>
+    <sub name="GtkButton" link="x2752.html"/>
+    <sub name="GtkItem" link="x2755.html"/>
+    <sub name="GtkWindow" link="x2758.html"/>
+    <sub name="GtkHandleBox" link="x2761.html"/>
+    <sub name="GtkToggleButton" link="x2764.html"/>
+    <sub name="GtkMenuItem" link="x2767.html"/>
+    <sub name="GtkCheckMenuItem" link="x2770.html"/>
+    <sub name="GtkInputDialog" link="x2773.html"/>
+    <sub name="GtkColorSelection" link="x2776.html"/>
+    <sub name="GtkStatusBar" link="x2779.html"/>
+    <sub name="GtkCurve" link="x2782.html"/>
+    <sub name="GtkAdjustment" link="x2785.html"/>
+  </sub>
+
+  <sub name="GDK Event Types" link="a2788.html">
+  </sub>
+
+  <sub name="Code Examples" link="a2922.html">
+    <sub name="Tictactoe" link="a2922.html#SEC-TICTACTOE">
+      <sub name="tictactoe.h" link="a2922.html#AEN2927"/>
+      <sub name="tictactoe.c" link="a2922.html#AEN2930"/>
+      <sub name="ttt_test.c" link="a2922.html#AEN2933"/>
+    </sub>
+    <sub name="GtkDial" link="x2936.html">
+      <sub name="gtkdial.h" link="x2936.html#AEN2938"/>
+      <sub name="gtkdial.c" link="x2936.html#AEN2941"/>
+      <sub name="dial_test.c" link="x2936.html#AEN2944"/>
+    </sub>
+    <sub name="Scribble" link="x2947.html">
+      <sub name="scribble-simple.c" link="x2947.html#AEN2949"/>
+      <sub name="scribble-xinput.c" link="x2947.html#AEN2952"/>
+    </sub>
+  </sub>
+
+</chapters>
+
+</book>
--- gtk+2.0-2.11.6.orig/debian/libgtk2.0-0.links.in
+++ gtk+2.0-2.11.6/debian/libgtk2.0-0.links.in
@@ -0,0 +1 @@
+usr/share/doc/@COMMON_PKG@ usr/share/doc/@SHARED_PKG@
--- gtk+2.0-2.11.6.orig/debian/README.Debian
+++ gtk+2.0-2.11.6/debian/README.Debian
@@ -0,0 +1,50 @@
+GTK+2.0 for Debian
+-------------------
+
+Static libraries issue
+======================
+If you wish to link the GTK+ 2.0 libraries statically into your program,
+please note that you *can not* use the '-static' flag to gcc.
+Instead, you have to link your program *dynamically* and link *only*
+the GTK+ 2.0 libraries statically, like this:
+
+$ gcc -export-dynamic -o foo foo.c \
+  -Wl,-Bstatic `pkg-config --cflags --libs gtk+-2.0` -Wl,-Bdynamic \
+  [other dynamically linked libraries]
+
+The reason for this is that GTK+ 2.0 uses dlopen(3) in order to load
+some modules.  Undefined symbols in these modules are resolved by the
+dynamic linker.  If the program is linked statically, the linker has
+no way of finding out which symbols are already present in the program
+and might causes strange problem so that proper symbols isn't used --
+Initialize function in statically linked libraries is called, and some
+global variable is initialized, dynamically loaded modules might also
+expects those initialized global variable.
+
+
+Key binding
+===========
+gnome-settings-daemon overrides gtk-key-theme-name in your gtkrc. so if you
+use GNOME 2, it won't work, and it's not a bug.
+Please use gnome-keybinding-properties instead of gtk-key-theme-name in your
+gtkrc.
+
+
+Emacs-style key bindings
+========================
+Gtk provides a way of configuring key bindings in Gtk Widgets, especially
+to move the cursor in text fields.  The default behavior in older Gtk versions
+was similar to Emacs, and still available for users to configure.  You can
+configure the Emacs-style key binding theme in your ~/.gtkrc-2.0 file as
+follows:
+    gtk-key-theme-name = "Emacs"
+
+Please note that applications can still override this configuration, and this
+is the case of the GNOME Desktop: gnome-settings-daemon loads the key theme
+from the "/desktop/gnome/interface/gtk_key_theme" GConf entry.  This can be
+modified with gconf-editor.
+
+
+This file is the initial work of Akira TAGOH <tagoh@debian.org> and was updated
+by Loic Minier <lool@dooz.org>.
+
--- gtk+2.0-2.11.6.orig/debian/update-gtk-immodules.fr.8
+++ gtk+2.0-2.11.6/debian/update-gtk-immodules.fr.8
@@ -0,0 +1,36 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH UPDATE-GTK-IMMODULES 8 "13 mars 2002"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NOM
+update-gtk-immodules \- Script de mise à jour de la liste des modules
+GTK+ IM
+.SH SYNOPSIS
+.B update-gtk-immodules
+.I paquet\| version
+.SH DESCRIPTION
+\fIupdate-gtk-immodules\fP est un script d'analyse pour la mise à jour de 
+/etc/gtk-2.0/gtk.immodules en utilisant \fIgtk-query-immodules-2.0\fP.
+.br
+\fIupdate-gtk-immodules\fP reçoit un argument et /etc/gtk-2.0/gtk.immodules sera
+généré pour cette version par \fIgtk-query-immodules-2.0\fP.
+.SH VOIR AUSSI
+.BR gtk-query-immodules-2.0 (1)
+.SH AUTEUR
+Cette page de manuel a été écrite par Akira TAGOH <tagoh@debian.org>,
+pour le système Debian GNU/Linux.
+.SH TRADUCTION
+Julien Louis <leonptitlouis@ifrance.com>